From 4c110e2c717b18586e467d4b5295f2b115a7ad6e Mon Sep 17 00:00:00 2001
From: Thomas Lindner <tom@dl6tom.de>
Date: Sat, 18 Mar 2023 14:06:48 +0100
Subject: [PATCH] [misc] Cleanup python packaging

---
 backend/README.md                        |  5 ++
 backend/pyproject.toml                   |  6 ++
 backend/setup.cfg                        | 70 ++++++++++++++++++++++++
 backend/setup.py                         | 34 ------------
 backend/tests/tests_core/__init__.py     |  0
 backend/tests/tests_email/__init__.py    |  0
 backend/tests/tests_telegram/__init__.py |  0
 backend/tests/tests_twitter/__init__.py  |  0
 backend/tox.ini                          | 25 ---------
 9 files changed, 81 insertions(+), 59 deletions(-)
 create mode 100644 backend/README.md
 create mode 100644 backend/pyproject.toml
 create mode 100644 backend/setup.cfg
 delete mode 100644 backend/setup.py
 create mode 100644 backend/tests/tests_core/__init__.py
 create mode 100644 backend/tests/tests_email/__init__.py
 create mode 100644 backend/tests/tests_telegram/__init__.py
 create mode 100644 backend/tests/tests_twitter/__init__.py
 delete mode 100644 backend/tox.ini

diff --git a/backend/README.md b/backend/README.md
new file mode 100644
index 0000000..2a2ee18
--- /dev/null
+++ b/backend/README.md
@@ -0,0 +1,5 @@
+# Kibicara backend
+
+Kibicara relays messages between different platforms (= social networks).
+This is just the backend. For info about the whole project see [our git
+repo](https://git.0x90.space/ticketfrei/ticketfrei3).
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
new file mode 100644
index 0000000..374b58c
--- /dev/null
+++ b/backend/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/backend/setup.cfg b/backend/setup.cfg
new file mode 100644
index 0000000..5029c6e
--- /dev/null
+++ b/backend/setup.cfg
@@ -0,0 +1,70 @@
+[metadata]
+name = kibicara
+version = 0.1.0
+author = 0x90.space
+author_email = people@schleuder.0x90.space
+description = distribute messages across different social media
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://git.0x90.space/ticketfrei/ticketfrei3
+project_urls =
+    Bug Tracker = https://git.0x90.space/ticketfrei/ticketfrei3/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: Public Domain
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.10
+install_requires =
+    aiofiles
+    aiogram
+    aiosqlite
+    argon2_cffi
+    fastapi
+    httpx
+    hypercorn
+    ormantic @ https://github.com/dl6tom/ormantic/tarball/master#egg=ormantic-0.0.32
+    passlib
+    peony-twitter[all]
+    pynacl
+    python-multipart
+    pytoml
+    requests
+    scrypt
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts =
+    kibicara = kibicara.kibicara:Main
+    kibicara_mda = kibicara.platforms.email.mda:Main
+
+[tox:tox]
+envlist = lint, py310
+isolated_build = True
+
+[testenv:lint]
+skip_install = True
+deps =
+    black
+    flake8
+    mypy
+commands =
+    black -S --check --diff src tests
+    flake8 src tests
+    # not yet
+    #mypy src tests
+
+[testenv]
+deps =
+    pytest
+    pytest-asyncio
+commands =
+    pytest tests
+
+[flake8]
+max_line_length = 88
diff --git a/backend/setup.py b/backend/setup.py
deleted file mode 100644
index ac155b3..0000000
--- a/backend/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from setuptools import find_packages, setup
-
-setup(
-    name='kibicara',
-    version='0.1.0',
-    description='distribute messages across different social media',
-    url='https://github.com/acipm/kibicara',
-    license='0BSD',
-    packages=find_packages(),
-    entry_points={
-        'console_scripts': [
-            'kibicara=kibicara.kibicara:Main',
-            'kibicara_mda=kibicara.platforms.email.mda:Main',
-        ]
-    },
-    python_requires='>=3.8',
-    install_requires=[
-        'aiofiles',
-        'aiogram',
-        'aiosqlite',
-        'argon2_cffi',
-        'fastapi',
-        'hypercorn',
-        'ormantic @ https://github.com/dl6tom/ormantic/tarball/master#egg=ormantic-0.0.32',
-        'passlib',
-        'peony-twitter[all]',
-        'pynacl',
-        'python-multipart',
-        'pytoml',
-        'requests',
-        'scrypt',
-        'httpx',
-    ],
-)
diff --git a/backend/tests/tests_core/__init__.py b/backend/tests/tests_core/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/tests/tests_email/__init__.py b/backend/tests/tests_email/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/tests/tests_telegram/__init__.py b/backend/tests/tests_telegram/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/tests/tests_twitter/__init__.py b/backend/tests/tests_twitter/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/tox.ini b/backend/tox.ini
deleted file mode 100644
index ed1c1c8..0000000
--- a/backend/tox.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[tox]
-envlist = py310, flake8, black, pytest
-
-[testenv]
-deps = .
-
-[testenv:flake8]
-deps = flake8
-commands =
-    flake8 kibicara tests
-
-[testenv:black]
-deps = black
-commands =
-    black -S --check --diff kibicara tests
-
-[testenv:pytest]
-deps =
-    pytest
-    pytest-asyncio
-commands =
-    pytest tests
-
-[flake8]
-max_line_length = 88