From 81a178b028597868ea4369c32a10b5c329f0bb82 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 17 Feb 2021 11:57:18 -0500 Subject: [PATCH 1/3] Declare python 3.5 to be the minimal version python 2 is long gone. Code in https://github.com/wummel/patool/pull/93 needs python3 --- .travis.yml | 13 ++----------- setup.py | 12 ++++++------ 2 files changed, 8 insertions(+), 17 deletions(-) mode change 100644 => 100755 setup.py diff --git a/.travis.yml b/.travis.yml index eedaaae..00649b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python dist: bionic python: - - "2.7" - "3.5" - "3.6" - "3.7" @@ -26,8 +25,6 @@ before_install: # Note: pigz gives test errors on Travis CI since option "--" is not # supported, but pigz 2.3.1 supports it. Must be an older version. - # lzma is shipped with python 3 but requires 3rd party bindings on python2 - - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install pyliblzma; fi # command to install dependencies install: @@ -37,14 +34,8 @@ install: # command to run tests script: - make localbuild - - if [ $TRAVIS_PYTHON_VERSION = 3.3 ]; then - COVERAGE= ; - PYTEST="python -m pytest"; - else - COVERAGE="coverage run" ; - PYTEST=`which pytest`; - fi - - $COVERAGE $PYTEST -v tests/ + - COVERAGE="coverage run" + - $COVERAGE python -m pytest -v tests/ after_success: - if [ ! -z "$COVERAGE" ]; then codecov; fi diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 428e084..a582de3 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ Setup file for the distuils module. """ from __future__ import print_function import sys -if not hasattr(sys, "version_info") or sys.version_info < (2, 7, 0, "final", 0): - raise SystemExit("This program requires Python 2.7 or later.") +if not hasattr(sys, "version_info") or sys.version_info < (3, 5): + raise SystemExit("This program requires Python 3.5 or later.") import os import re from setuptools import setup @@ -219,12 +219,12 @@ installed. 'Topic :: System :: Archiving', 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Operating System :: OS Independent', ], distclass = MyDistribution, From 1af23cd78d2d1fa1fa0adc605c9e75c5abbca86b Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 17 Feb 2021 11:58:21 -0500 Subject: [PATCH 2/3] ENH: add testing against 3.9 on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 00649b5..ad7a062 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - "3.6" - "3.7" - "3.8" + - "3.9" # whitelist branches: only: From 5acd423e99fc9ea026f3ec3157f6b205dd78616c Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 17 Feb 2021 14:17:32 -0500 Subject: [PATCH 3/3] RF: return back a bit more cumbersome invocation -- python is not found, heh --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad7a062..1272189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,8 @@ install: script: - make localbuild - COVERAGE="coverage run" - - $COVERAGE python -m pytest -v tests/ + - PYTEST=`which pytest`; + - $COVERAGE $PYTEST -v tests/ after_success: - if [ ! -z "$COVERAGE" ]; then codecov; fi