From 48b3c65bc30fe29a9091cdf3d1084f00da9cf163 Mon Sep 17 00:00:00 2001 From: Mathieu Leplatre Date: Tue, 4 Feb 2025 17:20:54 +0100 Subject: [PATCH] Rewrite kinto-remote-settings to use pyproject --- kinto-remote-settings/pyproject.toml | 30 ++++++++++++++++--- kinto-remote-settings/setup.cfg | 8 ----- kinto-remote-settings/setup.py | 23 -------------- .../src/kinto_remote_settings/__init__.py | 10 +++++-- 4 files changed, 34 insertions(+), 37 deletions(-) delete mode 100644 kinto-remote-settings/setup.cfg delete mode 100644 kinto-remote-settings/setup.py diff --git a/kinto-remote-settings/pyproject.toml b/kinto-remote-settings/pyproject.toml index 374b58cbf..c5d91418a 100644 --- a/kinto-remote-settings/pyproject.toml +++ b/kinto-remote-settings/pyproject.toml @@ -1,6 +1,28 @@ [build-system] -requires = [ - "setuptools>=42", - "wheel" -] +requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" + +[project] +name = "kinto_remote_settings" + +# Load version dynamically from version.json +dynamic = ["version"] + +dependencies = [ + "kinto", + "canonicaljson-rs", + "ecdsa", + "requests_hawk", +] + +[tool.setuptools] +packages = { find = { where = ["src"] } } + +[tool.setuptools.dynamic] +version = { attr = "kinto_remote_settings.__version__" } + +[tool.setuptools.package-data] +kinto_remote_settings = ["*.json"] + +[tool.pytest.ini_options] +pythonpath = "src" diff --git a/kinto-remote-settings/setup.cfg b/kinto-remote-settings/setup.cfg deleted file mode 100644 index 0759470c3..000000000 --- a/kinto-remote-settings/setup.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[zest.releaser] -create-wheel = yes - -[wheel] -universal = 1 - -[bdist_wheel] -universal=1 diff --git a/kinto-remote-settings/setup.py b/kinto-remote-settings/setup.py deleted file mode 100644 index 3d94ecf1f..000000000 --- a/kinto-remote-settings/setup.py +++ /dev/null @@ -1,23 +0,0 @@ -import json -from pathlib import Path - -import setuptools - - -path = Path(__file__).parent.parent / "version.json" -version = json.load(open(path))["version"].replace("v", "").split("-")[0] - -INSTALL_REQUIRES = [ - "kinto", - "canonicaljson-rs", - "ecdsa", - "requests_hawk", -] - -setuptools.setup( - name="kinto_remote_settings", - version=version, - package_dir={"": "src"}, - packages=setuptools.find_packages(where="src"), - install_requires=INSTALL_REQUIRES, -) diff --git a/kinto-remote-settings/src/kinto_remote_settings/__init__.py b/kinto-remote-settings/src/kinto_remote_settings/__init__.py index 8c1dda1d6..a082ecd5d 100644 --- a/kinto-remote-settings/src/kinto_remote_settings/__init__.py +++ b/kinto-remote-settings/src/kinto_remote_settings/__init__.py @@ -1,7 +1,13 @@ -import pkg_resources +import json +from pathlib import Path -__version__ = pkg_resources.get_distribution("kinto_remote_settings").version +def get_version(): + path = Path(__file__).parent.parent.parent.parent / "version.json" + return json.load(open(path))["version"].replace("v", "").split("-")[0] + + +__version__ = get_version() def includeme(config):