From 73e449aa078b7a19e180a8aa362c9380b189b426 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Nov 2018 09:01:37 +0100 Subject: [PATCH 1/7] 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. --- setup.py | 6 ++++++ test-requirements.txt | 5 ----- tox.ini | 6 ++---- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 test-requirements.txt diff --git a/setup.py b/setup.py index 938defa20..98dddc0b6 100755 --- a/setup.py +++ b/setup.py @@ -78,6 +78,12 @@ packages=['markdown', 'markdown.extensions'], python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', install_requires=['setuptools >= 36'], + extras_require={ + 'testing': [ + 'coverage<4.0', + 'pyyaml', + ], + }, entry_points={ 'console_scripts': [ '%s = markdown.__main__:run' % SCRIPT_NAME, diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 0e8680f54..000000000 --- a/test-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -coverage<4.0 -pyyaml -pytidylib -mkdocs>=1.0 -mkdocs-nature diff --git a/tox.ini b/tox.ini index 0e130aebf..ee8f50f6c 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,8 @@ requires = setuptools>=36 isolated_build = True [testenv] -deps = - coverage<4.0 - pyyaml - pytidylib +extras = testing +deps = pytidylib commands = coverage run --source=markdown -m unittest discover {toxinidir}/tests coverage report --show-missing From ba17a808ac51bbce73c9c4a55691d41a77b135d0 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Nov 2018 09:05:25 +0100 Subject: [PATCH 2/7] Travis: simplify/revisit installation of deps --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c050aced8..c02e014d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,15 +30,14 @@ addons: - aspell-en install: - - pip install 'setuptools>=36' - - pip install tox - - pip install 'coverage<4.0' - - pip install codecov + # NOTE: setuptools needs to be installed explicitly for py34 (trusty). + - pip install 'setuptools>=36' tox script: - tox after_success: + - pip install codecov - codecov branches: From 720ca42bec89ecac7afcea5bf8cd465a4c753e86 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Nov 2018 09:13:01 +0100 Subject: [PATCH 3/7] Travis: use xenial by default, trusty for py34 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c02e014d0..7ad8858d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial sudo: false language: python @@ -7,18 +8,19 @@ matrix: env: TOXENV=py27 - python: '3.4' env: TOXENV=py34 + dist: trusty - python: '3.5' env: TOXENV=py35 - python: '3.6' env: TOXENV=py36 - python: '3.7' env: TOXENV=py37 - dist: xenial - sudo: true - python: 'pypy' env: TOXENV=pypy + dist: trusty - python: 'pypy3' env: TOXENV=pypy3 + dist: trusty - env: TOXENV=flake8 - env: TOXENV=checkspelling From 0fda505269e3b894738dde4e49c24247f485ac6c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Nov 2018 09:30:22 +0100 Subject: [PATCH 4/7] testing: upgrade coverage: <5.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 98dddc0b6..d7a3b7622 100755 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ install_requires=['setuptools >= 36'], extras_require={ 'testing': [ - 'coverage<4.0', + 'coverage<5.0', 'pyyaml', ], }, From cae3e74b2349f51707445f52aa38a26e09db47a3 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 15 Nov 2018 09:34:36 +0100 Subject: [PATCH 5/7] Travis: codecov: use flags --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ad8858d1..943caa4f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: after_success: - pip install codecov - - codecov + - codecov --flags "$TOXENV" branches: only: From 959690dfcc1c54951a68fbeb70a43a9fc0738179 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 15 Nov 2018 09:37:46 +0100 Subject: [PATCH 6/7] Travis: only install aspell for checkspelling job --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 943caa4f7..b0daef753 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,16 @@ matrix: dist: trusty - env: TOXENV=flake8 - env: TOXENV=checkspelling + addons: + apt: + packages: + - aspell + - aspell-en addons: apt: packages: - libtidy-0.99-0 - - aspell - - aspell-en install: # NOTE: setuptools needs to be installed explicitly for py34 (trusty). From 57e0066a75bf03ae937f1d362918b189cb100611 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Thu, 15 Nov 2018 19:19:31 -0500 Subject: [PATCH 7/7] Remove coverage version restriction --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d7a3b7622..725b005cc 100755 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ install_requires=['setuptools >= 36'], extras_require={ 'testing': [ - 'coverage<5.0', + 'coverage', 'pyyaml', ], },