summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@riseup.net>2016-03-10 15:17:49 -0300
committerBruno Wagner <bwagner@riseup.net>2016-03-10 15:17:49 -0300
commit2ec4556ac4228179ecb3671e852f1b5685067109 (patch)
tree0d8cb6b2b2aa50a76759d69c2d8febf09b5b9503
parent07dff4d010b284d8d46eb3b8a859083013c7441f (diff)
[setup] Added dirspec url to requirements
I also added a conditional to the setup.py so that python setup.py develop can be used even with the dirspec url
-rw-r--r--pkg/requirements.pip7
-rw-r--r--setup.py9
2 files changed, 9 insertions, 7 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 02fb189..bb6cf99 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -1,8 +1,7 @@
-jsonschema #<=0.8 -- are we done with this conflict?
-dirspec
+jsonschema
pyopenssl
python-dateutil
pyzmq>=14.4.1
txzmq>=0.7.3
-
-#autopep8 -- ???
+https://launchpad.net/dirspec/stable-13-10/13.10/+download/dirspec-13.10.tar.gz
+dirspec
diff --git a/setup.py b/setup.py
index d62f2a6..22a4a59 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,10 @@ versioneer.versionfile_build = 'leap/common/_version.py'
versioneer.tag_prefix = '' # tags are like 1.2.0
versioneer.parentdir_prefix = 'leap.common-'
-parsed_reqs = utils.parse_requirements()
+requirements = utils.parse_requirements()
+
+dependency_links = [requirement for requirement in requirements if requirement.startswith('http')]
+requirements = [requirement for requirement in requirements if requirement not in dependency_links]
tests_requirements = [
'mock',
@@ -134,8 +137,8 @@ setup(
# packages=find_packages('src', exclude=['leap.common.tests']),
packages=find_packages('src'),
test_suite='leap.common.tests',
- install_requires=parsed_reqs,
- # dependency_links=dependency_links,
+ install_requires=requirements,
+ dependency_links=dependency_links,
tests_require=tests_requirements,
include_package_data=True,
zip_safe=False,