Merge remote-tracking branch 'origin/drop-py2.6'

* origin/drop-py2.6:
  Drop support for Python 2.6
This commit is contained in:
Vineet Naik 2017-03-19 12:15:20 +05:30
commit dcf97de52a
3 changed files with 2 additions and 8 deletions

View File

@ -3,7 +3,6 @@
language: python language: python
python: python:
- "2.6"
- "2.7" - "2.7"
- "3.3" - "3.3"
- "3.4" - "3.4"

View File

@ -1,4 +1,3 @@
import sys
import re import re
import ast import ast
@ -17,10 +16,6 @@ with open('./README.rst') as f:
install_requires = ["pip >= 6.0.0"] install_requires = ["pip >= 6.0.0"]
if sys.version_info < (2, 7):
install_requires.append('argparse')
install_requires.append('ordereddict')
install_requires.append('importlib')
setup( setup(
@ -34,6 +29,7 @@ setup(
long_description=long_desc, long_description=long_desc,
install_requires=install_requires, install_requires=install_requires,
extras_require={'graphviz': ['graphviz']}, extras_require={'graphviz': ['graphviz']},
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
py_modules=['pipdeptree'], py_modules=['pipdeptree'],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
@ -45,7 +41,6 @@ setup(
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.3',

View File

@ -4,7 +4,7 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = py26, py27, py33, py34, py35, py36 envlist = py27, py33, py34, py35, py36
[testenv] [testenv]
commands = commands =