summaryrefslogtreecommitdiff
path: root/ui/pydist
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-09-21 16:08:17 -0700
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-22 11:40:12 -0400
commitac5ead7f617631fe9cae2d10c2d6d2a709305d1e (patch)
tree8c5ace62089011f5e4d4eaeccc45968a8e43928d /ui/pydist
parent073393af311d36c8ca7570ff0d3f0a3117c0b544 (diff)
[pkg] bitmask_js => leap.bitmask_js
Diffstat (limited to 'ui/pydist')
-rw-r--r--ui/pydist/README.md3
-rw-r--r--ui/pydist/leap/__init__.py6
-rw-r--r--ui/pydist/setup.py11
3 files changed, 14 insertions, 6 deletions
diff --git a/ui/pydist/README.md b/ui/pydist/README.md
index 6e2b11f6..9e6f187f 100644
--- a/ui/pydist/README.md
+++ b/ui/pydist/README.md
@@ -1,4 +1,5 @@
-This directory holds the python package of the javascript app, called 'bitmask_js'.
+This directory holds the python package of the javascript app, called
+'leap.bitmask_js'.
Why it it done this way? By creating a python package, it is easier for the
javascript app to be distributed with the bitmask client.
diff --git a/ui/pydist/leap/__init__.py b/ui/pydist/leap/__init__.py
new file mode 100644
index 00000000..f48ad105
--- /dev/null
+++ b/ui/pydist/leap/__init__.py
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+ __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
diff --git a/ui/pydist/setup.py b/ui/pydist/setup.py
index b5d3ffb1..794b8e2d 100644
--- a/ui/pydist/setup.py
+++ b/ui/pydist/setup.py
@@ -25,26 +25,27 @@ import datetime
import time
long_description = \
-'''bitmask_js
------------------
+'''leap.bitmask_js
+-----------------
This package contains the already compiled javascript resources for the bitmask UI.
If you want to develop for this UI, please checkout the bitmask-dev [0] repo and follow the instructions in the ui/README.md file.
[0] https://github.com/leapcode/bitmask-dev'''
-now = datetime.datetime.now()
+now = datetime.datetime.now()
timestamp = time.strftime('%Y%m%d%H%M', now.timetuple())
setup(
- name='bitmask_js',
+ name='leap.bitmask_js',
version='0.1.%s' % timestamp,
description='Bitmask UI',
long_description=long_description,
author='LEAP Encrypted Access Project',
author_email='info@leap.se',
+ namespace_packages=['leap'],
url='http://leap.se',
- packages=['bitmask_js'],
+ packages=['leap.bitmask_js'],
package_data={
'': ['public/*',
'public/css/*',