Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed setup, now the packages can be uploaded to pypi

  • Loading branch information...
commit 879d74c5cc07ec3bb377369abf80aeb91276216f 1 parent 4b945b3
@hgdeoro authored
Showing with 71 additions and 5 deletions.
  1. +1 −0  .gitignore
  2. +56 −0 MANIFEST
  3. +14 −5 setup.py
View
1  .gitignore
@@ -22,3 +22,4 @@
/dev-scripts/rsync-from-ubuntu-vm.sh
/dev-scripts/rsync-to-ubuntu-vm.sh
/dev-scripts/rsync/
+/dist
View
56 MANIFEST
@@ -0,0 +1,56 @@
+# file GENERATED by distutils, do NOT edit
+setup.py
+version.py
+src/daedalus_local_settings.py
+src/hgdeoro/__init__.py
+src/hgdeoro/daedalus/__init__.py
+src/hgdeoro/daedalus/fabfile.py
+src/hgdeoro/daedalus/settings.py
+src/hgdeoro/daedalus/storage.py
+src/hgdeoro/daedalus/test_runner.py
+src/hgdeoro/daedalus/utils.py
+src/hgdeoro/daedalus/proto/__init__.py
+src/hgdeoro/daedalus/proto/bulk_insert.py
+src/hgdeoro/daedalus/proto/bulk_insert2.py
+src/hgdeoro/daedalus/proto/custom_logging_handler.py
+src/hgdeoro/daedalus/proto/custom_logging_handler_daedalus.py
+src/hgdeoro/daedalus/proto/list_rows.py
+src/hgdeoro/daedalus/proto/query.py
+src/hgdeoro/daedalus/proto/random_log_generator.py
+src/hgdeoro/daedalus/proto/simple_client.py
+src/hgdeoro/daedalus/proto/timezone_tests.py
+src/hgdeoro/daedalus/web/__init__.py
+src/hgdeoro/daedalus/web/settings_backend_only.py
+src/hgdeoro/daedalus/web/settings_frontend_only.py
+src/hgdeoro/daedalus/web/urls.py
+src/hgdeoro/daedalus/web/wsgi.py
+src/hgdeoro/daedalus/web/backend/__init__.py
+src/hgdeoro/daedalus/web/backend/models.py
+src/hgdeoro/daedalus/web/backend/tests.py
+src/hgdeoro/daedalus/web/backend/views.py
+src/hgdeoro/daedalus/web/backend/management/__init__.py
+src/hgdeoro/daedalus/web/backend/management/commands/__init__.py
+src/hgdeoro/daedalus/web/backend/management/commands/syncdb_cassandra.py
+src/hgdeoro/daedalus/web/frontend/__init__.py
+src/hgdeoro/daedalus/web/frontend/models.py
+src/hgdeoro/daedalus/web/frontend/tests.py
+src/hgdeoro/daedalus/web/frontend/views.py
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/powered_by_cassandra.jpg
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/css/bootstrap-responsive.css
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/css/bootstrap-responsive.min.css
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/css/bootstrap.css
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/css/bootstrap.min.css
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/ico/favicon.ico
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/img/glyphicons-halflings-white.png
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/img/glyphicons-halflings.png
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/js/bootstrap.js
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/js/bootstrap.min.js
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/js/jquery.js
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/js/google-code-prettify/prettify.css
+src/hgdeoro/daedalus/web/frontend/static/daedalus/frontend/bootstrap-2.0.4/js/google-code-prettify/prettify.js
+src/hgdeoro/daedalus/web/frontend/templates/daedalus/frontend/base.html
+src/hgdeoro/daedalus/web/frontend/templates/daedalus/frontend/charts.html
+src/hgdeoro/daedalus/web/frontend/templates/daedalus/frontend/index.html
+src/hgdeoro/daedalus/web/frontend/templates/daedalus/frontend/status.html
+src/hgdeoro/daedalus/web/frontend/templatetags/__init__.py
+src/hgdeoro/daedalus/web/frontend/templatetags/frontend_helpers.py
View
19 setup.py
@@ -2,7 +2,7 @@
from distutils.core import setup
from distutils.command.install import INSTALL_SCHEMES
-from setuptools import find_packages
+from distutils.util import convert_path
"""
This is the setup file for the Daedalus server, which includes:
@@ -47,14 +47,14 @@ def gen_data_files():
data_files = []
- walk_directory = os.path.join(base_directory, 'web')
+ walk_directory = os.path.join(base_directory, 'src')
for dirpath, dirnames, filenames in os.walk(walk_directory):
# dirpath -> absolute path
# relative_dirpath -> relative to 'base_directory'
relative_dirpath = dirpath[(len(base_directory)+1):]
data_files.append([
relative_dirpath,
- [os.path.join(relative_dirpath, f) for f in filenames]
+ [os.path.join(relative_dirpath, f) for f in filenames if not f.endswith('.pyc')]
])
return data_files
@@ -84,7 +84,16 @@ def gen_data_files():
author="Horacio G. de Oro",
author_email="hgdeoror@gmail.com",
url="https://github.com/hgdeoro/daedalus",
- packages=find_packages('src'),
+ packages=[
+ 'hgdeoro',
+ 'hgdeoro.daedalus',
+ 'hgdeoro.daedalus.web',
+ 'hgdeoro.daedalus.web.frontend',
+ 'hgdeoro.daedalus.web.frontend.templatetags',
+ 'hgdeoro.daedalus.web.backend',
+ 'hgdeoro.daedalus.web.backend.management',
+ 'hgdeoro.daedalus.web.backend.management.commands',
+ ],
package_dir={'': 'src'},
install_requires=[
'pycassa==1.6.0',
@@ -92,5 +101,5 @@ def gen_data_files():
'pylibmc==1.2.3',
],
classifiers=classifiers,
- data_files=gen_data_files(),
+ data_files=[('', ['version.py'])] + gen_data_files(),
)
Please sign in to comment.
Something went wrong with that request. Please try again.