summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-18 18:03:46 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-18 18:03:46 -0300
commit29af79226d6a9f7bd25deabfc21c54bd8f388d91 (patch)
tree54e87de7ed10fb0659c76354c0e15b87f9ff1152 /setup.py
parentf4ef0ac87021bc4d284f6ab2cc226de6926c5f78 (diff)
parent81d2aab50006c21cdd62a47dafbf3da24a2764d7 (diff)
Merge remote-tracking branch 'drebs/2528-depend-on-twisted-12.0.0' into develop
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/setup.py b/setup.py
index 340ebcd2..afebf609 100644
--- a/setup.py
+++ b/setup.py
@@ -30,17 +30,7 @@ install_requirements = [
'pysqlcipher',
'python-gnupg',
'simplejson',
- # "Installation of Twisted using easy_install with a local source directory
- # is supported. In the past there have been problems using these tools to
- # upgrade an existing version of Twisted, and these problems likely still
- # exist. Similarly, there are often problems when Twisted is declared as a
- # dependency by another project using the setuptools distutils extensions.
- # You should probably not rely on this functionality. Instead, install a
- # platform-supplied package, or install Twisted by downloading a tarball,
- # unpacking it, and running setup.py."
- # - https://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions
'twisted>=12.0.0', # TODO: maybe we just want twisted-web?
- # twisted cannot be installed separately using pip.
'u1db',
'requests',
'six==1.1',
@@ -49,15 +39,6 @@ install_requirements = [
]
-# TODO: change below so we get stable versions of modules.
-dependency_links = [
- #'git+git://git.futeisha.org/pysqlcipher.git@develop#egg=pysqlcipher',
- #'git+ssh://code.leap.se/leap_pycommon.git@develop#egg=leap.common',
- 'http://twistedmatrix.com/Releases/Twisted/13.0/Twisted-13.0.0.tar.bz2'
- '#egg=twisted-13.0.0' # break the string to adhere to pep8 style.
-]
-
-
tests_requirements = [
'mock',
'nose2',
@@ -96,7 +77,6 @@ setup(
test_suite='leap.soledad.tests',
install_requires=install_requirements,
tests_require=tests_requirements,
- dependency_links=dependency_links,
data_files=data_files,
# the following files are only used for testing, and might be removed if
# we manage or decide to not install tests in the future.