From 30ae7b84e647d1ef7765aab68371c2dfb255ac00 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Tue, 15 Apr 2025 14:25:52 +0200 Subject: [PATCH] Standardize on pyproject.toml This way all installations are PEP517 compatible. The setuptools scripts is deprecated, but for now it's the best way of migrating forward. Taking the chance to do this to fix this issue: ``` ERROR: setuptools==53.0.0 is used in combination with setuptools-scm>=8.x Your build configuration is incomplete and previously worked by accident! setuptools-scm requires setuptools>=61 Suggested workaround if applicable: - migrating from the deprecated setup_requires mechanism to pep517/518 and using a pyproject.toml to declare build dependencies which are reliably pre-installed before running the build tools ``` --- pyproject.toml | 29 +++++++++++++---------------- requirements.txt | 6 ------ 2 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 requirements.txt diff --git a/pyproject.toml b/pyproject.toml index d2e5c506..89dd75df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,29 +3,23 @@ requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" [project] +requires-python = ">= 3.6" name = 'bits' dynamic = ['readme', 'version'] description = 'Build Tool' -keywords = ['HEP', 'CERN'] -license = {text = 'GPL'} +keywords = ['HEP', 'ALICE'] +license = { file = 'LICENSE' } authors = [ {name = 'Giulio Eulisse', email = 'giulio.eulisse@cern.ch'}, {name = 'Timo Wilken', email = 'timo.wilken@cern.ch'}, {name = 'Predrag Buncic', email = 'predrag.buncic@cern.ch'}, + {name = 'Sergio Garcia', email = 'sergio.garcia@cern.ch'}, ] classifiers = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'Topic :: Software Development :: Build Tools', - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Programming Language :: Python :: 3.6', # slc7, slc8, cs8 - 'Programming Language :: Python :: 3.8', # ubuntu2004 - 'Programming Language :: Python :: 3.9', # slc9 - 'Programming Language :: Python :: 3.10', # ubuntu2204 - 'Programming Language :: Python :: 3.11', # MacOS - 'Programming Language :: Python :: 3.12', # MacOS - 'Programming Language :: Python :: 3.13', # MacOS ] dependencies = [ @@ -39,15 +33,18 @@ dependencies = [ [project.urls] homepage = 'https://github.com/bitsorg/bits' -[scripts] -alienv = {path = "bits"} -bitsBuild = {path = "bitsBuild"} -bitsDoctor = {path = "bitsDoctor"} -bitsDeps = {path = "bitsDeps"} -pb = {path = "pb"} +[tool.setuptools] +script-files = ["bits", "bitsBuild", "bitsDoctor", "bitsDeps", "pb"] [tool.setuptools_scm] write_to = "bits_helpers/_version.py" [tool.setuptools.package-data] bits_helpers = ['build_template.sh'] + +[tool.setuptools.packages.find] +where = ["."] +exclude = ["yaml"] + +[tool.setuptools.dynamic] +readme = {file = ["README.rst"]} diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 12a7d59a..00000000 --- a/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -requests -pyyaml -distro -jinja2 -# https://github.com/boto/boto3/issues/4398 -boto3<1.36.0