From 7f8092f271dc9fd272f159e71df7e43f47c7af42 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 29 Nov 2023 19:33:34 -0900 Subject: [PATCH 1/3] move packaging and installation requirements to tests/requirements.txt --- requirements.txt | 6 ------ tests/requirements.txt | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6cc9738..d973898 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,3 @@ # for running numpy scipy -# for packaging and installation -#fortran-compiler # Fortran compiler across platforms through conda-forge channel -pip -setuptools -setuptools_scm -wheel diff --git a/tests/requirements.txt b/tests/requirements.txt index 6f43c87..3bc459e 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,2 +1,8 @@ +# for packaging and installation +#fortran-compiler # Fortran compiler across platforms through conda-forge channel +pip +setuptools +setuptools_scm +wheel # extra dependency required for testing matplotlib From 0bf54aac09660a9c6ccafde22d90575755355818 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Thu, 30 Nov 2023 17:36:59 +0800 Subject: [PATCH 2/3] `tests/requirements.txt`: rm `setuptools` and wheel --- tests/requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3bc459e..1a51812 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,8 +1,6 @@ # for packaging and installation #fortran-compiler # Fortran compiler across platforms through conda-forge channel pip -setuptools setuptools_scm -wheel -# extra dependency required for testing +# for testing matplotlib From f49af0e4c45a75072d4fe68a0f4ff5ed6bce1d87 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Thu, 30 Nov 2023 17:39:40 +0800 Subject: [PATCH 3/3] setuptools_scm: use the same version constraint as pyproject.toml file --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 1a51812..9277b34 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,6 +1,6 @@ # for packaging and installation #fortran-compiler # Fortran compiler across platforms through conda-forge channel pip -setuptools_scm +setuptools_scm>=6.2 # for testing matplotlib