summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-07 18:41:20 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-07 18:41:20 -0400
commit86e9758e7e1cb9067d692c881d1926a80c350aaa (patch)
treef2ef73c148fea7f1a8d000f029047dcd4cc1222a
parent2bd7bb7cfeb56eb126a39c61f7e6926fc97538ec (diff)
[pkg] update deps: bitmask_www already published
-rw-r--r--README.rst45
-rw-r--r--setup.py4
2 files changed, 39 insertions, 10 deletions
diff --git a/README.rst b/README.rst
index b1f41932..81255036 100644
--- a/README.rst
+++ b/README.rst
@@ -27,10 +27,22 @@ application.
.. _`PyQt5`: https://pypi.python.org/pypi/PyQt5
.. _`GPL3`: http://www.gnu.org/licenses/gpl.txt
+Package under development!
+--------------------------
+This is a unified repo that has merged the following packages, previously isolated, under the leap namespace:
+
+bonafide, mail, keymanager, bitmask.
+
+The previous Qt client has been deprecated (bitmask version 0.8.2, still
+available at the http://github.com/leapcode/bitmask_client repo).
+
+Note that this repo still doesn't have support for VPN: its porting will
+follow soon.
+
Read the Docs!
------------------
-The latest documentation is available at `LEAP`_.
+The latest documentation about Bitmask is available at `LEAP`_.
.. _`LEAP`: https://leap.se/en/docs/client
@@ -56,13 +68,6 @@ And then run all the tests::
tox
-If you are developing against a non-published branch of ``leap.common`` or
-``leap.soledad``, run instead::
-
- tox -e py27-dev
-
-This expects ``leap_common`` and ``soledad`` repos to be checked out in the
-parent folder.
Hacking
-------
@@ -77,6 +82,30 @@ python-pyqt5.qtwebkit``). After ensuring this, you can do::
make dev-all
+hacking on the webui
+++++++++++++++++++++
+
+The above instructions will install a python package that contains a
+pre-compiled version of all the html+js elements, which is updated
+periodically. If you want to hack on the
+web-ui, you should read the instructions on the ``www/README.rst``. If you want
+to test the integration of the web-ui and the webkit client, you can install a
+development version of the bitmask_www package. Inside your virtualenv::
+
+ cd www
+ make pydist-dev
+
+cross-testing
++++++++++++++
+
+If you are developing against a non-published branch of ``leap.common`` or
+``leap.soledad``, run instead::
+
+ tox -e py27-dev
+
+This expects ``leap_common`` and ``soledad`` repos to be checked out in the
+parent folder.
+
License
=======
diff --git a/setup.py b/setup.py
index d96b7337..2cc181bf 100644
--- a/setup.py
+++ b/setup.py
@@ -27,11 +27,11 @@ extras = {
],
'gui': [
'vext.pyqt5',
- # 'bitmask_www' # when it's published in pypi
+ 'bitmask_www',
],
'all': [
'vext.pyqt5',
- # 'bitmask_www' # when it's published in pypi
+ 'bitmask_www',
'leap.soledad.client',
'gnupg',
]