diff options
| author | efkin <efkin@riseup.net> | 2017-03-13 19:28:11 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-03-17 17:52:55 +0100 |
| commit | 1034d3107b57f03d7ed2257aef39cede2f6686ef (patch) | |
| tree | 2b599ea3687566a8eb09c1cc8b591f2cc5181a1c | |
| parent | 5cf77ccd4df00a59c8cb8d4670f2964f021ae862 (diff) | |
[test] Prepare new tox environment
At this point tests are not yet collectable
in the new environment. But no regressions observed.
| -rw-r--r-- | client/pkg/requirements.pip | 3 | ||||
| -rw-r--r-- | server/pkg/requirements.pip | 4 | ||||
| -rw-r--r-- | testing/tox.ini | 28 |
3 files changed, 33 insertions, 2 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 24b168b4..44ff4511 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -1,5 +1,6 @@ -pysqlcipher>2.6.3 scrypt zope.proxy twisted cryptography +pysqlcipher;python_version=="2.7" +pysqlcipher3;python_version=="3.4"
\ No newline at end of file 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 diff --git a/testing/tox.ini b/testing/tox.ini index c46c6af1..d959db0a 100644 --- a/testing/tox.ini +++ b/testing/tox.ini @@ -31,6 +31,34 @@ setenv = TERM=xterm install_command = pip install {opts} {packages} +[testenv:py34] +basepython = python3.4 +commands = py.test --ignore=tests/benchmarks \ + --cov-report=html \ + --cov-report=term \ + --cov=leap.soledad \ + {posargs} +usedevelop = True +deps = + coverage + pytest + pytest-cov + pytest-twisted + mock + testscenarios + setuptools-trial + couchdb + requests + service_identity +# install soledad local packages + -e../common + -e../client + -e../server +setenv = + HOME=/tmp + TERM=xterm +install_command = pip3 install {opts} {packages} + [testenv:benchmark] deps = {[testenv]deps} |