Added setup.py and changed app to pixelated because it will be a package

20 files changed, 48 insertions, 14 deletions

diff --git a/service/go b/service/go
index d0d83096..a937b8b1 100755
--- a/service/go
+++ b/service/go
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from app.pixelated_user_agent import setup
+from pixelated.user_agent import setup
 import os
 os.environ['PIXELATED_UA_CFG']='../config/pixelated_ua.cfg'
 setup()
diff --git a/service/app/__init__.py b/service/pixelated/__init__.py
index e69de29b..e69de29b 100644
--- a/service/app/__init__.py
+++ b/service/pixelated/__init__.py
diff --git a/service/app/adapter/__init__.py b/service/pixelated/adapter/__init__.py
index e69de29b..e69de29b 100644
--- a/service/app/adapter/__init__.py
+++ b/service/pixelated/adapter/__init__.py
diff --git a/service/app/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py
index 0704f0bb..6498a2e7 100644
--- a/service/app/adapter/mail_service.py
+++ b/service/pixelated/adapter/mail_service.py
@@ -2,12 +2,12 @@ import traceback
 import sys
 import os
 from twisted.internet import defer
-from app.bitmask_libraries.config import LeapConfig
-from app.bitmask_libraries.provider import LeapProvider
-from app.bitmask_libraries.session import LeapSessionFactory
-from app.bitmask_libraries.auth import LeapCredentials
-from app.adapter.pixelated_mail import PixelatedMail
-from app.tags import Tags
+from pixelated.bitmask_libraries.config import LeapConfig
+from pixelated.bitmask_libraries.provider import LeapProvider
+from pixelated.bitmask_libraries.session import LeapSessionFactory
+from pixelated.bitmask_libraries.auth import LeapCredentials
+from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.tags import Tags
 
 
 class MailService:
diff --git a/service/app/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py
index 2f1e14e9..49a045f2 100644
--- a/service/app/adapter/pixelated_mail.py
+++ b/service/pixelated/adapter/pixelated_mail.py
@@ -1,5 +1,5 @@
-from app.tags import Tag
-from app.tags import Tags
+from pixelated.tags import Tag
+from pixelated.tags import Tags
 import dateutil.parser as dateparser
 
 
diff --git a/service/app/bitmask_libraries/__init__.py b/service/pixelated/bitmask_libraries/__init__.py
index e69de29b..e69de29b 100644
--- a/service/app/bitmask_libraries/__init__.py
+++ b/service/pixelated/bitmask_libraries/__init__.py
diff --git a/service/app/bitmask_libraries/auth.py b/service/pixelated/bitmask_libraries/auth.py
index 0b963587..0b963587 100644
--- a/service/app/bitmask_libraries/auth.py
+++ b/service/pixelated/bitmask_libraries/auth.py
diff --git a/service/app/bitmask_libraries/certs.py b/service/pixelated/bitmask_libraries/certs.py
index 22a95591..22a95591 100644
--- a/service/app/bitmask_libraries/certs.py
+++ b/service/pixelated/bitmask_libraries/certs.py
diff --git a/service/app/bitmask_libraries/config.py b/service/pixelated/bitmask_libraries/config.py
index 63524389..63524389 100644
--- a/service/app/bitmask_libraries/config.py
+++ b/service/pixelated/bitmask_libraries/config.py
diff --git a/service/app/bitmask_libraries/leap_srp.py b/service/pixelated/bitmask_libraries/leap_srp.py
index 2590e731..2590e731 100644
--- a/service/app/bitmask_libraries/leap_srp.py
+++ b/service/pixelated/bitmask_libraries/leap_srp.py
diff --git a/service/app/bitmask_libraries/nicknym.py b/service/pixelated/bitmask_libraries/nicknym.py
index c4939e9a..c4939e9a 100644
--- a/service/app/bitmask_libraries/nicknym.py
+++ b/service/pixelated/bitmask_libraries/nicknym.py
diff --git a/service/app/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py
index b130af89..b130af89 100644
--- a/service/app/bitmask_libraries/provider.py
+++ b/service/pixelated/bitmask_libraries/provider.py
diff --git a/service/app/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index 4e1dd397..4e1dd397 100644
--- a/service/app/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
diff --git a/service/app/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index f07a4838..f07a4838 100644
--- a/service/app/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
diff --git a/service/app/bitmask_libraries/soledad.py b/service/pixelated/bitmask_libraries/soledad.py
index 132e671f..132e671f 100644
--- a/service/app/bitmask_libraries/soledad.py
+++ b/service/pixelated/bitmask_libraries/soledad.py
diff --git a/service/app/reactor_manager.py b/service/pixelated/reactor_manager.py
index 01f7f545..01f7f545 100644
--- a/service/app/reactor_manager.py
+++ b/service/pixelated/reactor_manager.py
diff --git a/service/app/search_query.py b/service/pixelated/search_query.py
index d31129ba..d31129ba 100644
--- a/service/app/search_query.py
+++ b/service/pixelated/search_query.py
diff --git a/service/app/tags.py b/service/pixelated/tags.py
index 7452b7d6..7452b7d6 100644
--- a/service/app/tags.py
+++ b/service/pixelated/tags.py
diff --git a/service/app/pixelated_user_agent.py b/service/pixelated/user_agent.py
index 80c97bbb..b70ed37c 100644
--- a/service/app/pixelated_user_agent.py
+++ b/service/pixelated/user_agent.py
@@ -6,11 +6,11 @@ from flask import Flask
 from flask import request
 from flask import Response
 
-import app.reactor_manager as reactor_manager
-import app.search_query as search_query
-from app.adapter.mail_service import MailService
-from app.adapter.pixelated_mail import PixelatedMail
-from app.tags import Tags
+import pixelated.reactor_manager as reactor_manager
+import pixelated.search_query as search_query
+from pixelated.adapter.mail_service import MailService
+from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.tags import Tags
 
 app = Flask(__name__, static_url_path='', static_folder='../../web-ui/app')
 
diff --git a/service/setup.py b/service/setup.py
new file mode 100644
index 00000000..2e575d84
--- /dev/null
+++ b/service/setup.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+import os
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+setup(name='Pixelated User Agent Service',
+      version='0.1',
+      description='API to serve the pixelated front-end requests',
+      long_description=read('README.md'),
+      author='Thoughtworks',
+      author_email='pixelated-team@thoughtworks.com',
+      url='http://pixelated-project.github.io',
+      packages=['pixelated'],
+      install_requires=[
+          'scrypt',
+          'Twisted==12.2.0',
+          'flask==0.10.1',
+          'scanner==0.0.5',
+          'requests==2.3.0',
+          'pytest==2.6.0',
+          'mock==1.0.1',
+          'httmock==1.2.2',
+          'srp==1.0.4',
+          'dirspec==13.10',
+          'u1db==13.09',
+          'leap.keymanager==0.3.8',
+          'leap.soledad.common==0.5.2',
+          'leap.soledad.client==0.5.2',
+          'leap.mail==0.3.9-1-gc1f9c92',
+      ],
+     )