From 144b0142aed3064d7b70dc8b0cef07115b3ea2c1 Mon Sep 17 00:00:00 2001
From: Irfan Alibay <IAlibay@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:19:59 +0000
Subject: [PATCH 1/4] Add macos-14 entry to CI workflow

---
 .github/workflows/gh-ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index fe80bf5..44a2eb7 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -46,7 +46,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          os: [macOS-latest, ubuntu-latest, windows-latest]
+          os: [macOS-latest, ubuntu-latest, windows-latest, macos-14]
           python-version: ${{ fromJSON(needs.environment-config.outputs.python-matrix) }}
           mdanalysis-version: ["latest", "develop"]
 

From 13525e7fe51abf96c0490b1f1d86dddd17074241 Mon Sep 17 00:00:00 2001
From: Irfan Alibay <IAlibay@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:23:56 +0000
Subject: [PATCH 2/4] Update deploy.yaml

---
 .github/workflows/deploy.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index b4e2e55..52cf28d 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,6 +1,10 @@
 name: Build and upload to PyPI
 
 on:
+  # uncomment pr trigger when testing
+  pull_request:
+    branches:
+      - "main"
   push:
     tags:
       - "*"
@@ -31,14 +35,15 @@ jobs:
           - [ubuntu-20.04, manylinux_x86_64, x86_64]
           - [macos-11, macosx_*, x86_64]
           - [windows-2019, win_amd64, AMD64]
-        python: ["cp39", "cp310", "cp311"]
+          - [macos-14, macosx_*, arm64]
+        python: ["cp39", "cp310", "cp311", "cp312"]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
+        uses: pypa/cibuildwheel@v2.16.5
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
           CIBW_ARCHS: ${{ matrix.buildplat[2] }}
@@ -132,7 +137,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: setup python

From a5f8deceab36896f5d0b360c6ed3bc03b7195b5b Mon Sep 17 00:00:00 2001
From: Irfan Alibay <IAlibay@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:26:22 +0000
Subject: [PATCH 3/4] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab134f5..76736d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The rules for this file:
 ### Authors
 - ianmkenney
 - tylerjereddy
+- IAlibay
 
 ### Added
 <!-- Added functionality -->
@@ -30,7 +31,7 @@ The rules for this file:
 - Temporary fix for Windows integer size default change in NumPy 2.0.0
 
 ### Changed
-<!-- Changes in existing functionality -->
+- Update CI and wheel deployment to include macos-arm64 and py3.12 (PR #63)
 
 ### Deprecated
 <!-- Soon-to-be removed features -->

From ad60014c3f43aeff4c8456c8cfce1f2860ee0482 Mon Sep 17 00:00:00 2001
From: Irfan Alibay <IAlibay@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:46:56 +0000
Subject: [PATCH 4/4] comment out pull_request trigger

---
 .github/workflows/deploy.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 52cf28d..198736f 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -2,9 +2,9 @@ name: Build and upload to PyPI
 
 on:
   # uncomment pr trigger when testing
-  pull_request:
-    branches:
-      - "main"
+  # pull_request:
+  #   branches:
+  #     - "main"
   push:
     tags:
       - "*"