From 4c943c2a0651218e14c04643922063f1707a55e7 Mon Sep 17 00:00:00 2001
From: "kujiu (@rincevent)" <kujiu@kujiu.org>
Date: Fri, 19 Nov 2021 23:21:59 +0100
Subject: [PATCH] Simpler packaging

---
 Makefile       | 18 ++++++++++++++++++
 pyproject.toml | 24 +++++++++++-------------
 2 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ef6ec64
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+PYTHON = python3
+SRCDIR = .
+
+all: clean sdist wheel
+
+test:
+	py.test
+
+clean:
+	rm -rf *.egg-info dist build .eggs .pytest_cache
+
+sdist:
+	flit -f $(SRCDIR)/pyproject.toml build --no-setup-py --format=sdist
+
+wheel:
+	flit -f $(SRCDIR)/pyproject.toml build --no-setup-py --format=wheel
+
+.PHONY: clean test sdist wheel
diff --git a/pyproject.toml b/pyproject.toml
index 11612e6..37c78bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,10 +3,11 @@ requires = ["flit_core>=3.2"]
 build-backend = "flit_core.buildapi"
 
 [project]
-name = "nervtn-client-qt"
+name = "nervtn_qt"
 version = "0.0.1"
 requires-python = ">=3.8"
 dependencies = [
+    "nervtn-common==0.0.1"
 ]
 license = {text = "EUPL-1.2"}
 authors = [
@@ -124,11 +125,11 @@ classifiers = [
 
 [project.urls]
 homepage = "https://tn.nerv-project.eu"
-repository = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-client-qt"
+repository = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-qt"
 documentation = "https://tn.nerv-project.eu"
-issues = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-client-qt/issues"
+issues = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-qt/issues"
 editor = "https://www.nerv-project.eu"
-changelog = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-client-qt/raw/branch/main/CHANGES.rst"
+changelog = "https://procrastinator.nerv-project.eu/nerv-project/nervtn-qt/raw/branch/main/CHANGES.rst"
 
 [project.optional-dependencies]
 tests = [
@@ -165,9 +166,6 @@ doc = [
 
 [project.entry-points."nervtn.client.qt.apps"]
 
-[tool.flit.module]
-name = "nervtn.client.qt"
-
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "-ra -q"
@@ -177,20 +175,20 @@ testpaths = [
 
 [tool.babel.extract_messages]
 mapping_file = "babel.cfg"
-output_file = "locale/nervtn_client_qt.pot"
+output_file = "locale/nervtn.pot"
 keywords = ["_", "__", "l_", "lazy_gettext", "gettext", "ngettext"]
 add_comments = "Translators:"
 
 [tool.babel.init_catalog]
-domain = "nervtn_client_qt"
-input_file = "locale/nervtn_client_qt.pot"
+domain = "nervtn"
+input_file = "locale/nervtn.pot"
 output_dir = "locale/"
 
 [tool.babel.update_catalog]
-domain = "nervtn_client_qt"
-input_file = "locale/nervtn_client_qt.pot"
+domain = "nervtn"
+input_file = "locale/nervtn.pot"
 output_dir = "locale/"
 
 [tool.babel.compile_catalog]
-domain = "nervtn_client_qt"
+domain = "nervtn"
 directory = "locale/"