Skip to content

Commit

Permalink
Remove Official Python26 support (python-distro#195)
Browse files Browse the repository at this point in the history
* 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.

* Remove implicit installation of argparse for 2.6
  • Loading branch information
nir0s authored Nov 28, 2017
1 parent a4d0347 commit 6acba10
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/nir0s/distro/tree/master/tests/resources/distros>`_.

Expand Down
9 changes: 1 addition & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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',
Expand All @@ -57,7 +50,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',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 6acba10

Please sign in to comment.