From eff806bd737ad90e5a2373b72a859c186e813b91 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Fri, 31 Dec 2021 07:06:42 +0100
Subject: [PATCH] Potentially fixed pyproject-based build and upload

---
 .github/workflows/pypi.yml            | 5 ++---
 dev-scripts/{packge.py => package.py} | 0
 pyproject.toml                        | 6 ++++--
 setup.py                              | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename dev-scripts/{packge.py => package.py} (100%)

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 65a5fc3..67fd36a 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -19,11 +19,10 @@ jobs:
           python-version: '3.x'
 
       - name: Install dependencies
-        run: pip install build setuptools toml wheel
+        run: pip install build
 
       - name: Build package
-        #run: python -m build
-        run: python setup.py sdist bdist_wheel
+        run: python -m build
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/dev-scripts/packge.py b/dev-scripts/package.py
similarity index 100%
rename from dev-scripts/packge.py
rename to dev-scripts/package.py
diff --git a/pyproject.toml b/pyproject.toml
index dbcbb84..4abc0da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,5 @@
 [project]
-name = "maloja"
-pypi_name = "malojaserver"
+name = "malojaserver"
 version = "2.14.5"
 description = "Self-hosted music scrobble database"
 readme = "./README.md"
@@ -38,3 +37,6 @@ maloja = "maloja.proccontrol.control:main"
 [build-system]
 requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
+
+[tool.flit.module]
+name = "maloja"
diff --git a/setup.py b/setup.py
index ca3c2d8..a051494 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ with open(projectdata['readme'], "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(
-    name=projectdata.get('pypi_name') or projectdata['name'],
+    name=projectdata['name'],
     version=projectdata['version'],
     author=projectdata['authors'][0]['name'],
     author_email=projectdata['authors'][0]['email'],