summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbahling <sbahling@mudgum.net>2018-10-26 14:23:08 +0200
committersbahling <sbahling@mudgum.net>2018-10-26 14:23:08 +0200
commit1d1b23e5154e093a3e3e3e40b05946ab06c9738c (patch)
treea57773bf632c21cecc6427619ec23fd8c88d8b5d
parent38c4e8310ef6bde30d3628ee93103c631caed47b (diff)
downloadtascam-fw-osc-1d1b23e5154e093a3e3e3e40b05946ab06c9738c.tar.gz
tascam-fw-osc-1d1b23e5154e093a3e3e3e40b05946ab06c9738c.tar.xz
tascam-fw-osc-1d1b23e5154e093a3e3e3e40b05946ab06c9738c.zip
Create initial package setup with setuptools
-rw-r--r--.gitignore3
-rw-r--r--setup.py14
-rw-r--r--tascam_fw_console/__init__.py0
-rw-r--r--tascam_fw_console/buttons.py (renamed from buttons.py)2
-rw-r--r--[-rwxr-xr-x]tascam_fw_console/cli.py (renamed from tascam-fw-console)11
-rw-r--r--tascam_fw_console/console.py (renamed from console.py)4
-rw-r--r--tascam_fw_console/faders.py (renamed from faders.py)4
-rw-r--r--tascam_fw_console/fw_1884_buttons.py (renamed from fw_1884_buttons.py)2
-rw-r--r--tascam_fw_console/osc.py (renamed from osc.py)0
-rw-r--r--tascam_fw_console/strips.py (renamed from strips.py)4
10 files changed, 33 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8ed6435
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__
+build
+dist
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..a7da136
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+from setuptools import setup
+
+PROJECT = 'tascam_fw_console'
+
+setup(name=PROJECT,
+ version='0.1',
+ author='Scott Bahling',
+ author_email='sbahling@mudgum.net',
+ packages=[PROJECT],
+ entry_points = {
+ 'console_scripts': ['tascam-fw-console=tascam_fw_console.cli:main'],
+ },
+ )
diff --git a/tascam_fw_console/__init__.py b/tascam_fw_console/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tascam_fw_console/__init__.py
diff --git a/buttons.py b/tascam_fw_console/buttons.py
index f914435..c818760 100644
--- a/buttons.py
+++ b/tascam_fw_console/buttons.py
@@ -22,7 +22,7 @@
import re
import pyautogui
-import osc
+from tascam_fw_console import osc
keymap = {'CTRL': 'ctrl',
diff --git a/tascam-fw-console b/tascam_fw_console/cli.py
index 65cd83b..401a953 100755..100644
--- a/tascam-fw-console
+++ b/tascam_fw_console/cli.py
@@ -34,10 +34,11 @@ Options:
"""
from docopt import docopt
-from console import Console, list_units
-import osc
+from tascam_fw_console.console import Console, list_units
+from tascam_fw_console import osc
-if __name__ == "__main__":
+
+def main():
args = docopt(__doc__, version='0.1')
@@ -53,3 +54,7 @@ if __name__ == "__main__":
print("Serving on {}".format(osc.server.server_address))
osc.server.serve_forever()
+
+
+if __name__ == '__main__':
+ main()
diff --git a/console.py b/tascam_fw_console/console.py
index 3fdb3d0..103f755 100644
--- a/console.py
+++ b/tascam_fw_console/console.py
@@ -25,8 +25,8 @@ import time
import threading
from pathlib import Path
-import strips
-import fw_1884_buttons
+from tascam_fw_console import strips
+from tascam_fw_console import fw_1884_buttons
import gi
diff --git a/faders.py b/tascam_fw_console/faders.py
index 6d57b33..c9145a2 100644
--- a/faders.py
+++ b/tascam_fw_console/faders.py
@@ -20,8 +20,8 @@
:license: GPL-2.0, see COPYING for details
"""
-from buttons import Button
-import osc
+from tascam_fw_console.buttons import Button
+from tascam_fw_console import osc
status_quadlets = (4, 0, 0, 1, 1, 2, 2, 3, 3)
status_bits = ((1, 16),
diff --git a/fw_1884_buttons.py b/tascam_fw_console/fw_1884_buttons.py
index 7ef12f7..44f3b60 100644
--- a/fw_1884_buttons.py
+++ b/tascam_fw_console/fw_1884_buttons.py
@@ -20,7 +20,7 @@
:license: GPL-2.0, see COPYING for details
"""
-import buttons
+from tascam_fw_console import buttons
def init_buttons(console):
diff --git a/osc.py b/tascam_fw_console/osc.py
index fb17449..fb17449 100644
--- a/osc.py
+++ b/tascam_fw_console/osc.py
diff --git a/strips.py b/tascam_fw_console/strips.py
index a530725..8d195f8 100644
--- a/strips.py
+++ b/tascam_fw_console/strips.py
@@ -20,8 +20,8 @@
:license: GPL-2.0, see COPYING for details
"""
-from faders import Fader
-import osc
+from tascam_fw_console.faders import Fader
+from tascam_fw_console import osc
class Strip():