Changed to new module naming convention, abandoned namespace packages

Author: ErikBjare

__main__.py

@@ -1,3 +1,3 @@
-import aw.server
+import aw_server
 
-aw.server.main()
+aw_server.main()

aw/server/__init__.py aw_server/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
 from .server import _start
-from aw.datastore import Datastore, get_storage_methods, get_storage_method_names
+from aw_datastore import Datastore, get_storage_methods, get_storage_method_names
 
 
 def main():

aw/server/api.py aw_server/api.py

@@ -3,7 +3,7 @@
 from flask import Flask
 from flask.ext.cors import CORS
 
-from aw.datastore import Datastore
+from aw_datastore import Datastore
 
 
 app = Flask("aw-server")
@@ -12,7 +12,7 @@
 # The following will be set when started
 app.db = None  # type: Datastore
 
-# Only to be called from aw.server.main function!
+# Only to be called from aw_server.main function!
 def _start(storage_method, port=5600, testing=False):
     # TODO: Restructure so it's called in a more sane way
     app.db = Datastore(storage_method, testing=testing)

aw/server/main.py aw_server/main.py

@@ -1,17 +1,16 @@
 #!/usr/bin/env python
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 setup(name='aw-server',
       version='0.1',
       description='ActivityWatch server',
       author='Erik Bjäreholt',
       author_email='[email protected]',
       url='https://github.com/ActivityWatch/aw-server',
-      namespace_packages=['aw'],
-      packages=['aw.server'],
+      packages=['aw_server'],
       install_requires=['aw-core', 'flask>=0.10', 'Flask-RESTful>=0.3', 'Flask-Cors>=2.1', 'pymongo>=3.2', 'appdirs==1.4.0'],
       entry_points={
-            'console_scripts': ['aw-server = aw.server:main']
+            'console_scripts': ['aw-server = aw_server:main']
         }
      )

aw/server/server.py aw_server/server.py

@@ -2,11 +2,11 @@
 import unittest
 from datetime import datetime
 
-from aw.client import ActivityWatchClient
-from aw.core.models import Event
+from aw_client import ActivityWatchClient
+from aw_core.models import Event
 
-from aw.server import datastore
-from aw.server.datastore import Datastore
+from aw_server import datastore
+from aw_server.datastore import Datastore
 
 logging.basicConfig(level=logging.DEBUG)