From c87b09bfaa7cf97103c8bc5d9fd97515e98ce727 Mon Sep 17 00:00:00 2001 From: Felix Divo Date: Sun, 10 Mar 2019 22:24:09 +0100 Subject: [PATCH 1/3] remove support for Python 3.4 + update testing dependencies --- .appveyor.yml | 6 ++---- .travis.yml | 3 +-- setup.py | 11 +++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ee7b98300..3b52143e7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,16 +2,14 @@ environment: matrix: # For Python versions available on Appveyor, see - # http://www.appveyor.com/docs/installed-software#python - # Python 3.0-3.3 have reached EOL + # https://www.appveyor.com/docs/windows-images-software/#python + # Python pre-2.7 and 3.0-3.4 have reached EOL - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python34" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36" - PYTHON: "C:\\Python37" - PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python34-x64" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36-x64" - PYTHON: "C:\\Python37-x64" diff --git a/.travis.yml b/.travis.yml index 5f8204b29..82a52a0d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: python python: - # CPython; versions 3.0-3.3 have reached EOL + # CPython; versions pre-2.7 and 3.0-3.4 have reached EOL - "2.7" - - "3.4" - "3.5" - "3.6" - "3.7-dev" # TODO: change to "3.7" once it is supported by travis-ci diff --git a/setup.py b/setup.py index c4127baa0..1334e6dfb 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,10 @@ tests_require = [ 'mock~=2.0', - 'nose~=1.3', - 'pytest~=3.6', - 'pytest-timeout~=1.2', - 'pytest-cov~=2.5', + 'nose2~=0.8', + 'pytest~=4.3', + 'pytest-timeout~=1.3', + 'pytest-cov~=2.6', 'codecov~=2.0', 'future', 'six', @@ -53,7 +53,6 @@ # a list of all available ones: https://pypi.org/classifiers/ "Programming Language :: Python", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", @@ -98,7 +97,7 @@ # Installation # see https://www.python.org/dev/peps/pep-0345/#version-specifiers - python_requires=">=2.7,!=3.0,!=3.1,!=3.2,!=3.3", + python_requires=">=2.7,!=3.0,!=3.1,!=3.2,!=3.3,!=3.4", install_requires=[ 'wrapt~=1.10', 'typing;python_version<"3.5"', From 93b908daff51b0a9008b0da70897265062c2cac4 Mon Sep 17 00:00:00 2001 From: Felix Divo Date: Sun, 10 Mar 2019 22:39:48 +0100 Subject: [PATCH 2/3] update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 562c1de6c..12b917355 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ Python developers; providing common abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a can bus. -The library supports Python 2.7, Python 3.4+ as well as PyPy 2 & 3 and runs on Mac, Linux and Windows. +The library supports Python 2.7, Python 3.5+ as well as PyPy 2 & 3 and runs on Mac, Linux and Windows. Features From 1c141f5eeb20bf7c7ad0c6b5414c5de9c84edeef Mon Sep 17 00:00:00 2001 From: Felix Divo Date: Tue, 12 Mar 2019 15:33:11 +0100 Subject: [PATCH 3/3] cleanups & address review --- setup.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 1334e6dfb..7c1fe1424 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ tests_require = [ 'mock~=2.0', - 'nose2~=0.8', 'pytest~=4.3', 'pytest-timeout~=1.3', 'pytest-cov~=2.6', @@ -79,7 +78,7 @@ # Code version=version, - packages=find_packages(exclude=["test", "test.*"]), + packages=find_packages(exclude=["test", "doc", "scripts", "examples"]), scripts=list(filter(isfile, (join("scripts/", f) for f in listdir("scripts/")))), # Author @@ -91,21 +90,19 @@ # Package data package_data={ - "": ["CONTRIBUTORS.txt", "LICENSE.txt", "CHANGELOG.txt"], - "doc": ["*.*"] + "": ["README.rst", "CONTRIBUTORS.txt", "LICENSE.txt", "CHANGELOG.txt"], + "doc": ["*.*"], + "examples": ["*.py"] }, # Installation # see https://www.python.org/dev/peps/pep-0345/#version-specifiers - python_requires=">=2.7,!=3.0,!=3.1,!=3.2,!=3.3,!=3.4", + python_requires=">=2.7", install_requires=[ 'wrapt~=1.10', 'typing;python_version<"3.5"', 'windows-curses;platform_system=="Windows"', ], extras_require=extras_require, - - # Testing - test_suite="nose.collector", - tests_require=tests_require, + tests_require=tests_require )