From 4bc241ff91ae2ddc543c799e764f7e857cc58a87 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 8 Oct 2024 22:08:06 +0200 Subject: [PATCH 1/7] Update dependencies * add back dependencies missing since 519e835c87d7e3493dda59048925d037731ed807 * remove unneeded dependencies --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9e27ef0..9e96010 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,10 +33,9 @@ requires-python = ">=3.9" dependencies = [ "numba", "numpy", + "matplotlib", "pint >= 0.24.1", "pyg4ometry", - "pylegendmeta>=v0.9.0a2", - "pyarrow", "scipy", ] dynamic = [ @@ -64,7 +63,6 @@ docs = [ ] test = [ "pre-commit", - "pylegendtestdata", "pytest>=6.0", "pytest-cov", ] From df925a98f6e970639cf59fcb741e39b70a84eed8 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 8 Oct 2024 22:09:33 +0200 Subject: [PATCH 2/7] importlib.resources should work since python 3.9 --- src/legendoptics/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/legendoptics/utils.py b/src/legendoptics/utils.py index c011aa7..e82514d 100644 --- a/src/legendoptics/utils.py +++ b/src/legendoptics/utils.py @@ -6,7 +6,7 @@ import numpy as np import pint import scipy.interpolate -from importlib_resources import files +from importlib.resources import files from pint import Quantity log = logging.getLogger(__name__) From 28ec7ef8967ccb2c958d06cc352d95a471224f3c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:09:50 +0000 Subject: [PATCH 3/7] style: pre-commit fixes --- src/legendoptics/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/legendoptics/utils.py b/src/legendoptics/utils.py index e82514d..add40ef 100644 --- a/src/legendoptics/utils.py +++ b/src/legendoptics/utils.py @@ -1,12 +1,12 @@ from __future__ import annotations import logging +from importlib.resources import files from pathlib import Path import numpy as np import pint import scipy.interpolate -from importlib.resources import files from pint import Quantity log = logging.getLogger(__name__) From 9441afa2849ed17ee766adc33747514fc0c84e43 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 8 Oct 2024 22:13:42 +0200 Subject: [PATCH 4/7] Update utils.py --- src/legendoptics/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/legendoptics/utils.py b/src/legendoptics/utils.py index add40ef..e82514d 100644 --- a/src/legendoptics/utils.py +++ b/src/legendoptics/utils.py @@ -1,12 +1,12 @@ from __future__ import annotations import logging -from importlib.resources import files from pathlib import Path import numpy as np import pint import scipy.interpolate +from importlib.resources import files from pint import Quantity log = logging.getLogger(__name__) From bfbb128e126e52930ac6f5ee91ac6a626f71a541 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:14:37 +0000 Subject: [PATCH 5/7] style: pre-commit fixes --- src/legendoptics/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/legendoptics/utils.py b/src/legendoptics/utils.py index e82514d..add40ef 100644 --- a/src/legendoptics/utils.py +++ b/src/legendoptics/utils.py @@ -1,12 +1,12 @@ from __future__ import annotations import logging +from importlib.resources import files from pathlib import Path import numpy as np import pint import scipy.interpolate -from importlib.resources import files from pint import Quantity log = logging.getLogger(__name__) From d0e5a98140b9357625e16e11a57646ebe26a2d9d Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 8 Oct 2024 22:14:59 +0200 Subject: [PATCH 6/7] require importlib_resources --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 9e96010..34d7848 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ classifiers = [ ] requires-python = ">=3.9" dependencies = [ + "importlib_resources", "numba", "numpy", "matplotlib", From 02c814f4fd4fa46f83365e1add5e465b53c023f1 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Tue, 8 Oct 2024 22:15:49 +0200 Subject: [PATCH 7/7] Update utils.py --- src/legendoptics/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/legendoptics/utils.py b/src/legendoptics/utils.py index add40ef..c011aa7 100644 --- a/src/legendoptics/utils.py +++ b/src/legendoptics/utils.py @@ -1,12 +1,12 @@ from __future__ import annotations import logging -from importlib.resources import files from pathlib import Path import numpy as np import pint import scipy.interpolate +from importlib_resources import files from pint import Quantity log = logging.getLogger(__name__)