Skip to content

Commit

Permalink
Changes needed to support travis in transition
Browse files Browse the repository at this point in the history
  • Loading branch information
offbyone committed Oct 21, 2020
1 parent e539290 commit 6efb6aa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ matrix:
- python: 3.6
env:
- TOX_ENV=py36
- python: 3.6
env:
- TOX_ENV=pypy3.6
- python: 3.6
env:
- TOX_ENV=py36-numpy
Expand Down Expand Up @@ -37,12 +34,12 @@ matrix:
- python: 3.6
env:
- TOX_ENV=docs-py3
- python: 3.7
- python: 3.8
env:
- TOX_ENV=check-format
- TOX_ENV=lint
- python: 3.8
env:
- TOX_ENV=mypy
- TOX_ENV=typing

before_install:
- export EASY_SETUP_URL='http://peak.telecommunity.com/dist/ez_setup.py'
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ def read(fname):

assert __version__ is not None

TESTS_BASIC = ["pytest>=5.0", "pytest-sugar", "coverage"]
TESTS_NUMPY = ["numpy"]


params = dict(
name="PyHamcrest",
version=__version__, # flake8:noqa
Expand All @@ -52,7 +56,8 @@ def read(fname):
install_requires=[],
extras_require={
"docs": ["sphinx~=3.0", "sphinx_rtd_theme~=0.4"],
"tests": ["pytest>=5.0", "pytest-sugar", "coverage"],
"tests": TESTS_BASIC,
"tests-numpy": TESTS_BASIC + TESTS_NUMPY,
},
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ filterwarnings =
# Keep docs in sync with docs env and .readthedocs.yml.
[gh-actions]
python =
2.7: py27
3.5: py35
3.6: py36
3.6: py36, py36-numpy
3.7: py37, docs
3.8: py38, lint, manifest, typing, changelog
3.9: py39
Expand All @@ -38,6 +36,9 @@ commands = python -m pytest {posargs}
extras = {env:TOX_AP_TEST_EXTRAS:tests}
commands = coverage run -m pytest {posargs}

[testenv:py36-numpy]
extras = tests-numpy
commands = python -m pytest {posargs}

[testenv:py37]
# Python 3.6+ has a number of compile-time warnings on invalid string escapes.
Expand Down

0 comments on commit 6efb6aa

Please sign in to comment.