enable pytest 5.x (#342)

Author: mr-c

appveyor.yml

@@ -27,7 +27,7 @@ environment:
 install:
   - "set PATH=%PYTHON%\\Scripts;%PATH%"
   - "%PYTHON%\\python.exe -m pip install -U pip setuptools^>=20.3 wheel"
-  - "%PYTHON%\\python.exe -m pip install -U pytest==4.6.4 codecov pytest-xdist pytest-cov galaxy-lib"
+  - "%PYTHON%\\python.exe -m pip install -U pytest^<6 codecov pytest-xdist pytest-cov galaxy-lib"
     # Note the use of a `^` to escape the `>`
 
 build_script:

release-test.sh

@@ -25,7 +25,7 @@ then
 	rm -f "testenv${PYVER}_1/lib/python-wheels/setuptools"*
 	pip install --force-reinstall -U pip==${pipver}
 	pip install setuptools==${setupver} wheel
-	pip install pytest\<5 pytest-xdist -rrequirements.txt
+	pip install pytest\<6 pytest-xdist -rrequirements.txt
 	make test
 	pip uninstall -y ${package} || true; pip uninstall -y ${package} \
 		|| true; make install
@@ -56,7 +56,7 @@ rm lib/python-wheels/setuptools* \
 # The following can fail if you haven't pushed your commits to ${repo}
 pip install -e "git+${repo}@${HEAD}#egg=${package}"
 pushd src/${package}
-pip install pytest\<5 pytest-xdist
+pip install pytest\<6 pytest-xdist
 make dist
 make test
 cp dist/${package}*tar.gz "../../../testenv${PYVER}_3/"
@@ -77,7 +77,7 @@ rm lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setupver} wheel
 pip install ${package}*tar.gz
-pip install pytest\<5 pytest-xdist
+pip install pytest\<6 pytest-xdist
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
 pushd out/${package}*
@@ -100,7 +100,7 @@ rm lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setupver} wheel
 pip install ${module}*.whl
-pip install pytest\<5 pytest-xdist
+pip install pytest\<6 pytest-xdist
 mkdir not-${module}
 pushd not-${module}
 # shellcheck disable=SC2086

setup.py

@@ -18,7 +18,7 @@
     tagger = egg_info_cmd.egg_info
 
 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
-pytest_runner = ["pytest < 5", "pytest-runner"] if needs_pytest else []
+pytest_runner = ["pytest < 6", "pytest-runner"] if needs_pytest else []
 
 if os.path.exists("requirements.txt"):
     requirements = [
@@ -94,7 +94,7 @@
 ]
 
 extras_require = {
-    "docs": ["sphinx >= 2.2", "sphinx-rtd-theme", "pytest"],
+    "docs": ["sphinx >= 2.2", "sphinx-rtd-theme", "pytest < 6"],
 }
 
 setup(
@@ -117,7 +117,7 @@
     install_requires=install_requires,
     extras_require=extras_require,
     test_suite="tests",
-    tests_require=["pytest<5"],
+    tests_require=["pytest<6"],
     entry_points={
         "console_scripts": [
             "schema-salad-tool=schema_salad.main:main",

tox.ini

@@ -25,7 +25,7 @@ passenv =
 deps =
   -rrequirements.txt
   py{35,36,37,38,39}-unit: codecov
-  py{35,36,37,38,39}-unit: pytest<5
+  py{35,36,37,38,39}-unit: pytest<6
   py{35,36,37,38,39}-unit: pytest-xdist
   py{35,36,37,38,39}-unit: pytest-cov
   py{38}-lint: flake8