summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Gayot <olivier.gayot@sigexec.com>2021-12-26 13:53:33 +0100
committerOlivier Gayot <olivier.gayot@sigexec.com>2021-12-26 16:45:35 +0100
commit794292740c30bfea48dc23eb62fb6aa531bfdca7 (patch)
treeaa75c807c4eb9a0dc7a25149359307f5bdc775aa
parent69072a2abac7d2486e542b9b6ecedcc37016ea27 (diff)
Use more modern packaging system
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
-rw-r--r--debian/control1
-rw-r--r--pyproject.toml6
-rw-r--r--setup.cfg39
-rw-r--r--setup.py35
4 files changed, 51 insertions, 30 deletions
diff --git a/debian/control b/debian/control
index 60a8631..33b1e60 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Maintainer: Olivier Gayot <olivier.gayot@sigexec.com>
Section: python
Priority: optional
Build-Depends: python3-setuptools,
+ python3-build,
dh-python,
dh-sysuser,
debhelper-compat (= 13),
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..374b58c
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+ "setuptools>=42",
+ "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..6712f5d
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,39 @@
+[metadata]
+name = swiftstory
+version = 0.1
+author = Olivier Gayot
+author_email = olivier.gayot@sigexec.com
+
+description = SwiftStory game: We're not out of the woords yet
+url = https://git.sigexec.com/cgit.cgi/swiftstory.git
+classifiers =
+ Programming Language :: Python :: 3
+ License :: BSD-3
+ Operating System :: OS Independent
+
+[options]
+packages = find:
+python_requires = >=3.7
+
+[options.data_files]
+share/swiftstory/www/ =
+ usr/share/swiftstory/www/index.html
+ usr/share/swiftstory/www/swiftstory-config.js
+ usr/share/swiftstory/www/swiftstory-common.css
+ usr/share/swiftstory/www/swiftstory-common.js
+ usr/share/swiftstory/www/swiftstory-mobile.css
+ usr/share/swiftstory/www/swiftstory-mobile.html
+ usr/share/swiftstory/www/swiftstory-mobile.js
+# TODO install jQuery using libjs-jquery
+ usr/share/swiftstory/www/jquery.js
+# TODO install cards as package data instead
+share/swiftstory/lang/en/cards =
+ usr/share/swiftstory/lang/en/cards/black.json
+ usr/share/swiftstory/lang/en/cards/white.json
+share/swiftstory/lang/fr/cards =
+ usr/share/swiftstory/lang/fr/cards/black.json
+ usr/share/swiftstory/lang/fr/cards/white.json
+
+[options.entry_points]
+console_scripts =
+ swiftstoryd = swiftstory.__main__:main
diff --git a/setup.py b/setup.py
index a18c8d0..7c4c40c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,9 @@
-import os
+""" Dummy setup.py to help pybuild figure out what to do until a Build-Depend
+on dh-python-pep517 can be added. """
-from setuptools import setup, find_packages
+from setuptools import setup
-prefix = '/'
-share_dir = 'usr/share/swiftstory/'
-data_files = list()
-
-for n in os.walk('usr'):
- if len(n[2]) == 0:
- continue
-
- files = list()
- for f in n[2]:
- files.append(n[0] + '/' + f)
-
- data_files.append((prefix + n[0] + '/', files))
-
-setup(
- name = 'swiftstory',
- description = "SwiftStory game: We're not out of the woods yet.",
- version = '0.1',
- author = 'Olivier Gayot',
- author_email = 'olivier.gayot@sigexec.com',
- packages = find_packages(),
- data_files = data_files,
- entry_points = {
- 'console_scripts': [
- 'swiftstoryd = swiftstory.__main__:main',
- ],
- }
-)
+if __name__ == "__main__":
+ setup()