summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorefkin <efkin@riseup.net>2017-03-13 19:28:11 +0100
committerKali Kaneko <kali@leap.se>2017-03-17 17:52:55 +0100
commit1034d3107b57f03d7ed2257aef39cede2f6686ef (patch)
tree2b599ea3687566a8eb09c1cc8b591f2cc5181a1c /server
parent5cf77ccd4df00a59c8cb8d4670f2964f021ae862 (diff)
[test] Prepare new tox environment
At this point tests are not yet collectable in the new environment. But no regressions observed.
Diffstat (limited to 'server')
-rw-r--r--server/pkg/requirements.pip4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index e4a87e74..8354e94c 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -3,4 +3,6 @@ PyOpenSSL
twisted>=12.3.0
Beaker
couchdb
-python-cjson
+# Upstream needs a patch for py3 compatibility
+# Eventually falling back to standard json
+# python-cjson