From 737edd34f95d1e647248e21122fe0575d5924b88 Mon Sep 17 00:00:00 2001 From: nir0s Date: Tue, 28 Nov 2017 10:13:21 +0200 Subject: [PATCH 1/2] Drop Python 2.6 support This doesn't mean that distro won't work on Python 2.6 but rather that it won't be tested on it. --- .travis.yml | 2 -- README.md | 2 +- docs/index.rst | 4 ++-- setup.py | 2 +- tox.ini | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1191704c..64d2a6c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ matrix: include: - env: TOXENV=flake8 - env: TOXENV=py3flake8 - - python: 2.6 # these are just to make travis's UI a bit prettier - env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 - python: 3.3 diff --git a/README.md b/README.md index 63023df3..866fda50 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ namely from these data sources (from high to low precedence): ## Python and Distribution Support -`distro` is supported and tested on Python 2.6, 2.7, 3.3+ and PyPy and on +`distro` is supported and tested on Python 2.7, 3.3+ and PyPy and on any Linux distribution that provides one or more of the data sources covered. diff --git a/docs/index.rst b/docs/index.rst index 9d8e0fc9..b960f014 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,11 +20,11 @@ If you want to jump into the API description right away, read about the Compatibility ============= -The ``distro`` package is supported on Python 2.6, 2.7, 3.3+ and PyPy, and on +The ``distro`` package is supported on Python 2.7, 3.3+ and PyPy, and on any Linux distribution that provides one or more of the `data sources`_ used by this package. -This package is tested on Python 2.6, 2.7, 3.3+ and PyPy, with test data that +This package is tested on Python 2.7, 3.3+ and PyPy, with test data that mimics the exact behavior of the data sources of `a number of Linux distributions `_. diff --git a/setup.py b/setup.py index 2b46f643..751bfb99 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def read(*parts): 'Intended Audience :: System Administrators', 'License :: OSI Approved :: Apache Software License', 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', diff --git a/tox.ini b/tox.ini index 7aa2e8bc..8aefb148 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ [tox] minversion = 1.7.2 -envlist = flake8, py3flake8, py26, py27, py33, py34, py35, py36, pypy +envlist = flake8, py3flake8, py27, py33, py34, py35, py36, pypy skip_missing_interpreters = true [testenv] From 03adf34645af932c87f0faa9c0a846b7fd5898bd Mon Sep 17 00:00:00 2001 From: nir0s Date: Tue, 28 Nov 2017 10:18:15 +0200 Subject: [PATCH 2/2] Remove implicit installation of argparse for 2.6 --- setup.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/setup.py b/setup.py index 751bfb99..15e7a247 100644 --- a/setup.py +++ b/setup.py @@ -22,12 +22,6 @@ here = os.path.abspath(os.path.dirname(__file__)) -try: - import argparse # NOQA - install_requires = [] -except ImportError: - install_requires = ['argparse'] - def read(*parts): # intentionally *not* adding an encoding option to open @@ -45,7 +39,6 @@ def read(*parts): description='Linux Distribution - a Linux OS platform information API', long_description=read('README.rst'), py_modules=['distro'], - install_requires=install_requires, entry_points={ 'console_scripts': [ 'distro = distro:main',