From 929f3e1e1b664ed8cdef90a40c96804edfd08d59 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 12:06:10 +0200 Subject: Drop support for EOL Python 2.6 --- setup.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 47523e03..e0641824 100755 --- a/setup.py +++ b/setup.py @@ -9,8 +9,6 @@ except ImportError: from distutils.command.build_py import build_py as _build_py from setuptools.command.sdist import sdist as _sdist -import pkg_resources -import logging import os import sys from os import path @@ -66,26 +64,7 @@ def _stamp_version(filename): install_requires = ['gitdb2 >= 2.0.0'] -extras_require = { - ':python_version == "2.6"': ['ordereddict'], -} test_requires = ['ddt>=1.1.1'] -if sys.version_info[:2] < (2, 7): - test_requires.append('mock') - -try: - if 'bdist_wheel' not in sys.argv: - for key, value in extras_require.items(): - if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]): - install_requires.extend(value) -except Exception: - logging.getLogger(__name__).exception( - 'Something went wrong calculating platform specific dependencies, so ' - "you're getting them all!" - ) - for key, value in extras_require.items(): - if key.startswith(':'): - install_requires.extend(value) # end setup( @@ -101,7 +80,7 @@ setup( package_data={'git.test': ['fixtures/*']}, package_dir={'git': 'git'}, license="BSD License", - python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*', requires=['gitdb2 (>=2.0.0)'], install_requires=install_requires, test_requirements=test_requires + install_requires, @@ -126,7 +105,6 @@ setup( "Operating System :: MacOS :: MacOS X", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", -- cgit v1.2.3 From ac4f7d34f8752ab78949efcaa9f0bd938df33622 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 21:33:18 +0200 Subject: Rewrite unnecessary dict/list/tuple calls as literals --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e0641824..5db8e615 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ class sdist(_sdist): def _stamp_version(filename): - found, out = False, list() + found, out = False, [] try: with open(filename, 'r') as f: for line in f: -- cgit v1.2.3 From 80b038f8d8c7c67c148ebd7a5f7a0cb39541b761 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 22:47:18 +0200 Subject: Drop support for EOL Python 3.3 --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5db8e615..2703a9ca 100755 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ setup( package_data={'git.test': ['fixtures/*']}, package_dir={'git': 'git'}, license="BSD License", - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', requires=['gitdb2 (>=2.0.0)'], install_requires=install_requires, test_requirements=test_requires + install_requires, @@ -107,7 +107,6 @@ setup( "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", -- cgit v1.2.3