Replace setup.py with pyproject.toml | #41346

Author: sdiemer

Makefile

@@ -48,13 +48,24 @@ shell:
 test:
 	${DOCKER_COMPOSE} run -e CI=1 -e DOCKER_TEST=1 -e "PYTEST_ARGS=${PYTEST_ARGS}" --rm --name ${TMP_DOCKER_CT} ${DOCKER_IMG} make test_local
 
-test_local:PYTEST_ARGS := $(or ${PYTEST_ARGS},--cov=django_web_utils --cov-report html --cov-report term tests/testapp/tests)
+test_local:PYTEST_ARGS := $(or ${PYTEST_ARGS},--cov --cov-report html --cov-report term tests/testapp/tests)
 test_local:
 	pytest --reuse-db ${PYTEST_ARGS}
 
+test_install:
+	docker run --rm -it --name ${TMP_DOCKER_CT} --user root --entrypoint /usr/bin/make -v ${CURDIR}:/opt/src ${DOCKER_IMG} test_install_local
+
+test_install_local:
+	# List files that will be installed
+	sudo make clean
+	sudo rm /opt/venv/lib/python3.11/site-packages/django_web_utils
+	sudo cp -a /opt/src /tmp/src
+	cd /tmp/src && sudo /opt/venv/bin/pip install .
+	cd /tmp/src && sudo /opt/venv/bin/pip show -f django-web-utils
+
 generate_po:
 	# Generate po files from source
-	docker run --rm -it -e DOCKER_TEST=1 -v ${CURDIR}:/opt/src ${DOCKER_IMG} make generate_po_local
+	docker run --rm -it -e DOCKER_TEST=1 --name ${TMP_DOCKER_CT} -v ${CURDIR}:/opt/src ${DOCKER_IMG} make generate_po_local
 
 generate_po_local:
 	cd django_web_utils \
@@ -68,7 +79,7 @@ generate_po_local:
 
 generate_mo:
 	# Generate mo files from po files
-	docker run --rm -it -e DOCKER_TEST=1 -v ${CURDIR}:/opt/src ${DOCKER_IMG} make generate_mo_local
+	docker run --rm -it -e DOCKER_TEST=1 --name ${TMP_DOCKER_CT} -v ${CURDIR}:/opt/src ${DOCKER_IMG} make generate_mo_local
 
 generate_mo_local:
 	cd django_web_utils \
@@ -97,5 +108,6 @@ translate:
 
 clean:
 	# Remove compiled Python files
+	rm -rf build django_web_utils.egg-info
 	find . -name '*.pyc' -delete
 	find . -name __pycache__ -type d -delete

django_web_utils/__init__.py

@@ -1 +1 @@
-__version__ = '21.1'
+__version__ = '22.0'

docker/Dockerfile

@@ -19,10 +19,12 @@ RUN apt-get -q update && apt-get -qy install --no-install-recommends \
 # Python venv
 RUN python3 -m venv /opt/venv --system-site-packages
 ENV PATH="/opt/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-RUN pip install --upgrade pip setuptools wheel packaging
-COPY setup.py setup.py
-RUN pip install --no-cache-dir -e '.[dev]'
-RUN rm setup.py
+RUN pip install --upgrade pip setuptools wheel packaging uv
+# Install dependencies from pyproject.toml file using uv
+# (see issue https://github.com/pypa/pip/issues/11440)
+COPY pyproject.toml pyproject.toml
+RUN uv pip install -r pyproject.toml --extra dev
+RUN rm pyproject.toml
 RUN ln -sf /opt/src/django_web_utils /opt/venv/lib/python3.11/site-packages/django_web_utils
 
 RUN mkdir -p /opt/src

pyproject.toml

@@ -0,0 +1,66 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools>=77.0"]
+
+[project]
+name = "django-web-utils"
+description = "A collection of utilities for web projects based on Django."
+authors = [{name = "UbiCastTeam"}]
+dynamic = ["version"]
+license = "LGPL-3.0"
+license-files = ["LICENSE"]
+readme = "README.md"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Web Environment",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3 :: Only",
+  "Topic :: Internet :: WWW/HTTP",
+]
+requires-python = ">=3.11"
+dependencies = [
+  "bleach[css] >= 6.0, < 7.0",
+  "pillow >= 11",
+]
+
+[project.optional-dependencies]
+dev = [
+  "django >= 4.2",
+  "flake8",
+  "psycopg[binary] >= 3.2",
+  "pytest",
+  "pytest-cov",
+  "pytest-django",
+  "vulture",
+]
+
+[project.urls]
+Repository = "https://github.com/UbiCastTeam/django-web-utils"
+
+[tool.setuptools]
+
+[tool.setuptools.dynamic]
+version = {attr = "django_web_utils.__version__"}
+
+[tool.setuptools.packages.find]
+include = ["django_web_utils*"]
+
+[tool.setuptools.package-data]
+"*" = ["**/*"]
+
+[tool.setuptools.exclude-package-data]
+"*" = ["*.pyc", "*.po"]
+
+[tool.pytest.ini_options]
+addopts = "--verbose --tb=native --color=yes --durations=10"
+django_find_project = "false"
+log_date_format = "%H:%M:%S"
+log_format = "%(asctime)s.%(msecs)03d %(name)s %(levelname)s %(message)s"
+log_level = "DEBUG"
+norecursedirs = ".git submodules"
+testpaths = ["tests/"]
+
+[tool.coverage.run]
+source_dirs = ["django_web_utils"]