Restructured modules into a package

SpotlightKid · Oct 8, 2015 · 96ea1a3 · 96ea1a3
1 parent 5350b87
commit 96ea1a3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/osc2mqtt.py → osc2mqtt/__init__.py b/osc2mqtt.py → osc2mqtt/__init__.py
@@ -16,8 +16,8 @@
 import liblo
 import paho.mqtt.client as mqtt
 
-from converter import Osc2MqttConverter, ConversionRule
-from util import as_bool, parse_hostport, parse_list
+from .converter import Osc2MqttConverter, ConversionRule
+from .util import as_bool, parse_hostport, parse_list
 
 
 log = logging.getLogger('osc2mqtt')

diff --git a/osc2mqtt/__main__.py b/osc2mqtt/__main__.py
@@ -0,0 +1,5 @@
+if __name__ == '__main__':
+    import sys
+    from osc2mqtt import main
+
+    sys.exit(main(sys.argv[1:]) or 0)
diff --git a/converter.py → osc2mqtt/converter.py b/converter.py → osc2mqtt/converter.py
@@ -11,7 +11,7 @@
 
 from collections import namedtuple
 
-from util import as_bool, parse_list
+from .util import as_bool, parse_list
 
 try:
     # Python 3.2+

diff --git a/lru_cache.py → osc2mqtt/lru_cache.py b/lru_cache.py → osc2mqtt/lru_cache.py
diff --git a/util.py → osc2mqtt/util.py b/util.py → osc2mqtt/util.py
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 
 setup(
     name = name,
-    version = '0.1b2',
+    version = '0.1b1',
     description = __doc__.splitlines()[0],
     long_description = "\n".join(readme.splitlines()[2:]),
     keywords = 'osc mqtt iot',
@@ -47,18 +47,18 @@
     author = 'Christopher Arndt',
     author_email = 'chris@chrisarndt.de',
     url = url,
-    repository = 'https://github.com/SpotlightKid/%s' % name.lower(),
+    repository = url,
     download_url = url + '/releases',
     license = 'MIT License',
     platforms = 'POSIX, Windows, MacOS X',
-    py_modules = ['osc2mqtt'],
+    packages = ['osc2mqtt'],
     install_requires = [
         'paho-mqtt',
         'pyliblo',
     ],
     entry_points = {
         'console_scripts': [
-            'osc2mqtt = osc2mqtt:main'
+            'osc2mqtt = osc2mqtt.__main__:main'
         ]
     },
     zip_safe = True

diff --git a/start.sh b/start.sh
@@ -7,4 +7,4 @@ MQTT_HOST="dockstar3"
 MQTT_PORT="1883"
 OSC_PORT="9001"
 
-python osc2mqtt.py -m $MQTT_HOST:$MQTT_PORT -p $OSC_PORT "$@"
+PYTHONPATH=$(pwd) python -m osc2mqtt -m $MQTT_HOST:$MQTT_PORT -p $OSC_PORT "$@"