diff options
| author | drebs <drebs@leap.se> | 2015-03-19 09:54:38 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-03-19 11:52:44 -0300 |
| commit | 4b78cf9da0874501fa123a02b53d7650e8dfcdf1 (patch) | |
| tree | 599788f72a7d116bb151a39ac9616bc81a8974d1 | |
| parent | cf3c5018820f982ae64c2e062391b0a3b6e52f21 (diff) | |
[fix] add/fix dependency on twisted
Add dependency on twisted for Soledad Client. Also remove minimum twisted
version for Soledad Server because debian stable currently distributes 12.0.0
and pypi currently distributes 15.0.0.
Closes: #6797
| -rw-r--r-- | client/changes/bug_6797_add-dependency-on-twisted | 1 | ||||
| -rw-r--r-- | client/pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | server/changes/bug_6797_add-dependency-on-twisted | 1 | ||||
| -rw-r--r-- | server/pkg/requirements.pip | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/client/changes/bug_6797_add-dependency-on-twisted b/client/changes/bug_6797_add-dependency-on-twisted new file mode 100644 index 00000000..962222b0 --- /dev/null +++ b/client/changes/bug_6797_add-dependency-on-twisted @@ -0,0 +1 @@ + o Add dependency on Twisted. Closes #6797. diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 61258f01..33770adc 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -5,6 +5,7 @@ scrypt pycryptopp cchardet zope.proxy +twisted # # leap deps diff --git a/server/changes/bug_6797_add-dependency-on-twisted b/server/changes/bug_6797_add-dependency-on-twisted new file mode 100644 index 00000000..962222b0 --- /dev/null +++ b/server/changes/bug_6797_add-dependency-on-twisted @@ -0,0 +1 @@ + o Add dependency on Twisted. Closes #6797. diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip index 28717664..89ec52e7 100644 --- a/server/pkg/requirements.pip +++ b/server/pkg/requirements.pip @@ -4,9 +4,7 @@ simplejson u1db routes PyOpenSSL<0.14 - -# TODO: maybe we just want twisted-web? -twisted>=12.0.0 +twisted # leap deps -- bump me! leap.soledad.common>=0.6.0 |