summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2015-01-28 12:51:29 -0200
committerDuda Dornelles <ddornell@thoughtworks.com>2015-01-28 12:52:10 -0200
commitffa5fc3a26887dc98d1d2671828ee8272054aba7 (patch)
tree17b5726c4d05ea74e5aff2d64e6d5162cf896e5b
parent9e24214a53a237e9d76e338536e3567aad70e730 (diff)
Fixing the assets issue for good I hope - adding it to MANIFETS.in file.
Also cleaning up the setup.py file, there were lots of unused stuff there
-rw-r--r--service/MANIFEST.in1
-rw-r--r--service/setup.py33
2 files changed, 1 insertions, 33 deletions
diff --git a/service/MANIFEST.in b/service/MANIFEST.in
index e18fa770..a4fb90be 100644
--- a/service/MANIFEST.in
+++ b/service/MANIFEST.in
@@ -1,4 +1,5 @@
include README.md
recursive-include pixelated/certificates *.*
+recursive-include pixelated/assets *.*
recursive-include debian *
diff --git a/service/setup.py b/service/setup.py
index 00425c77..13844670 100644
--- a/service/setup.py
+++ b/service/setup.py
@@ -27,38 +27,6 @@ from collections import defaultdict
import os
-def _folder_for(file):
- broken_path = file.split('/')
- new_path = "web-ui/app/" + "/".join(broken_path[3:(len(broken_path) - 1)])
- return new_path[0:-1] if new_path[-1] == '/' else new_path
-
-
-def _create_data_files(original_files):
- data_files_hash = defaultdict(list)
-
- for file in original_files:
- data_files_hash[_folder_for(file)].append(file)
-
- return data_files_hash.items()
-
-
-def _web_ui_files():
- web_ui_files = []
- for root, dirname, filenames in os.walk('../web-ui/dist'):
- for filename in filenames:
- web_ui_files.append(os.path.join(root, filename))
- return web_ui_files
-
-
-def data_files():
- certificates = ('pixelated/certificates', ['pixelated/certificates/example.wazokazi.is.ca.crt'])
-
- _data_files = _create_data_files(_web_ui_files())
- _data_files.append(certificates)
-
- return _data_files
-
-
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -105,6 +73,5 @@ setup(name='pixelated-user-agent',
'pixelated-user-agent = pixelated.config:initialize'
]
},
- data_files=data_files(),
include_package_data=True
)