From 9fde94dc22d6b9599fd037b2b711b02b0cdfb403 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Sun, 16 Nov 2025 21:24:32 -0500 Subject: [PATCH 1/4] Fix: add gsl install to macos14 to pass CI. --- .../matrix-and-codecov-on-merge-to-main.yml | 1 + news/macos14-fix.rst | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 news/macos14-fix.rst diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index ca02afa..e69bd0f 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,5 +17,6 @@ jobs: project: diffpy.distanceprinter c_extension: false headless: false + extra_install_commands: conda install -y -c conda-forge gsl secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/news/macos14-fix.rst b/news/macos14-fix.rst new file mode 100644 index 0000000..d5f788f --- /dev/null +++ b/news/macos14-fix.rst @@ -0,0 +1,23 @@ +**Added:** + +* No News Added: add install gsl in workflow to pass CI + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* From bb7314059cd2922ce64f9fb0bcbe96e9fd6561a1 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Sun, 16 Nov 2025 21:55:53 -0500 Subject: [PATCH 2/4] Fix: add requirement to install gsl for macos14 --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 1 - requirements/conda.txt | 1 + requirements/tests.txt | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index e69bd0f..ca02afa 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,6 +17,5 @@ jobs: project: diffpy.distanceprinter c_extension: false headless: false - extra_install_commands: conda install -y -c conda-forge gsl secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/requirements/conda.txt b/requirements/conda.txt index 92111f9..f3657e3 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,3 +1,4 @@ numpy +gsl diffpy.pdffit2 diffpy.structure diff --git a/requirements/tests.txt b/requirements/tests.txt index a727786..1867f57 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,3 +4,4 @@ codecov coverage pytest-cov pytest-env +gsl From 2f363c665aed054d9def7a0b4353a30cde61faed Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Sun, 16 Nov 2025 22:45:58 -0500 Subject: [PATCH 3/4] chore: delete gsl for conda.txt --- requirements/conda.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/conda.txt b/requirements/conda.txt index f3657e3..92111f9 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,4 +1,3 @@ numpy -gsl diffpy.pdffit2 diffpy.structure From 6b56685f69540845b7fa8f668401cfb8ba07d8ad Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 17 Nov 2025 10:41:36 -0500 Subject: [PATCH 4/4] fix: add gsl to both pip.txt and conda.txt --- requirements/conda.txt | 1 + requirements/pip.txt | 1 + requirements/tests.txt | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/conda.txt b/requirements/conda.txt index 92111f9..a77f5f9 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,3 +1,4 @@ numpy diffpy.pdffit2 diffpy.structure +gsl diff --git a/requirements/pip.txt b/requirements/pip.txt index 92111f9..f3657e3 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,3 +1,4 @@ numpy +gsl diffpy.pdffit2 diffpy.structure diff --git a/requirements/tests.txt b/requirements/tests.txt index 1867f57..a727786 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,4 +4,3 @@ codecov coverage pytest-cov pytest-env -gsl