Merge pull request from yarikoptic/rf-nopy2

RF: remove python2 as dependency/testing etc, declare 3.5 to be the minimal version
This commit is contained in:
Yaroslav Halchenko 2021-02-17 15:00:22 -05:00 committed by GitHub
commit 54694fb23e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions

View File

@ -1,11 +1,11 @@
language: python language: python
dist: bionic dist: bionic
python: python:
- "2.7"
- "3.5" - "3.5"
- "3.6" - "3.6"
- "3.7" - "3.7"
- "3.8" - "3.8"
- "3.9"
# whitelist # whitelist
branches: branches:
only: only:
@ -26,8 +26,6 @@ before_install:
# Note: pigz gives test errors on Travis CI since option "--" is not # 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. # 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 # command to install dependencies
install: install:
@ -37,13 +35,8 @@ install:
# command to run tests # command to run tests
script: script:
- make localbuild - make localbuild
- if [ $TRAVIS_PYTHON_VERSION = 3.3 ]; then - COVERAGE="coverage run"
COVERAGE= ; - PYTEST=`which pytest`;
PYTEST="python -m pytest";
else
COVERAGE="coverage run" ;
PYTEST=`which pytest`;
fi
- $COVERAGE $PYTEST -v tests/ - $COVERAGE $PYTEST -v tests/
after_success: after_success:

12
setup.py Normal file → Executable file
View File

@ -19,8 +19,8 @@ Setup file for the distuils module.
""" """
from __future__ import print_function from __future__ import print_function
import sys import sys
if not hasattr(sys, "version_info") or sys.version_info < (2, 7, 0, "final", 0): if not hasattr(sys, "version_info") or sys.version_info < (3, 5):
raise SystemExit("This program requires Python 2.7 or later.") raise SystemExit("This program requires Python 3.5 or later.")
import os import os
import re import re
from setuptools import setup from setuptools import setup
@ -219,12 +219,12 @@ installed.
'Topic :: System :: Archiving', 'Topic :: System :: Archiving',
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: GNU General Public License (GPL)', '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',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', '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', 'Operating System :: OS Independent',
], ],
distclass = MyDistribution, distclass = MyDistribution,