From 81ad76b84b4864b39186b5c5c91bedb16676117e Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 6 Apr 2015 22:20:13 -0400
Subject: [PATCH] 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.
---
dev-requirements3.txt | 13 -------------
setup.py | 11 +++++++----
2 files changed, 7 insertions(+), 17 deletions(-)
delete mode 100644 dev-requirements3.txt
diff --git a/dev-requirements3.txt b/dev-requirements3.txt
deleted file mode 100644
index f5ce106a..00000000
--- 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 aea7e873..7eb85137 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
]
--
GitLab