diff --git a/dev-requirements3.txt b/dev-requirements3.txt deleted file mode 100644 index f5ce106a4fb2f00bb57079ea4472b729188d0c6d..0000000000000000000000000000000000000000 --- a/dev-requirements3.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Optional requirements used by test cases -## pycurl (Latest released version does not work with Python 3) -git+git://github.com/pycurl-devs/pycurl - -# For testing -nose -webtest -coverage - -# For dev -sphinx - -pyflakes diff --git a/setup.py b/setup.py index aea7e873baaa9e7be50ffe22bb9edb60e8d4ad29..7eb8513741cb9f984fa738268b8b84f58571797a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,7 @@ import re import ast +import sys + try: from distutils.util import get_platform is_windows = get_platform().startswith("win") @@ -7,7 +9,6 @@ except ImportError: # Don't break install if distuils is incompatible in some way # probably overly defensive. is_windows = False - try: from setuptools import setup except ImportError: @@ -21,11 +22,13 @@ requirements = [ 'six', 'webob', 'psutil', - 'paste', - 'PasteScript', - "pyyaml", + 'pyyaml', ] +if sys.version_info[0] == 2: + requirements.append('PasteScript') + requirements.append('paste') + test_requirements = [ # TODO: put package test requirements here ]