From ec53b3163763e717edd25f01c3a9ef40a2eab433 Mon Sep 17 00:00:00 2001
From: Tieqiong Zhang <tz2600@columbia.edu>
Date: Fri, 17 Jan 2025 01:01:06 -0500
Subject: [PATCH 1/3] ci: fix failing py3.13 on osx-64

---
 .../matrix-and-codecov-on-merge-to-main.yml   |  3 +++
 news/osx13.rst                                | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 news/osx13.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 316ae780..3aad1c2c 100644
--- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml
+++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml
@@ -44,6 +44,9 @@ jobs:
 
       - name: Install diffpy.pdfgui and requirements
         run: |
+          if [[ "${{ matrix.os }}" == "macos-13" ]]; then
+            export CONDA_OVERRIDE_OSX=11.0 # Override virtual package detection for osx-64
+          fi
           conda install --file requirements/test.txt
           conda install wxpython diffpy.utils matplotlib-base
           pip install diffpy.pdffit2==1.5.0rc1
diff --git a/news/osx13.rst b/news/osx13.rst
new file mode 100644
index 00000000..622844e0
--- /dev/null
+++ b/news/osx13.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* no news: modification on CI workflow
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

From 98bb0b0417340cfba62b294b88e5a8a91a7602a4 Mon Sep 17 00:00:00 2001
From: Tieqiong Zhang <tz2600@columbia.edu>
Date: Sat, 18 Jan 2025 08:37:37 -0500
Subject: [PATCH 2/3] use miniforge

---
 .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 3aad1c2c..8fb1923b 100644
--- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml
+++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml
@@ -32,7 +32,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: test
-          auto-update-conda: true
+          miniforge-version: latest
           environment-file: environment.yml
           auto-activate-base: false
           python-version: ${{ matrix.python-version }}
@@ -44,9 +44,6 @@ jobs:
 
       - name: Install diffpy.pdfgui and requirements
         run: |
-          if [[ "${{ matrix.os }}" == "macos-13" ]]; then
-            export CONDA_OVERRIDE_OSX=11.0 # Override virtual package detection for osx-64
-          fi
           conda install --file requirements/test.txt
           conda install wxpython diffpy.utils matplotlib-base
           pip install diffpy.pdffit2==1.5.0rc1

From 20f6f2125f25ccbba70ce63dac5d7d284079f4d1 Mon Sep 17 00:00:00 2001
From: Simon Billinge <sbillinge@users.noreply.github.com>
Date: Mon, 20 Jan 2025 05:38:11 -0500
Subject: [PATCH 3/3] better news

---
 news/osx13.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/news/osx13.rst b/news/osx13.rst
index 622844e0..62cb825b 100644
--- a/news/osx13.rst
+++ b/news/osx13.rst
@@ -1,6 +1,6 @@
 **Added:**
 
-* no news: modification on CI workflow
+* <news item>
 
 **Changed:**
 
@@ -16,7 +16,7 @@
 
 **Fixed:**
 
-* <news item>
+* Use miniforge in CI to avoid strange error of incorrect MacOS version logged from base     env
 
 **Security:**