summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-01 01:23:30 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-01 01:23:30 -0400
commit720ac7cab46f57971c71d2d2aec8235a47a53582 (patch)
tree9c770e512f86c85f626ae3ee8c1e71c8b70b64d7
parentc5a3ad66c44267e2e8906f472251db82279d287f (diff)
[tests] add a separate env for development branches of soledad/common
-rw-r--r--README.rst9
-rw-r--r--setup.py6
-rw-r--r--tox.ini22
3 files changed, 26 insertions, 11 deletions
diff --git a/README.rst b/README.rst
index 80dbb671..ecfe3fa0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
bitmask-dev
===========
-Your internet encryption toolkit.
+**Your internet encryption toolkit**
Develop
-------
@@ -9,7 +9,9 @@ If you want to develop for the encrypted mail service, execute inside your virtu
make dev-mail
-If you want to develop for the gui client::
+If you want to develop for the gui client too, you have to have installed the
+python2 bindings for Qt5 in your system (in debian is python-pyqt5). After
+ensuring this, you can do::
make dev-all
@@ -21,4 +23,7 @@ Tests need tox::
pip install tox
tox
+If you are developing against a non-published branch of leap.common or
+leap.soledad, run instead::
+ tox -e py27-dev
diff --git a/setup.py b/setup.py
index bbc0452d..c49f0628 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ import versioneer
# Note that here we can specify ranges.
required = [
- 'twisted', # 14.0.0
+ 'twisted>=14.0.0',
'zope.interface',
'service-identity',
'colorama',
@@ -26,10 +26,10 @@ extras = {
'gnupg',
],
'gui': [
- 'PyQt',
+ 'vext.pyqt5',
],
'all': [
- 'PyQt',
+ 'vext.pyqt5',
'leap.soledad.client',
'gnupg',
]
diff --git a/tox.ini b/tox.ini
index 67719391..dda0a345 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,13 +14,23 @@ deps =
pytest-cov
setuptools-trial
gnupg
- leap.soledad.common
-
- # move this to another env!
- #leap.soledad.client
- -e../soledad/client
+ leap.soledad.client
-e.
setenv =
HOME=/tmp
-
+[testenv:py27-dev]
+# This environment assumes developer has checked out
+# leap_common and soledad repos in the parent folder.
+deps =
+ mock
+ pep8
+ pytest
+ pytest-pep8
+ pytest-cov
+ setuptools-trial
+ gnupg
+ -e../leap_common
+ -e../soledad/common
+ -e../soledad/client
+ -e.