From 0a093786ed2c4c460e9eceb51ee24facddfce0a9 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Sun, 5 Jul 2015 12:14:01 +0100 Subject: [PATCH 1/2] Fix RST parse errors generated by pandoc --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 932df78c..a5dcd906 100644 --- a/README.rst +++ b/README.rst @@ -5,6 +5,7 @@ VCR.py :alt: vcr.py vcr.py + This is a Python version of `Ruby's VCR library `__. From c789c82c1d85453df281511f0710b2ddfc2f0aba Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Tue, 7 Jul 2015 11:28:49 +0100 Subject: [PATCH 2/2] Support conditional requirements in old versions of pip --- setup.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index eaf20c3f..4b8c5494 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ import sys from setuptools import setup, find_packages from setuptools.command.test import test as TestCommand +import pkg_resources long_description = open('README.rst', 'r').read() @@ -20,6 +21,21 @@ def run_tests(self): sys.exit(errno) +install_requires=['PyYAML', 'wrapt', 'six>=1.5'] + + +extras_require = { + ':python_version in "2.4, 2.5, 2.6"': + ['contextlib2', 'backport_collections', 'mock'], + ':python_version in "2.7, 3.1, 3.2"': ['contextlib2', 'mock'], +} + + +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) + setup( name='vcrpy', version='1.6.0', @@ -32,12 +48,8 @@ def run_tests(self): author_email='me@kevinmccarthy.org', url='https://github.com/kevin1024/vcrpy', packages=find_packages(exclude=("tests*",)), - install_requires=['PyYAML', 'wrapt', 'six>=1.5'], - extras_require = { - ':python_version in "2.4, 2.5, 2.6"': - ['contextlib2', 'backport_collections', 'mock'], - ':python_version in "2.7, 3.1, 3.2"': ['contextlib2', 'mock'], - }, + install_requires=install_requires, + extras_require=extras_require, license='MIT', tests_require=['pytest', 'mock', 'pytest-localserver'], cmdclass={'test': PyTest},