diff --git a/README.md b/README.md index 9131f8a..781e827 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,8 @@ To make a new release, do this: [comment]: <> (✂✂✂ auto generated history start ✂✂✂) -* [**dev**](https://github.com/jedie/PyInventory/compare/v0.21.0...main) +* [v0.21.1rc1](https://github.com/jedie/PyInventory/compare/v0.21.0...v0.21.1rc1) + * 2025-05-01 - Replace setuptools with hatchling * 2025-04-30 - Update requirements and some small code parts * [v0.21.0](https://github.com/jedie/PyInventory/compare/v0.20.1...v0.21.0) * 2025-03-23 - Bugfix publish: setuptools missing diff --git a/inventory/__init__.py b/inventory/__init__.py index 05f3187..1d1d599 100644 --- a/inventory/__init__.py +++ b/inventory/__init__.py @@ -8,5 +8,5 @@ """ # See https://packaging.python.org/en/latest/specifications/version-specifiers/ -__version__ = '0.21.0' +__version__ = '0.21.1rc1' __author__ = 'Jens Diemer ' diff --git a/pyproject.toml b/pyproject.toml index 70ca7be..fa162d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,7 @@ dev = [ 'lxml', # https://github.com/lxml/lxml "uv", # https://github.com/astral-sh/uv + "hatchling", # https://github.com/pypa/hatch/tree/master/backend "playwright", # https://github.com/microsoft/playwright-python "tblib", # https://github.com/ionelmc/python-tblib "coverage", # https://github.com/nedbat/coveragepy @@ -60,9 +61,6 @@ dev = [ "pre-commit", # https://github.com/pre-commit/pre-commit "typeguard", # https://github.com/agronholm/typeguard/ - # setuptools use by "publish" command: - "setuptools", # https://github.com/pypa/setuptools - # https://github.com/akaihola/darker # https://github.com/ikamensh/flynt # https://github.com/pycqa/isort @@ -93,8 +91,19 @@ local_settings='inventory_project.settings.local' test_settings='inventory_project.settings.tests' +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["inventory", "inventory_project"] + +[tool.hatch.version] +path = "inventory/__init__.py" + + [tool.cli_base] -version_module_name = "inventory" # Used by update_readme_history() +version_module_name = "inventory" # Used by "update-readme-history" pre-commit hook [tool.cli_base.pip_audit] @@ -107,16 +116,6 @@ ignore-vuln=[ -[build-system] -requires = ["setuptools>=61.0", "setuptools_scm>=7.1"] -build-backend = "setuptools.build_meta" - -[tool.setuptools.packages.find] -where = ["."] -include = ["inventory*", "inventory_project*"] - -[tool.setuptools.dynamic] -version = {attr = "inventory.__version__"} [tool.darker] @@ -181,6 +180,7 @@ cookiecutter_directory = "managed-django-project" applied_migrations = [ "141b3e4", # 2024-09-05T17:53:31+02:00 "a36dd75", # 2025-03-23T11:39:23+01:00 + "b3e0624", # 2025-05-01T00:07:45+02:00 ] [manageprojects.cookiecutter_context.cookiecutter] diff --git a/uv.lock b/uv.lock index 04495e5..f830dbb 100644 --- a/uv.lock +++ b/uv.lock @@ -894,6 +894,21 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/cb/7d/6dac2a6e1eba33ee43f318edbed4ff29151a49b5d37f080aad1e6469bca4/gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d", size = 85029, upload-time = "2024-08-10T20:25:24.996Z" }, ] +[[package]] +name = "hatchling" +version = "1.27.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, + { name = "pathspec" }, + { name = "pluggy" }, + { name = "trove-classifiers" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8f/8a/cc1debe3514da292094f1c3a700e4ca25442489731ef7c0814358816bb03/hatchling-1.27.0.tar.gz", hash = "sha256:971c296d9819abb3811112fc52c7a9751c8d381898f36533bb16f9791e941fd6", size = 54983, upload-time = "2024-12-15T17:08:11.894Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/e7/ae38d7a6dfba0533684e0b2136817d667588ae3ec984c1a4e5df5eb88482/hatchling-1.27.0-py3-none-any.whl", hash = "sha256:d3a2f3567c4f926ea39849cdf924c7e99e6686c9c8e288ae1037c8fa2a5d937b", size = 75794, upload-time = "2024-12-15T17:08:10.364Z" }, +] + [[package]] name = "icdiff" version = "2.0.7" @@ -1102,7 +1117,7 @@ wheels = [ [[package]] name = "manage-django-project" -version = "0.9.0" +version = "0.9.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "bx-py-utils" }, @@ -1113,9 +1128,9 @@ dependencies = [ { name = "django-tools" }, { name = "manageprojects" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/9d/6b/6592ca68e94b110cecd9352b4ee386dc1b46e7b9980eeef03cdf5004c807/manage_django_project-0.9.0.tar.gz", hash = "sha256:6067ca983d6c78f1eaa5f9e5f0c21f3dc39dfd6fcb1bb46c8f4d2bc95cc83918", size = 106560, upload-time = "2025-02-12T09:45:09.666Z" } +sdist = { url = "https://files.pythonhosted.org/packages/71/18/71f064669d777c4c1e04154f12dc8477a58a4af842b20b162dbee45c9ff4/manage_django_project-0.9.1.tar.gz", hash = "sha256:846ee16fc599e319ff3819821c260f1edb1d96d8d30daf4d3acb724399fb187d", size = 106216, upload-time = "2025-04-30T21:59:17.725Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d8/50/2bf5493d6e4ac74a9e56b75f38525467811670ca48019f1bf44efa115c0a/manage_django_project-0.9.0-py3-none-any.whl", hash = "sha256:75ac665ebe9a2816f3a63863379a6dea649b64210c637104a39ee05bdfd60e51", size = 55369, upload-time = "2025-02-12T09:45:08.186Z" }, + { url = "https://files.pythonhosted.org/packages/c0/ad/497c8bf3c29cb428ed0f91ee5c36462816f8cf2f907a933d1863384442b8/manage_django_project-0.9.1-py3-none-any.whl", hash = "sha256:b53c742d3113d62d42897ca389fbfc6ed080267bbbb1cfb3fa214e2a2dec383e", size = 55889, upload-time = "2025-04-30T21:59:15.123Z" }, ] [[package]] @@ -1534,6 +1549,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/b5/4f/71a8a873e8c3c3e2d3ec03a578e546f6875be8a76214d90219f752f827cd/playwright-1.52.0-py3-none-win_arm64.whl", hash = "sha256:9d0085b8de513de5fb50669f8e6677f0252ef95a9a1d2d23ccee9638e71e65cb", size = 30688972, upload-time = "2025-04-30T09:28:59.47Z" }, ] +[[package]] +name = "pluggy" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", size = 67955, upload-time = "2024-04-20T21:34:42.531Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669", size = 20556, upload-time = "2024-04-20T21:34:40.434Z" }, +] + [[package]] name = "pprintpp" version = "0.4.0" @@ -1654,6 +1678,7 @@ dev = [ { name = "editorconfig" }, { name = "flake8" }, { name = "flake8-bugbear" }, + { name = "hatchling" }, { name = "lxml" }, { name = "manage-django-project" }, { name = "model-bakery" }, @@ -1664,7 +1689,6 @@ dev = [ { name = "pyflakes" }, { name = "pyupgrade" }, { name = "requests-mock" }, - { name = "setuptools" }, { name = "tblib" }, { name = "twine" }, { name = "typeguard" }, @@ -1704,6 +1728,7 @@ dev = [ { name = "editorconfig" }, { name = "flake8" }, { name = "flake8-bugbear" }, + { name = "hatchling" }, { name = "lxml" }, { name = "manage-django-project" }, { name = "model-bakery" }, @@ -1714,7 +1739,6 @@ dev = [ { name = "pyflakes" }, { name = "pyupgrade" }, { name = "requests-mock" }, - { name = "setuptools" }, { name = "tblib" }, { name = "twine" }, { name = "typeguard" }, @@ -1957,15 +1981,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/54/24/b4293291fa1dd830f353d2cb163295742fa87f179fcc8a20a306a81978b7/SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99", size = 15221, upload-time = "2022-08-13T16:22:44.457Z" }, ] -[[package]] -name = "setuptools" -version = "80.1.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/aa/b2/bd26ed086b842b68c8fe9aac380ad7e5118cf84fa7abd45bb059a88368a8/setuptools-80.1.0.tar.gz", hash = "sha256:2e308396e1d83de287ada2c2fd6e64286008fe6aca5008e0b6a8cb0e2c86eedd", size = 1354038, upload-time = "2025-04-30T17:41:06.171Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/8b/f6/126c9309c8fe93e5d6bb850593cd58d591daf2da45cc78b61e48d8d95879/setuptools-80.1.0-py3-none-any.whl", hash = "sha256:ea0e7655c05b74819f82e76e11a85b31779fee7c4969e82f72bab0664e8317e4", size = 1240689, upload-time = "2025-04-30T17:41:03.789Z" }, -] - [[package]] name = "shtab" version = "1.7.2" @@ -2065,6 +2080,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f9/b6/a447b5e4ec71e13871be01ba81f5dfc9d0af7e473da256ff46bc0e24026f/tomlkit-0.13.2-py3-none-any.whl", hash = "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde", size = 37955, upload-time = "2024-08-14T08:19:40.05Z" }, ] +[[package]] +name = "trove-classifiers" +version = "2025.4.28.22" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/f3/4d82f6d81391237842c4250766ae02c7a178a3a236e0fbd749ec154da17c/trove_classifiers-2025.4.28.22.tar.gz", hash = "sha256:42bef4957a74fe7724b8310dafd4b23e0a71406a4812cf4dfd65e2ee34f1943d", size = 16883, upload-time = "2025-04-28T22:49:32.609Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/d6/647f7aca9314bcc83d5608166f89121f55ccc05402b0cd1a1e72cffa3e62/trove_classifiers-2025.4.28.22-py3-none-any.whl", hash = "sha256:fdb453fefa3a0da9c18b8d390846e6df7e961e8924703559ea9be07ec99c0925", size = 14056, upload-time = "2025-04-28T22:49:30.687Z" }, +] + [[package]] name = "twine" version = "6.1.0"