From caa2ebe4ca4ca5c642e5f5ace13baf9a27657fcd Mon Sep 17 00:00:00 2001 From: "T. E. Pickering" Date: Wed, 16 Jul 2025 16:56:44 -0800 Subject: [PATCH 1/3] add support for running and testing using pixi --- .gitattributes | 2 ++ .gitignore | 4 ++++ pyproject.toml | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..887a2c1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# SCM syntax highlighting & preventing 3-way merges +pixi.lock merge=binary linguist-language=YAML linguist-generated=true diff --git a/.gitignore b/.gitignore index 9012091..206ddde 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,7 @@ pip-wheel-metadata/ # Mac OSX .DS_Store coverage.xml +# pixi environments +.pixi +wfs.log +pixi.lock diff --git a/pyproject.toml b/pyproject.toml index 38fd7ae..f3aafc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,3 +109,21 @@ filterwarnings = [ # Don't complain about IPython completion helper "def _ipython_key_completions_", ] + +[tool.pixi.workspace] +channels = ["conda-forge"] +platforms = ["osx-arm64", "linux-64"] + +[tool.pixi.pypi-dependencies] +wfssrv = { path = ".", editable = true } + +[tool.pixi.environments] +default = { solve-group = "default" } +docs = { features = ["docs"], solve-group = "default" } +test = { features = ["test"], solve-group = "default" } + +[tool.pixi.tasks] +wfssrv = "wfssrv" + +[tool.pixi.feature.test.tasks] +test = "pytest" From 14caa3fc3f004064e523d8a25d90a72001f9649f Mon Sep 17 00:00:00 2001 From: "T. E. Pickering" Date: Sat, 2 Aug 2025 18:57:35 -0700 Subject: [PATCH 2/3] add mkl to pixi linux-64 dependencies --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f3aafc8..0401cab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ requires = [ build-backend = 'setuptools.build_meta' [tool.pytest.ini_options] -minversion = 7.0 +minversion = "7.0" testpaths = [ "wfssrv/tests", ] @@ -117,6 +117,9 @@ platforms = ["osx-arm64", "linux-64"] [tool.pixi.pypi-dependencies] wfssrv = { path = ".", editable = true } +[tool.pixi.target.linux-64.dependencies] +mkl = "*" + [tool.pixi.environments] default = { solve-group = "default" } docs = { features = ["docs"], solve-group = "default" } From 32269fac633db4ae6adb6a94434e32beeb0248ca Mon Sep 17 00:00:00 2001 From: "T. E. Pickering" Date: Sat, 2 Aug 2025 20:27:38 -0700 Subject: [PATCH 3/3] add mkl-service as a dep as well --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 0401cab..1f32c02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,6 +119,7 @@ wfssrv = { path = ".", editable = true } [tool.pixi.target.linux-64.dependencies] mkl = "*" +mkl-service = "*" [tool.pixi.environments] default = { solve-group = "default" } @@ -130,3 +131,6 @@ wfssrv = "wfssrv" [tool.pixi.feature.test.tasks] test = "pytest" + +[tool.pixi.dependencies] +matplotlib = "*"