From 5c0c6d83d0439686f023a59242816e03bce8df87 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 8 Jan 2021 17:08:52 +0300 Subject: [PATCH] CI: Upgrade `tox` Stop running tests with Python 3.4 - `tox` 3.15 doesn't support it. --- .travis.yml | 4 +--- README.rst | 2 +- appveyor.yml | 2 +- devscripts/requirements/requirements_tox.txt | 2 +- tox.ini | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08c12fa..8bd44ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ matrix: include: - python: "2.7" env: TOXENV=py27 - - python: "3.4" - env: TOXENV=py34 - python: "3.5" env: TOXENV=py35 - python: "3.6" @@ -31,7 +29,7 @@ matrix: env: TOXENV=py39-flake8 install: - - travis_retry pip install --upgrade "pip<21" "setuptools<44" tox + - travis_retry pip install --upgrade "pip<21" "setuptools<44" "tox>=3.15" script: - tox diff --git a/README.rst b/README.rst index 6377834..c6f1c23 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ Portable Python Utilities. Author: Oleg Broytman . -Copyright (C) 2017, 2018 PhiloSoft Design. +Copyright (C) 2017-2021 PhiloSoft Design. License: GPL. diff --git a/appveyor.yml b/appveyor.yml index 6cc5ecf..605635b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,7 +65,7 @@ install: - "python --version" - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "python -m pip install --upgrade \"pip<21\" \"setuptools<44\"" - - "pip install --upgrade \"tox<3.1\" ppu" + - "pip install --upgrade \"tox>=3.15\" ppu" - "pip --version" # No build step - we don't have C extensions diff --git a/devscripts/requirements/requirements_tox.txt b/devscripts/requirements/requirements_tox.txt index a00e031..8b5960b 100644 --- a/devscripts/requirements/requirements_tox.txt +++ b/devscripts/requirements/requirements_tox.txt @@ -1 +1 @@ -tox >= 1.8, <= 2.9.1 +tox >= 3.15 diff --git a/tox.ini b/tox.ini index 3f722f7..eda0f9f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -minversion = 1.8 +minversion = 3.15 envlist = py27,py3{4,5,6,7,8,9},pypy,py{27,39}-flake8 # Base test environment settings -- 2.39.5