package with pyproject.toml

Author: Mic92

MANIFEST.in

@@ -1,4 +1,3 @@
-exclude setup.cfg
 include *.txt
 include *.rst
 recursive-include doc *.rst

Makefile

@@ -1,4 +1,4 @@
-PYTHON ?= python3.11
+PYTHON ?= python3.13
 REMOTE = git@github.com:Mic92/python-mpd2
 VERSION = $(shell $(PYTHON) -c "import mpd; print('.'.join(map(str,mpd.VERSION)))")
 
@@ -7,12 +7,25 @@ test:
 release: test
 	test "$(shell git symbolic-ref --short HEAD)" = "master" || (echo "not on master branch"; exit 1)
 	git pull --rebase origin master
-	$(PYTHON) setup.py sdist bdist_wheel
-	$(PYTHON) -m twine check dist/python-mpd2-$(VERSION).tar.gz dist/python_mpd2-$(VERSION)-py2.py3-none-any.whl
+	$(PYTHON) -m build
+	$(PYTHON) -m twine check dist/python-mpd2-$(VERSION).tar.gz dist/python_mpd2-$(VERSION)-py3-none-any.whl
 	git tag "v$(VERSION)"
 	git push --tags git@github.com:Mic92/python-mpd2 "v$(VERSION)"
-	$(PYTHON) -m twine upload --repository python-mpd2 dist/python-mpd2-$(VERSION).tar.gz dist/python_mpd2-$(VERSION)-py2.py3-none-any.whl
+	$(PYTHON) -m twine upload --repository python-mpd2 dist/python-mpd2-$(VERSION).tar.gz dist/python_mpd2-$(VERSION)-py3-none-any.whl
 clean:
-	$(PYTHON) setup.py clean
+	rm -rf dist build *.egg-info
 
-.PHONY: test release clean
+bump-version:
+	@if [ -z "$(NEW_VERSION)" ]; then \
+		echo "Usage: make bump-version NEW_VERSION=x.y.z"; \
+		exit 1; \
+	fi
+	@echo "Bumping version to $(NEW_VERSION)..."
+	@# Convert x.y.z to (x, y, z) for mpd/base.py
+	@VERSION_TUPLE=$$(echo "$(NEW_VERSION)" | sed 's/\./,\ /g'); \
+	sed -i.bak "s/^VERSION = (.*/VERSION = ($$VERSION_TUPLE)/" mpd/base.py && rm mpd/base.py.bak
+	@# Update version in pyproject.toml
+	@sed -i.bak 's/^version = .*/version = "$(NEW_VERSION)"/' pyproject.toml && rm pyproject.toml.bak
+	@echo "Version bumped to $(NEW_VERSION)"
+
+.PHONY: test release clean bump-version

bors.toml

@@ -14,19 +14,15 @@
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             bashInteractive
-            python39
             python310
             python311
-            (python312.withPackages(ps: [ps.setuptools ps.tox ps.wheel]))
-            python313
+            python312
+            (python313.withPackages(ps: [ps.setuptools ps.tox ps.wheel ps.build]))
+            python314
             pypy3
             twine
             mypy
           ];
-          shellHook = ''
-            # breaks python36/python37
-            unset _PYTHON_SYSCONFIGDATA_NAME
-          '';
         };
       };
     });

flake.nix

@@ -1,5 +1,56 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-mpd2"
+version = "3.1.1"
+description = "A Python MPD client library"
+readme = "README.rst"
+authors = [
+    {name = "Joerg Thalheim", email = "joerg@thalheim.io"},
+]
+maintainers = [
+    {name = "Joerg Thalheim", email = "joerg@thalheim.io"},
+]
+license = {text = "GNU Lesser General Public License v3 (LGPLv3)"}
+keywords = ["mpd"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+requires-python = ">=3.10"
+dependencies = []
+
+[project.optional-dependencies]
+twisted = ["Twisted"]
+test = [
+    "tox",
+    "Twisted",
+]
+
+[project.urls]
+Homepage = "https://github.com/Mic92/python-mpd2"
+Repository = "https://github.com/Mic92/python-mpd2"
+Issues = "https://github.com/Mic92/python-mpd2/issues"
+
+[tool.setuptools]
+packages = ["mpd"]
+zip-safe = true
+
+
+[tool.setuptools.package-data]
+"*" = ["py.typed"]
+
+
 [tool.mypy]
-python_version = "3.11"
+python_version = "3.10"
 pretty = true
 warn_redundant_casts = true
 disallow_untyped_calls = true

pyproject.toml

@@ -1,5 +1,5 @@
 [tox]
-envlist = py39,py310,py311,py312,py313,pypy3
+envlist = py310,py311,py312,py313,py314,pypy3
 
 [testenv]
 deps = coverage