Skip to content

Commit d41adf5

Browse files
blueyedwaylan
authored andcommitted
Improve CI / testing (#754)
* Use "testing" extras_require This centralized testing requirements and allows for `pip install -e .[testing]` etc. pytidylib is kept separate according to https://github.com/Python-Markdown/markdown/pull/754/files#r233561159. * Travis: simplify installation of deps * Travis: use xenial by default, trusty for py34 * Travis: codecov: use flags * Travis: only install aspell for checkspelling job * Remove coverage version restriction
1 parent 0c7924e commit d41adf5

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

.travis.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
dist: xenial
12
sudo: false
23
language: python
34

@@ -7,39 +8,42 @@ matrix:
78
env: TOXENV=py27
89
- python: '3.4'
910
env: TOXENV=py34
11+
dist: trusty
1012
- python: '3.5'
1113
env: TOXENV=py35
1214
- python: '3.6'
1315
env: TOXENV=py36
1416
- python: '3.7'
1517
env: TOXENV=py37
16-
dist: xenial
17-
sudo: true
1818
- python: 'pypy'
1919
env: TOXENV=pypy
20+
dist: trusty
2021
- python: 'pypy3'
2122
env: TOXENV=pypy3
23+
dist: trusty
2224
- env: TOXENV=flake8
2325
- env: TOXENV=checkspelling
26+
addons:
27+
apt:
28+
packages:
29+
- aspell
30+
- aspell-en
2431

2532
addons:
2633
apt:
2734
packages:
2835
- libtidy-0.99-0
29-
- aspell
30-
- aspell-en
3136

3237
install:
33-
- pip install 'setuptools>=36'
34-
- pip install tox
35-
- pip install 'coverage<4.0'
36-
- pip install codecov
38+
# NOTE: setuptools needs to be installed explicitly for py34 (trusty).
39+
- pip install 'setuptools>=36' tox
3740

3841
script:
3942
- tox
4043

4144
after_success:
42-
- codecov
45+
- pip install codecov
46+
- codecov --flags "$TOXENV"
4347

4448
branches:
4549
only:

setup.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
packages=['markdown', 'markdown.extensions'],
7979
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
8080
install_requires=['setuptools >= 36'],
81+
extras_require={
82+
'testing': [
83+
'coverage',
84+
'pyyaml',
85+
],
86+
},
8187
entry_points={
8288
'console_scripts': [
8389
'%s = markdown.__main__:run' % SCRIPT_NAME,

test-requirements.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

tox.ini

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ requires = setuptools>=36
44
isolated_build = True
55

66
[testenv]
7-
deps =
8-
coverage<4.0
9-
pyyaml
10-
pytidylib
7+
extras = testing
8+
deps = pytidylib
119
commands = coverage run --source=markdown -m unittest discover {toxinidir}/tests
1210
coverage report --show-missing
1311

0 commit comments

Comments
 (0)