Skip to content
Snippets Groups Projects
Commit 81ad76b8 authored by John Chilton's avatar John Chilton
Browse files

Update dependency handling for Python 3.

 - In setup.py don't depend on paste if Python 3.
 - All development dependencies are now compatible with Python 2 and Python 3, remove dev-requirements3.txt.
parent fc2c9ea6
No related branches found
No related tags found
No related merge requests found
# 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
import re import re
import ast import ast
import sys
try: try:
from distutils.util import get_platform from distutils.util import get_platform
is_windows = get_platform().startswith("win") is_windows = get_platform().startswith("win")
...@@ -7,7 +9,6 @@ except ImportError: ...@@ -7,7 +9,6 @@ except ImportError:
# Don't break install if distuils is incompatible in some way # Don't break install if distuils is incompatible in some way
# probably overly defensive. # probably overly defensive.
is_windows = False is_windows = False
try: try:
from setuptools import setup from setuptools import setup
except ImportError: except ImportError:
...@@ -21,11 +22,13 @@ requirements = [ ...@@ -21,11 +22,13 @@ requirements = [
'six', 'six',
'webob', 'webob',
'psutil', 'psutil',
'paste', 'pyyaml',
'PasteScript',
"pyyaml",
] ]
if sys.version_info[0] == 2:
requirements.append('PasteScript')
requirements.append('paste')
test_requirements = [ test_requirements = [
# TODO: put package test requirements here # TODO: put package test requirements here
] ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment