From 91e4481c450eb7eb928debc1cb7fa59bdb63dd7b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 25 Jul 2017 11:40:11 -0400 Subject: [pkg] packaging and path changes - move all the pixelated python package under src/ - move the pixelated_www package under the leap namespace - allow to set globally the static folder - add hours and minutes to the timestamp in package version, to allow for several releases a day. --- web-ui/Makefile | 2 +- web-ui/leap/__init__.py | 6 ++++++ web-ui/pixelated_www/__init__.py | 0 web-ui/setup.py | 24 ++++++++---------------- 4 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 web-ui/leap/__init__.py delete mode 100644 web-ui/pixelated_www/__init__.py (limited to 'web-ui') diff --git a/web-ui/Makefile b/web-ui/Makefile index 3ee83eb4..4633a769 100644 --- a/web-ui/Makefile +++ b/web-ui/Makefile @@ -36,7 +36,7 @@ pydist-clean: clean pydist-wheel: - cp -r dist/* pixelated_www/ + cp -r dist/* leap/pixelated_www/ python setup.py bdist_wheel diff --git a/web-ui/leap/__init__.py b/web-ui/leap/__init__.py new file mode 100644 index 00000000..f48ad105 --- /dev/null +++ b/web-ui/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/web-ui/pixelated_www/__init__.py b/web-ui/pixelated_www/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/web-ui/setup.py b/web-ui/setup.py index 2f1266f7..fbf51422 100644 --- a/web-ui/setup.py +++ b/web-ui/setup.py @@ -21,27 +21,19 @@ import datetime import time now = datetime.datetime.now() -timestamp = time.strftime('%Y%m%d', now.timetuple()) +timestamp = time.strftime('%Y%m%d%H%M', now.timetuple()) setup(name='leap.pixelated-www', - version='1.0beta2.%s' % timestamp, + version='1.0.%s' % timestamp, description='Static Assets for the Pixelated User Agent UI', author='LEAP Encryption Access Project', author_email='info@leap.se', url='http://github.com/leapcode/pixelated-user-agent', + license='GNU Affero General Public License v3 or later (AGPLv3+)', namespace_packages=['leap'], - packages=['pixelated_www'], + packages=['leap.pixelated_www'], package_data={ - '': ['404.html', - 'index.html', - 'app.min.js', - 'sandbox.html', - 'sandbox.min.js', - 'bower_components/jquery-file-upload/css/*', - 'bower_components/font-awesome/css/*', - 'bower_components/font-awesome/fonts/*', - 'css/*', - 'fonts/*', - 'locales/en-us/*', - 'locales/pt/*', - 'locales/sv/*']}) + '': ['protected/*', + 'protected/css/*', + 'protected/fonts/*', + 'public/*']}) -- cgit v1.2.3