diff options
| author | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-16 13:56:11 +0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-16 13:56:25 +0200 |
| commit | e41fba96f1bfb94f079ba5b304ce5331cec39909 (patch) | |
| tree | dff5bd01fafb632eb8fbd2d981301fdff3608f4b | |
| parent | 0de9d8dc31298921f7272d74cdd3c5d4217b5841 (diff) | |
Pinned versions of all packages, so we can reliably run the upgrade test, also fixed the error we're having on the upgrade test
| -rw-r--r-- | service/requirements.txt | 3 | ||||
| -rw-r--r-- | service/setup.py | 14 | ||||
| -rw-r--r-- | service/test_requirements.txt | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/service/requirements.txt b/service/requirements.txt index 2b1ae2ef..d9d4b30c 100644 --- a/service/requirements.txt +++ b/service/requirements.txt @@ -1,7 +1,6 @@ Twisted==14.0.2 flask==0.10.1 -scanner==0.0.5 -requests==2.3.0 +requests==2.4.3 pytest==2.6.3 #requirements for bitmask libraries srp==1.0.5 diff --git a/service/setup.py b/service/setup.py index 994e807a..00f5b8d1 100644 --- a/service/setup.py +++ b/service/setup.py @@ -19,6 +19,10 @@ import sys if 'develop' in sys.argv: sys.argv.append('--always-unzip') +# next line is a fix to this error that occurs with nose > 1.1.2 and the debian +# python: http://bugs.python.org/issue15881#msg170215 +import multiprocessing + from setuptools import setup from collections import defaultdict import os @@ -69,9 +73,9 @@ setup(name='pixelated-user-agent', packages=['pixelated', 'pixelated.adapter', 'pixelated.bitmask_libraries', 'pixelated.config', 'pixelated.certificates', 'pixelated.support', 'pixelated.controllers'], test_suite='nose.collector', install_requires=[ - 'Twisted', - 'flask', - 'requests', + 'Twisted==14.0.2', + 'flask==0.10.1', + 'requests==2.4.3', 'srp==1.0.5', 'dirspec==13.10', 'u1db==13.09', @@ -80,8 +84,8 @@ setup(name='pixelated-user-agent', 'leap.soledad.client==0.5.2', 'leap.mail==0.3.9-1-gc1f9c92', 'whoosh==2.6.0', - 'gunicorn', - 'crochet' + 'gunicorn==19.1.1', + 'crochet==1.3.0' ], entry_points={ 'console_scripts': [ diff --git a/service/test_requirements.txt b/service/test_requirements.txt index 229ea941..27529497 100644 --- a/service/test_requirements.txt +++ b/service/test_requirements.txt @@ -1,7 +1,7 @@ PyHamcrest==1.8.1 behave==1.2.4 selenium==2.43.0 -nose -mock -httmock -mockito +nose==1.3.2 +mock==1.0.1 +httmock==1.2.2 +mockito==0.5.2 |