From 915f0cafafab34f8b7766f996dbfa66e7bd16006 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 28 Apr 2026 07:59:49 +0000
Subject: feat: fix macOS python_arch and add Python 3.12/3.13/3.14 support

Agent-Logs-Url: https://github.com/luciferreeves/edify/sessions/16418662-2de9-4625-aad9-e9fc6cecb1c5

Co-authored-by: luciferreeves <30593201+luciferreeves@users.noreply.github.com>
---
 .github/workflows/github-actions.yml              | 56 +++++++++++++++++++++--
 ci/templates/.github/workflows/github-actions.yml |  6 +--
 setup.py                                          |  3 ++
 tox.ini                                           |  5 +-
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index df099ea..1c20599 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -34,7 +34,6 @@ jobs:
           - name: 'py38 (macos)'
             python: '3.8'
             toxpython: 'python3.8'
-            python_arch: 'x64'
             tox_env: 'py38'
             os: 'macos-latest'
           - name: 'py39 (ubuntu)'
@@ -52,7 +51,6 @@ jobs:
           - name: 'py39 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
-            python_arch: 'x64'
             tox_env: 'py39'
             os: 'macos-latest'
           - name: 'py310 (ubuntu)'
@@ -70,7 +68,6 @@ jobs:
           - name: 'py310 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
-            python_arch: 'x64'
             tox_env: 'py310'
             os: 'macos-latest'
           - name: 'py311 (ubuntu)'
@@ -88,7 +85,6 @@ jobs:
           - name: 'py311 (macos)'
             python: '3.11'
             toxpython: 'python3.11'
-            python_arch: 'x64'
             tox_env: 'py311'
             os: 'macos-latest'
           - name: 'pypy38 (ubuntu)'
@@ -106,9 +102,59 @@ jobs:
           - name: 'pypy38 (macos)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
-            python_arch: 'x64'
             tox_env: 'pypy38'
             os: 'macos-latest'
+          - name: 'py312 (ubuntu)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312'
+            os: 'ubuntu-latest'
+          - name: 'py312 (windows)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312'
+            os: 'windows-latest'
+          - name: 'py312 (macos)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            tox_env: 'py312'
+            os: 'macos-latest'
+          - name: 'py313 (ubuntu)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313'
+            os: 'ubuntu-latest'
+          - name: 'py313 (windows)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313'
+            os: 'windows-latest'
+          - name: 'py313 (macos)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            tox_env: 'py313'
+            os: 'macos-latest'
+          - name: 'py314 (ubuntu)'
+            python: '3.14'
+            toxpython: 'python3.14'
+            python_arch: 'x64'
+            tox_env: 'py314'
+            os: 'ubuntu-latest'
+          - name: 'py314 (windows)'
+            python: '3.14'
+            toxpython: 'python3.14'
+            python_arch: 'x64'
+            tox_env: 'py314'
+            os: 'windows-latest'
+          - name: 'py314 (macos)'
+            python: '3.14'
+            toxpython: 'python3.14'
+            tox_env: 'py314'
+            os: 'macos-latest'
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml
index 33869cd..23341dc 100644
--- a/ci/templates/.github/workflows/github-actions.yml
+++ b/ci/templates/.github/workflows/github-actions.yml
@@ -34,13 +34,13 @@ jobs:
 {% for os, python_arch in [
     ['ubuntu', 'x64'],
     ['windows', 'x64'],
-    ['macos', 'x64'],
+    ['macos', ''],
 ] %}
           - name: '{{ env }} ({{ os }})'
             python: '{{ python }}'
             toxpython: '{{ toxpython }}'
-            python_arch: '{{ python_arch }}'
-            tox_env: '{{ env }}{% if 'cover' in env %},codecov{% endif %}'
+            {% if python_arch %}python_arch: '{{ python_arch }}'
+            {% endif %}tox_env: '{{ env }}{% if 'cover' in env %},codecov{% endif %}'
             os: '{{ os }}-latest'
 {% endfor %}
 {% endif %}
diff --git a/setup.py b/setup.py
index c48dd1f..49cd13c 100755
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,9 @@ setup(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         # uncomment if you test on these interpreters:
diff --git a/tox.ini b/tox.ini
index b8b488f..d459d55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ envlist =
     clean,
     check,
     docs,
-    {py37,py38,py39,py310,py311,pypy37,pypy38},
+    {py37,py38,py39,py310,py311,py312,py313,py314,pypy37,pypy38},
     report
 ignore_basepython_conflict = true
 
@@ -27,6 +27,9 @@ basepython =
     py39: {env:TOXPYTHON:python3.9}
     py310: {env:TOXPYTHON:python3.10}
     py311: {env:TOXPYTHON:python3.11}
+    py312: {env:TOXPYTHON:python3.12}
+    py313: {env:TOXPYTHON:python3.13}
+    py314: {env:TOXPYTHON:python3.14}
     {bootstrap,clean,check,report,docs,codecov}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests
-- 
cgit v1.2.3