From c34091906d18794371c04306e3beafb327226f34 Mon Sep 17 00:00:00 2001 From: Dave Shawley Date: Mon, 11 May 2015 12:03:19 -0400 Subject: [PATCH] Drop python 3.x support. The avro python 3.x package isn't completely compatible with the 2.x package. In particular, it is missing avro.schema.parse(). --- requirements.txt | 2 +- setup.py | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 19b5bad..8246baa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -# avro is handled in setup.py +avro>=1.7,<2 diff --git a/setup.py b/setup.py index bab0359..312867f 100755 --- a/setup.py +++ b/setup.py @@ -26,14 +26,6 @@ install_requires = read_requirements_file('requirements.txt') setup_requires = read_requirements_file('setup-requirements.txt') tests_require = read_requirements_file('test-requirements.txt') -if sys.version_info < (2, 7): - tests_require.append('unittest2') -if sys.version_info < (3, 0): - install_requires.append('avro') - tests_require.append('mock') -else: - install_requires.append('avro-python3') - setuptools.setup( name='sprockets.mixins.avro', version=sprockets.mixins.avro.__version__, @@ -52,21 +44,15 @@ setuptools.setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries :: Python Modules' ], - packages=['sprockets', - 'sprockets.mixins'], + packages=['sprockets', 'sprockets.mixins'], package_data={'': ['LICENSE', 'README.md']}, include_package_data=True, - namespace_packages=['sprockets', - 'sprockets.mixins'], + namespace_packages=['sprockets', 'sprockets.mixins'], install_requires=install_requires, setup_requires=setup_requires, tests_require=tests_require,