From b707b01545f5d05980740b1bade0de0e0bc6f6b8 Mon Sep 17 00:00:00 2001 From: Andreas Pedersen Date: Wed, 3 Jan 2024 07:19:54 +0100 Subject: [PATCH 1/5] explicit packages different from project name --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 513d2b53..748b6641 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling<=1.18.0"] +requires = ["hatchling"] build-backend = "hatchling.build" [project] @@ -64,6 +64,9 @@ source = ['EasyReflectometry'] organization = 'easyScience' repo = 'EasyReflectometryLib' +[tool.hatch.build.targets.wheel] +packages = ["EasyReflectometry"] + [tool.tox] legacy_tox_ini = """ [tox] From d688f796b88c3edbe83d904e82b30b8b729f1d73 Mon Sep 17 00:00:00 2001 From: Andreas Pedersen Date: Wed, 3 Jan 2024 09:30:09 +0100 Subject: [PATCH 2/5] update scipp --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 748b6641..333cb561 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "easyScienceCore @ git+https://github.com/easyscience/easycore.git@failed_unit_check", "refnx>=0.1.15", "refl1d>=0.8.14", - "scipp==23.08.0", + "scipp>=23.12.0", "orsopy>=0.0.4" ] From fb3572b447c982b4a40848dce52465331667e4ff Mon Sep 17 00:00:00 2001 From: Andreas Pedersen Date: Wed, 3 Jan 2024 09:32:51 +0100 Subject: [PATCH 3/5] revert scipp version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 333cb561..961aad00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "easyScienceCore @ git+https://github.com/easyscience/easycore.git@failed_unit_check", "refnx>=0.1.15", "refl1d>=0.8.14", - "scipp>=23.12.0", + "scipp>=23.08.0", "orsopy>=0.0.4" ] From 149e82366df46f2b83f7783d74c13c5320bc8301 Mon Sep 17 00:00:00 2001 From: Andreas Pedersen Date: Wed, 3 Jan 2024 09:46:50 +0100 Subject: [PATCH 4/5] scipp==23.08.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 961aad00..748b6641 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "easyScienceCore @ git+https://github.com/easyscience/easycore.git@failed_unit_check", "refnx>=0.1.15", "refl1d>=0.8.14", - "scipp>=23.08.0", + "scipp==23.08.0", "orsopy>=0.0.4" ] From dd0013f587a01dcaf7c2023c4ec5c3bb94c858c9 Mon Sep 17 00:00:00 2001 From: Andreas Pedersen Date: Thu, 4 Jan 2024 06:58:30 +0100 Subject: [PATCH 5/5] set hatchling version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 748b6641..4bcc182b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling"] +requires = ["hatchling<=1.21.0"] build-backend = "hatchling.build" [project]