Maarten van den Berg 6 years ago
parent
commit
1e40955256
2 changed files with 35 additions and 65 deletions
  1. 5 5
      bin/install-service-files.py
  2. 30 60
      setup.py

+ 5 - 5
bin/install-service-files.py

@@ -1,11 +1,11 @@
1 1
 import os.path
2 2
 import sys
3 3
 
4
-systemd_user_dir = os.path.expanduser('~/.config/systemd/user')
4
+systemd_user_dir = os.path.expanduser("~/.config/systemd/user")
5 5
 
6 6
 python_interpreter_dir = os.path.dirname(sys.executable)
7
-uwsgi_path = os.path.join(python_interpreter_dir, 'uwsgi')
8
-piket_client_path = os.path.join(python_interpreter_dir, 'piket-client')
7
+uwsgi_path = os.path.join(python_interpreter_dir, "uwsgi")
8
+piket_client_path = os.path.join(python_interpreter_dir, "piket-client")
9 9
 
10 10
 server_template = f"""[Unit]
11 11
 Description=piket server daemon
@@ -36,10 +36,10 @@ WantedBy=graphical.target
36 36
 
37 37
 os.makedirs(systemd_user_dir, exist_ok=True)
38 38
 
39
-with open(os.path.join(systemd_user_dir, 'piket-server.service'), 'w') as f:
39
+with open(os.path.join(systemd_user_dir, "piket-server.service"), "w") as f:
40 40
     f.write(server_template)
41 41
 
42
-with open(os.path.join(systemd_user_dir, 'piket-client.service'), 'w') as f:
42
+with open(os.path.join(systemd_user_dir, "piket-client.service"), "w") as f:
43 43
     f.write(client_template)
44 44
 
45 45
 print("Done! Don't forget to systemctl --user daemon-reload.")

+ 30 - 60
setup.py

@@ -1,64 +1,34 @@
1 1
 from setuptools import setup
2 2
 
3 3
 setup(
4
-        name='piket',
5
-        version='0.0.2',
6
-
7
-        classifiers=[
8
-            'Development Status :: 2 - Pre-Alpha',
9
-            'License :: OSI Approved :: MIT License',
10
-            'Programming Language :: Python :: 3'
11
-            'Programming Language :: Python :: 3 :: Only',
12
-        ],
13
-
14
-        url='https://git.maartenberg.nl/maarten/piket',
15
-        author='Maarten van den Berg',
16
-        author_email='maartenberg1+pypi@gmail.com',
17
-
18
-        license='MIT',
19
-        packages=['piket_client', 'piket_server'],
20
-
21
-        scripts=[
22
-            'bin/piket-server',
23
-            'bin/piket-server-dev',
24
-        ],
25
-
26
-        entry_points={
27
-            'console_scripts': [
28
-                'piket-client=piket_client.gui:main',
29
-                'piket-seed=piket_server.seed:main',
30
-            ],
31
-        },
32
-
33
-        install_requires=[
34
-        ],
35
-
36
-        extras_require={
37
-            'dev': [
38
-                'black',
39
-                'pylint',
40
-            ],
41
-            'server': [
42
-                'Flask',
43
-                'SQLAlchemy',
44
-                'Flask-SQLAlchemy',
45
-                'alembic',
46
-                'uwsgi',
47
-            ],
48
-            'client': [
49
-                'PySide2',
50
-                'qdarkstyle>=2.6.0',
51
-                'requests',
52
-                'simpleaudio',
53
-            ],
54
-            'osk': [
55
-                'dbus-python',
56
-            ],
57
-            'sentry': [
58
-                'raven',
59
-            ],
60
-        },
61
-
62
-        include_package_data=True,
63
-        zip_safe=False
4
+    name="piket",
5
+    version="0.0.2",
6
+    classifiers=[
7
+        "Development Status :: 2 - Pre-Alpha",
8
+        "License :: OSI Approved :: MIT License",
9
+        "Programming Language :: Python :: 3"
10
+        "Programming Language :: Python :: 3 :: Only",
11
+    ],
12
+    url="https://git.maartenberg.nl/maarten/piket",
13
+    author="Maarten van den Berg",
14
+    author_email="maartenberg1+pypi@gmail.com",
15
+    license="MIT",
16
+    packages=["piket_client", "piket_server"],
17
+    scripts=["bin/piket-server", "bin/piket-server-dev"],
18
+    entry_points={
19
+        "console_scripts": [
20
+            "piket-client=piket_client.gui:main",
21
+            "piket-seed=piket_server.seed:main",
22
+        ]
23
+    },
24
+    install_requires=[],
25
+    extras_require={
26
+        "dev": ["black", "pylint"],
27
+        "server": ["Flask", "SQLAlchemy", "Flask-SQLAlchemy", "alembic", "uwsgi"],
28
+        "client": ["PySide2", "qdarkstyle>=2.6.0", "requests", "simpleaudio"],
29
+        "osk": ["dbus-python"],
30
+        "sentry": ["raven"],
31
+    },
32
+    include_package_data=True,
33
+    zip_safe=False,
64 34
 )