diff options
| author | Timothy Crosley <timothy.crosley@gmail.com> | 2015-07-12 00:19:23 -0700 |
|---|---|---|
| committer | Timothy Crosley <timothy.crosley@gmail.com> | 2015-07-12 00:19:23 -0700 |
| commit | 21001d2d40ee4bed0eedfe274fa1030162808c83 (patch) | |
| tree | 5ad2d4d343e99da9d56de8ae641ad9400dda0b31 | |
| parent | 092102ed79cce3f4d0968120d9376381535c9360 (diff) | |
| download | pies-feature/fix-python-3-compat.tar.gz | |
Remove install requirements that are version specific, keep them in extra requiresfeature/fix-python-3-compat
| -rw-r--r-- | pies2overrides/setup.py | 8 | ||||
| -rw-r--r-- | setup.py | 11 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py index 8c4d323..1e9c317 100644 --- a/pies2overrides/setup.py +++ b/pies2overrides/setup.py @@ -9,10 +9,6 @@ try: except ImportError: from distutils.core import setup -install_requires = ['ipaddress'] -if sys.version_info[0] == 2 and sys.version_info[1] < 7: - install_requires += ['ordereddict', 'argparse'] - setup(name='pies2overrides', version='2.6.5', description='Defines override classes that should be included with pies only if running on Python2.', @@ -21,8 +17,8 @@ setup(name='pies2overrides', url='https://github.com/timothycrosley/pies', download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.6.5.tar.gz?raw=true', license="MIT", - install_requires=install_requires, - requires=install_requires, + install_requires=['ipaddress'], + requires=['ipaddress'], extras_require={':python_version=="2.6"': ['ordereddict', 'argparse']}, py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'], packages=['html', 'http', 'xmlrpc']) @@ -8,15 +8,6 @@ try: except ImportError: from distutils.core import setup -install_requires = [] -if sys.version_info[0] < 3: - install_requires += ['pies2overrides'] -elif sys.version_info[1] < 2: - install_requires += ['argparse', 'configparser'] - -if sys.version_info[0] < 3 or sys.version_info[1] < 4: - install_requires += ['enum34'] - try: import pypandoc readme = pypandoc.convert('README.md', 'rst') @@ -32,13 +23,11 @@ setup(name='pies', url='https://github.com/timothycrosley/pies', download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.6.5.tar.gz?raw=true', license="MIT", - install_requires=install_requires, extras_require={':python_version=="2.6" or python_version=="2.7"': ['pies2overrides', 'enum34'], ':python_version=="3.0" or python_version=="3.1" or ' 'python_version=="3.2" or python_version=="3.3"': ['enum34'], ':python_version=="3.0" or python_version=="3.1" or python_version=="3.2"': ['argparse', 'configparser']}, - requires=install_requires, packages=['pies'], keywords='Python, Python2, Python3, six, future, refactoring, single-code-base', classifiers=['Development Status :: 5 - Production/Stable', |