diff --git a/.travis.yml b/.travis.yml index 622823d..0798265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - '3.5' - '3.6' - '3.7' -- 3.8-dev +- '3.8' install: pip install 'tox-travis ~= 0.12.0' script: tox deploy: diff --git a/setup.py b/setup.py index 4e54494..a617412 100644 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ def read(fname): 'pytest>=2.8,<4.7; python_version<"3.5"', 'pytest>=2.8; python_version>="3.5"', 'mypy>=0.570,<0.700; python_version<"3.5"', - 'mypy>=0.570; python_version>="3.5" and python_version<"3.8.0b1"', - 'mypy>=0.701; python_version>="3.8.0b1"', + 'mypy>=0.570; python_version>="3.5" and python_version<"3.8"', + 'mypy>=0.700; python_version>="3.8"', ], classifiers=[ 'Development Status :: 4 - Beta', diff --git a/tox.ini b/tox.ini index b90a2d0..20f5b4e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,11 @@ min_version = 3.7.0 isolated_build = true envlist = - py{34, 35, 36, 37}-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x}-mypy{0.570, 0.580, 0.590, 0.600, 0.610, 0.620, 0.630, 0.641, 0.650, 0.660, 0.670} - py{35, 36, 37}-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.700, 0.701, 0.710, 0.711} - py{38}-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.710, 0.711} + py34-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x}-mypy{0.57, 0.5x, 0.60, 0.6x} + py35-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.57, 0.5x, 0.60, 0.6x, 0.70, 0.7x} + py36-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.57, 0.5x, 0.60, 0.6x, 0.70, 0.7x} + py37-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.57, 0.5x, 0.60, 0.6x, 0.70, 0.7x} + py38-pytest{2.8, 2.x, 3.0, 3.x, 4.0, 4.x, 5.0, 5.x}-mypy{0.71, 0.7x} flake8 [testenv] @@ -37,21 +39,25 @@ deps = pytest4.x: pytest ~= 4.0 pytest5.0: pytest ~= 5.0.0 pytest5.x: pytest ~= 5.0 - mypy0.570: mypy == 0.570 - mypy0.580: mypy == 0.580 - mypy0.590: mypy == 0.590 - mypy0.600: mypy == 0.600 - mypy0.610: mypy == 0.610 - mypy0.620: mypy == 0.620 - mypy0.630: mypy == 0.630 - mypy0.641: mypy == 0.641 - mypy0.650: mypy == 0.650 - mypy0.660: mypy == 0.660 - mypy0.670: mypy == 0.670 - mypy0.700: mypy == 0.700 - mypy0.701: mypy == 0.701 - mypy0.710: mypy == 0.710 - mypy0.711: mypy == 0.711 + mypy0.57: mypy >= 0.570, < 0.580 + mypy0.58: mypy >= 0.580, < 0.590 + mypy0.59: mypy >= 0.590, < 0.600 + mypy0.5x: mypy >= 0.500, < 0.600 + mypy0.60: mypy >= 0.600, < 0.610 + mypy0.61: mypy >= 0.610, < 0.620 + mypy0.62: mypy >= 0.620, < 0.630 + mypy0.63: mypy >= 0.630, < 0.640 + mypy0.64: mypy >= 0.640, < 0.650 + mypy0.65: mypy >= 0.650, < 0.660 + mypy0.66: mypy >= 0.660, < 0.670 + mypy0.67: mypy >= 0.670, < 0.680 + mypy0.6x: mypy >= 0.600, < 0.700 + mypy0.70: mypy >= 0.700, < 0.710 + mypy0.71: mypy >= 0.710, < 0.720 + mypy0.72: mypy >= 0.720, < 0.730 + mypy0.73: mypy >= 0.730, < 0.740 + mypy0.74: mypy >= 0.740, < 0.750 + mypy0.7x: mypy >= 0.700, < 0.800 pytest-cov ~= 2.5.1 pytest-randomly ~= 2.1.1