From 8e9b6689e7c868ff63cd68ed3633b7732e06e3d2 Mon Sep 17 00:00:00 2001
From: Corentin Carton de Wiart <corentin.carton@ecmwf.int>
Date: Tue, 5 Mar 2024 10:16:36 +0000
Subject: [PATCH 1/2] update packaging

---
 pyproject.toml         | 48 +++++++++++++++++++++++++++++++++---------
 setup.cfg              | 30 --------------------------
 setup.py               |  3 ---
 tracksuite/__init__.py |  1 -
 tracksuite/version.py  |  1 -
 5 files changed, 38 insertions(+), 45 deletions(-)
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py
 delete mode 100644 tracksuite/version.py

diff --git a/pyproject.toml b/pyproject.toml
index 9afbe58..c17eba3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,41 @@
 [build-system]
-# NOTE: `pip install build` to build with `python -m build`
-requires = [
-  "setuptools >= 40.9.0",
-  "wheel"
-]
+requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.pytest.ini_options]
-addopts = ""
-doctest_optionflags = ""
-testpaths = "tests"
-markers = []
+[project]
+name = "tracksuite"
+version = "0.3.1"
+description = "ecflow suite tracking and deploying toolkit"
+authors = [
+  { name = "European Centre for Medium-Range Weather Forecasts (ECMWF)", email = "software.support@ecmwf.int" },
+  { name = "Corentin Carton de Wiart", email = "corentin.carton@ecmwf.int" },
+]
+license = { text = "Apache License Version 2.0" }
+requires-python = ">=3.8"
+readme = "README.md"
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: Unix",
+  "Programming Language :: Python :: 3",
+  "Topic :: Scientific/Engineering",
+]
+
+dependencies = [
+    "gitpython >= 3.1.25"
+]
+
+[project.optional-dependencies]
+tests = ["pytest", "mocker", "pytest-mock"]
+
+[project.urls]
+"Source code" = "https://github.com/ecmwf/tracksuite"
+
+[tool.setuptools.packages.find]
+where = ["."]
+exclude = ["tests"]
+
+[project.scripts]
+    tracksuite-init = "tracksuite.init:main"
+    tracksuite-deploy = "tracksuite.deploy:main"
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 34e7324..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-[metadata]
-name = tracksuite
-version = attr: tracksuite.version.__version__
-author = European Centre for Medium-Range Weather Forecasts (ECMWF)
-author_email = software.support@ecmwf.int
-license = Apache 2.0
-license_files = LICENSE
-description = Suite deployment tools
-long_description = file: README.md
-long_description_content_type=text/markdown
-
-[options]
-packages = find:
-include_package_data = True
-install_requires =
-    gitpython >= 3.1.25
-
-[options.extras_require]
-test =
-    pytest
-    mocker
-    pytest-mock
-
-[options.packages.find]
-include = tracksuite*
-
-[options.entry_points]
-console_scripts =
-    tracksuite-init = tracksuite.init:main
-    tracksuite-deploy = tracksuite.deploy:main
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 6068493..0000000
--- a/setup.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from setuptools import setup
-
-setup()
diff --git a/tracksuite/__init__.py b/tracksuite/__init__.py
index c0501c6..9f913c3 100644
--- a/tracksuite/__init__.py
+++ b/tracksuite/__init__.py
@@ -2,4 +2,3 @@
 
 from .deploy import GitDeployment
 from .init import setup_remote
-from .version import __version__
diff --git a/tracksuite/version.py b/tracksuite/version.py
deleted file mode 100644
index 260c070..0000000
--- a/tracksuite/version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.3.1"

From cfe8922003167c575369fbc6a5de110a79755e51 Mon Sep 17 00:00:00 2001
From: Corentin Carton de Wiart <corentin.carton@ecmwf.int>
Date: Tue, 5 Mar 2024 10:19:34 +0000
Subject: [PATCH 2/2] debug tests

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c17eba3..70963fa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-tests = ["pytest", "mocker", "pytest-mock"]
+test = ["pytest", "mocker", "pytest-mock"]
 
 [project.urls]
 "Source code" = "https://github.com/ecmwf/tracksuite"