summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsis Agora Lovecruft <isis@torproject.org>2013-05-06 11:17:14 -0700
committerIsis Agora Lovecruft <isis@torproject.org>2013-05-06 11:17:14 -0700
commitbe4ed13104164d67ae30da0740ef50c14c245d2a (patch)
tree0b37cbacf30d93a8c92a68afd51b409f31832cfc
parent471c584b4fac9de68200f3b252292f1735f3d1a4 (diff)
parentb8580daf5ef13e36d20443ac9f8ac21eee0404bb (diff)
Merge pull request #2 from kalikaneko/leap-namespace
Leap namespace
-rw-r--r--setup.py34
-rw-r--r--src/leap/__init__.py18
-rw-r--r--src/leap/mx/__init__.py5
3 files changed, 44 insertions, 13 deletions
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..efceb4c
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# setup.py
+# Copyleft (C) 2013 LEAP
+"""
+setup file for leap.mx
+"""
+from setuptools import setup, find_packages
+
+requirements = [
+ "twisted",
+ #...
+]
+
+# XXX add classifiers, docs
+
+setup(
+ name='leap.mx',
+ version='0.0.1',
+ url='https://leap.se/',
+ license='',
+ author="Isis Agora Lovecruft",
+ author_email="<isis@leap.se> 0x2cdb8b35",
+ description=("An asynchronous, transparently-encrypting remailer "
+ "for the LEAP platform"),
+ long_description=(
+ "An asynchronous, transparently-encrypting remailer "
+ "using BigCouch/CouchDB and PGP/GnuPG, written in Twisted Python."
+ ),
+ namespace_packages=["leap"],
+ package_dir={'': 'src'},
+ packages=find_packages('src'),
+ #test_suite='leap.mx.tests',
+ install_requires=requirements,
+)
diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 8b30f3d..f48ad10 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,12 +1,6 @@
-# -*- encoding: utf-8 -*-
-"""
-leap/__init__.py
-----------------
-Module intialization file for leap.
-"""
-
-from leap.mx.util import version
-
-__all__ = ['mx']
-__author__ = version.getAuthors()
-__version__ = version.getVersion()
+# 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/src/leap/mx/__init__.py b/src/leap/mx/__init__.py
index 27fadca..8ef1bc9 100644
--- a/src/leap/mx/__init__.py
+++ b/src/leap/mx/__init__.py
@@ -2,7 +2,10 @@
"""
leap/mx/__init__.py
-------------------
-Module intialization file for leap.mx .
+Module initialization file for leap.mx .
"""
+from leap.mx.util import version
__all__ = ['alias_resolver', 'couchdb', 'exceptions', 'runner', 'util']
+__author__ = version.getAuthors()
+__version__ = version.getVersion()