From 26b9e2e2e215621cc55acc2e8e7f3e9f5e676939 Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:11:36 -0400
Subject: [PATCH 1/6] multi-platform testing

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00f20efe..3477e4f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
-            os: ["ubuntu-latest"]
+            os: ["ubuntu-latest", "windows-latest", "macos-latest"]
     steps:
       - name: check out diffpy.pdffit2
         uses: actions/checkout@v3

From b97db665ee476d1d2270a8a9e99f549d15a93b66 Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:13:14 -0400
Subject: [PATCH 2/6] test on multiple python versions

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3477e4f3..6b02aa61 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
         matrix:
+            python-version: ['3.10', '3.11', '3.12']
             os: ["ubuntu-latest", "windows-latest", "macos-latest"]
     steps:
       - name: check out diffpy.pdffit2
@@ -33,7 +34,7 @@ jobs:
           # maintain this but rather maintain the requirements files it just has
           # basic things in it like conda and pip
           environment-file: ./environment.yml
-          python-version: 3
+          python-version: ${{ matrix.python-version }}
           auto-activate-base: false
 
       - name: install diffpy.pdffit2 requirements

From 5bf577b17312aa8452fa47f4cecb8ba3f7b10b2d Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:22:56 -0400
Subject: [PATCH 3/6] update miniconda installation step

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6b02aa61..f54dd8c8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,8 +27,9 @@ jobs:
       - name: initialize miniconda
         # this uses a marketplace action that sets up miniconda in a way that makes
         # it easier to use.  I tried setting it up without this and it was a pain
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
+          miniconda-version: "latest"
           activate-environment: test
           # environment.yml file is needed by this action.  Because I don't want
           # maintain this but rather maintain the requirements files it just has

From 40594b8ba30a57054720691d1df79c9f75f116d0 Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:25:00 -0400
Subject: [PATCH 4/6] add specific version and conda to environment.yml

---
 environment.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 0e55d589..804cd50c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,8 +2,9 @@ name: diffpy.pdffit2
 channels:
   - conda-forge
 dependencies:
-  - python=3
+  - python=${{ matrix.python-version }}
   - pip
+  - conda
   - gsl
   - gcc
   - gxx

From b746b47729815ddf28fca516babf4c48d0a530f4 Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:31:42 -0400
Subject: [PATCH 5/6] change environment.yml python version to range

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 804cd50c..6956a79d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,7 @@ name: diffpy.pdffit2
 channels:
   - conda-forge
 dependencies:
-  - python=${{ matrix.python-version }}
+  - python>=3.10
   - pip
   - conda
   - gsl

From b4878cb70fd76436cd964bedba53678443206027 Mon Sep 17 00:00:00 2001
From: Sam Andrello <samqandrello@gmail.com>
Date: Sat, 27 Jul 2024 15:34:17 -0400
Subject: [PATCH 6/6] remove mac support

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f54dd8c8..a49b7e63 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
         matrix:
             python-version: ['3.10', '3.11', '3.12']
-            os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+            os: ["ubuntu-latest", "windows-latest"]
     steps:
       - name: check out diffpy.pdffit2
         uses: actions/checkout@v3