From bedbcd6556d86af811428452dfbf1f6be2e2015a Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 20:40:48 -0300 Subject: [PATCH 1/8] Support for Python 3.12 --- .github/workflows/ubuntu.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e32d9b54b..f605c8d13 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ['3.11', '3.8', '3.9', '3.10'] + python-version: ['3.12', '3.8', '3.9', '3.11'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/setup.py b/setup.py index 6fdeb127d..2efd5d73e 100644 --- a/setup.py +++ b/setup.py @@ -252,6 +252,7 @@ def subdirs(root, file="*.*", depth=10): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Scientific/Engineering", From 5e62ae5aa69a55ec512b3f7bb1a549f1d955de47 Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 20:43:09 -0300 Subject: [PATCH 2/8] workflows --- .github/workflows/osx.yml | 2 +- .github/workflows/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index da640f1b2..b0d2ade55 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [macOS] - python-version: ['3.9', '3.10'] + python-version: ['3.9', '3.10', '3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d2a6bc21e..c07e5d88f 100755 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [windows] - python-version: ['3.10', '3.11'] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} From ffcc7cfb222eed4876d3a83ff75d2de308afcd1b Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 20:55:16 -0300 Subject: [PATCH 3/8] explicitly install setuptools --- .github/workflows/ubuntu.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f605c8d13..946c0e0cb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,6 +24,9 @@ jobs: - name: Install Mathics3 with full dependencies run: | python -m pip install --upgrade pip + # Python 3.12 seems to require this + python -m pip install --upgrade setuptools + python -m pip install --upgrade distutils # We can comment out after next Mathics-Scanner release # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] python -m pip install Mathics-Scanner From 57c1f805f79e7128ebba20824abe6a3aa9806f05 Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 20:56:12 -0300 Subject: [PATCH 4/8] explicitly install setuptools --- .github/workflows/ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 946c0e0cb..70c0aa958 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,9 +24,9 @@ jobs: - name: Install Mathics3 with full dependencies run: | python -m pip install --upgrade pip - # Python 3.12 seems to require this - python -m pip install --upgrade setuptools - python -m pip install --upgrade distutils + # Python 3.12 seems to require this + python -m pip install --upgrade setuptools + python -m pip install --upgrade distutils # We can comment out after next Mathics-Scanner release # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] python -m pip install Mathics-Scanner From fbb2c9cd3cd37262c35e050477c447000bf35856 Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 20:57:10 -0300 Subject: [PATCH 5/8] explicitly install setuptools --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 70c0aa958..70399fb45 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,7 @@ jobs: python -m pip install --upgrade pip # Python 3.12 seems to require this python -m pip install --upgrade setuptools - python -m pip install --upgrade distutils + # python -m pip install --upgrade distutils # We can comment out after next Mathics-Scanner release # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] python -m pip install Mathics-Scanner From 8df710a0a45404de3015c39ccd4fa7ae72909185 Mon Sep 17 00:00:00 2001 From: mmatera Date: Thu, 25 Jan 2024 21:00:24 -0300 Subject: [PATCH 6/8] ubuntu 22.04 --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 70399fb45..2ad755c14 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.12', '3.8', '3.9', '3.11'] From f980b0a038ae9774cf27ebdda9798ab0c1c28dbc Mon Sep 17 00:00:00 2001 From: Juan Mauricio Matera Date: Thu, 14 Mar 2024 19:22:47 -0300 Subject: [PATCH 7/8] Update osx.yml --- .github/workflows/osx.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index d32849ceb..8de56322f 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -26,6 +26,8 @@ jobs: run: | brew install llvm@14 tesseract python -m pip install --upgrade pip + pip install --upgrade setuptools + pip install --upgrade distribute - name: Install Mathics3 with full Python dependencies run: | # We can comment out after next Mathics-Scanner release From 3f02efe51cc41630964cf8cbe04f5b5d5dcfd198 Mon Sep 17 00:00:00 2001 From: Juan Mauricio Matera Date: Thu, 14 Mar 2024 19:23:15 -0300 Subject: [PATCH 8/8] Update windows.yml --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ea0f74bc0..795aa50c7 100755 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,6 +24,8 @@ jobs: - name: Install OS dependencies run: | python -m pip install --upgrade pip + pip install --upgrade setuptools + pip install --upgrade distribute python -m pip install wheel # use --force because llvm may already exist, but it also may not exist. # so we will be safe here. Another possibility would be check and install