From 9ba5fae34a524fc906feadb2bf71f71b45e20b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 26 Jul 2019 14:47:17 +0200 Subject: [PATCH] Support tox 3.5 and test with tox 3.5, latest and git master Inspired by https://github.com/pytest-dev/pluggy/blob/master/tox.ini Fedora 30 has tox 3.5. --- Dockerfile | 2 +- setup.py | 2 +- tox.ini | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8266c7..f530bda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fedora RUN dnf -y install --setopt=install_weak_deps=false --setopt=tsflags=nodocs \ --setopt=deltarpm=false --allowerasing --best --disablerepo=\*modular \ - tox python36 python37 python38 && \ + tox python36 python37 python38 git-core && \ dnf -y --setopt=install_weak_deps=false --setopt=tsflags=nodocs --best\ --setopt=deltarpm=false --allowerasing --disablerepo=\*modular update && \ dnf clean all diff --git a/setup.py b/setup.py index d40f4da..f884cfd 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( package_dir={"": "src"}, packages=find_packages("src"), entry_points={"tox": ["current-env = tox_current_env.hooks"]}, - install_requires=["tox>=3.8.1"], + install_requires=["tox>=3.5"], python_requires=">=3.6", classifiers=[ "Development Status :: 3 - Alpha", diff --git a/tox.ini b/tox.ini index 6f9b27e..73cd547 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,11 @@ [tox] -envlist = py36,py37,py38 +envlist = {py36,py37,py38}-tox{35,release,master} [testenv] -deps = pytest +deps= + pytest + tox35: tox >=3.5,<3.6 + toxrelease: tox + toxmaster: git+https://github.com/tox-dev/tox.git@master commands = pytest -v {posargs} tests