Switch to hatchling

diracx-api/pyproject.toml

@@ -24,16 +24,19 @@ testing = [
     "diracx-testing",
 ]
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

diracx-cli/pyproject.toml

@@ -45,16 +45,19 @@ internal = "diracx.cli.internal:app"
 
 
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

diracx-core/pyproject.toml

@@ -44,16 +44,19 @@ properties_module = "diracx.core.properties"
 config = "diracx.core.config.schema:Config"
 extension = "diracx"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

diracx-db/pyproject.toml

@@ -37,16 +37,18 @@ TaskQueueDB = "diracx.db.sql:TaskQueueDB"
 [project.entry-points."diracx.dbs.os"]
 JobParametersDB = "diracx.db.os:JobParametersDB"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

diracx-logic/pyproject.toml

@@ -27,16 +27,18 @@ types = [
     "types-cachetools",
 ]
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

diracx-routers/pyproject.toml

@@ -55,16 +55,19 @@ SandboxAccessPolicy = "diracx.routers.jobs.access_policies:SandboxAccessPolicy"
 [project.entry-points."diracx.min_client_version"]
 diracx = "diracx.routers:DIRACX_MIN_CLIENT_VERSION"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

diracx-testing/pyproject.toml

@@ -27,12 +27,15 @@ testing = [
     "diracx-testing",
 ]
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]

extensions/gubbins/README.md

@@ -0,0 +1,6 @@
+# Gubbins
+
+This is an example extension to DiracX that serves two purposes:
+
+- Document what can be exetended and how it can be extended.
+- Provide tests which are ran in the main DiracX repo to ensure extension functionality is working as expected.

extensions/gubbins/gubbins-cli/pyproject.toml

@@ -26,17 +26,19 @@ types = [
 lollygag = "gubbins.cli.lollygag:app"
 config = "gubbins.cli.config:app"
 
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
 
-[tool.setuptools_scm]
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.version.raw-options]
 root = "../../.."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

extensions/gubbins/gubbins-core/pyproject.toml

@@ -28,16 +28,19 @@ properties_module = "gubbins.core.properties"
 config = "gubbins.core.config.schema:Config"
 extension = "gubbins"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = "../../.."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

extensions/gubbins/gubbins-db/pyproject.toml

@@ -13,9 +13,7 @@ classifiers = [
     "Topic :: System :: Distributed Computing",
 ]
 dependencies = [
-    # This is obvious
     "diracx-db",
-    # We should add something else
 ]
 dynamic = ["version"]
 
@@ -26,19 +24,19 @@ testing = ["gubbins-testing", "diracx-testing"]
 LollygagDB = "gubbins.db.sql:LollygagDB"
 JobDB = "gubbins.db.sql:GubbinsJobDB"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-# This should not be in your extension !
-# It is just because we have this demo extension
-# in a subfolder of our git repo
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = "../../.."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

extensions/gubbins/gubbins-logic/pyproject.toml

@@ -30,16 +30,18 @@ types = [
     "types-python-dateutil",
     "types-PyYAML",
 ]
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
 
-[tool.setuptools_scm]
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.version.raw-options]
 root = "../../.."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

extensions/gubbins/gubbins-routers/pyproject.toml

@@ -39,17 +39,19 @@ lollygag = "gubbins.routers.lollygag:router"
 [project.entry-points."diracx.access_policies"]
 LollygagAccessPolicy = "gubbins.routers.lollygag.access_policy:LollygagAccessPolicy"
 
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
 
-[tool.setuptools_scm]
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.version.raw-options]
 root = "../../.."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

extensions/gubbins/gubbins-testing/pyproject.toml

@@ -17,13 +17,15 @@ dependencies = [
 ]
 dynamic = ["version"]
 
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
 
-[tool.setuptools_scm]
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.version.raw-options]
 root = "../../.."
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/gubbins"]

extensions/gubbins/pyproject.toml

@@ -23,16 +23,19 @@ dynamic = ["version"]
 [project.optional-dependencies]
 testing = ["gubbins-testing"]
 
-[tool.setuptools]
-packages = []
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = "../.."
 
+[tool.hatch.build.targets.wheel]
+bypass-selection = true
+
 [tool.ruff]
 line-length = 120
 src = ["gubbins-*/src", "gubbins-*/tests"]

pyproject.toml

@@ -23,14 +23,15 @@ dynamic = ["version"]
 [project.optional-dependencies]
 testing = ["diracx-testing"]
 
-[tool.setuptools]
-packages = []
-
 [build-system]
-requires = ["setuptools>=61", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.build.targets.wheel]
+bypass-selection = true
 
 [tool.ruff]
 line-length = 120