From 3e9fb45de5f9e588c3612f1bb4941e60cbd532d9 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Mon, 13 Jan 2025 14:27:17 -0800 Subject: [PATCH 01/10] Add support for Python 3.11 --- noxfile.py | 2 +- setup.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index 12ff627cb..85f647c88 100644 --- a/noxfile.py +++ b/noxfile.py @@ -28,7 +28,7 @@ ) -@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]) +@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]) def test(session): session.install(".[develop]") diff --git a/setup.py b/setup.py index 6f87b7aff..d89e87cad 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import find_packages, setup -VERSION = (7, 4, 1) +VERSION = (7, 4, 1, "rover-prod-py311") __version__ = VERSION __versionstr__ = ".".join(map(str, VERSION)) @@ -76,6 +76,8 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ], From 12c5bd6e662a71020a6487ae5625d4f56bcac873 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Mon, 13 Jan 2025 14:28:48 -0800 Subject: [PATCH 02/10] Update changelog --- Changelog.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Changelog.rst b/Changelog.rst index 558f91e85..6e9569004 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,12 @@ Changelog ========= +7.4.1.rover-prod-py311 (2025-01-13) +------------------ +Rover fork for Python 3.11 support + * Update setup.py to require Python 3.11 + + 7.4.1 (2023-03-01) ------------------ From d4bf04d85182871e9ae20d1e552c0ee9852f77b1 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Mon, 13 Jan 2025 14:39:43 -0800 Subject: [PATCH 03/10] Remove lower Python versions from noxfile and setup.py --- noxfile.py | 2 +- setup.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/noxfile.py b/noxfile.py index 85f647c88..dc430e5d3 100644 --- a/noxfile.py +++ b/noxfile.py @@ -28,7 +28,7 @@ ) -@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]) +@nox.session(python=["3.10", "3.11"]) def test(session): session.install(".[develop]") diff --git a/setup.py b/setup.py index d89e87cad..cfc1a9ada 100644 --- a/setup.py +++ b/setup.py @@ -67,15 +67,6 @@ "Intended Audience :: Developers", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", From 598f4e0cb95c4295369a0d58c7a4bd9c2d3507c8 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:33:20 -0800 Subject: [PATCH 04/10] Update GH workflow --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3a116bd6..3c880f6f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,30 +9,30 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | - python3.8 -m pip install setuptools wheel twine + python3.11 -m pip install setuptools wheel twine - name: Build packages run: | - python3.8 utils/build-dists.py + python3.11 utils/build-dists.py - name: Check packages run: | set -exo pipefail; - if [ $(python3.8 -m twine check dist/* | grep -c 'warning') != 0 ]; then exit 1; fi + if [ $(python3.11 -m twine check dist/* | grep -c 'warning') != 0 ]; then exit 1; fi lint: runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | python3.8 -m pip install nox @@ -44,13 +44,13 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | - python3.8 -m pip install nox + python3.11 -m pip install nox - name: Build the docs run: nox -s docs @@ -60,7 +60,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: [3.10, 3.11] es-version: [7.0.0, 7.10.0] steps: @@ -75,8 +75,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Set up Python 3.8 for Nox - if: matrix.python-version != '3.8' + - name: Set up Python 3.11 for Nox + if: matrix.python-version != '3.11' uses: actions/setup-python@v2 with: python-version: 3 From e0b54af01b8591b56901b1f97c3c02f88209647d Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:34:37 -0800 Subject: [PATCH 05/10] Update one more Py version in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c880f6f8..b57562999 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: python-version: 3.11 - name: Install dependencies run: | - python3.8 -m pip install nox + python3.11 -m pip install nox - name: Lint the code run: nox -s lint From d6a768aa630e8081c548758a7bb47f118a240ede Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:36:49 -0800 Subject: [PATCH 06/10] Update version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cfc1a9ada..fa96ec5be 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import find_packages, setup -VERSION = (7, 4, 1, "rover-prod-py311") +VERSION = (7, 4, 1, "rover.prod.py311") __version__ = VERSION __versionstr__ = ".".join(map(str, VERSION)) From b4a1ee21f5a7c51ad889f7d1f15e9a3b009fea30 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:37:54 -0800 Subject: [PATCH 07/10] Update version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fa96ec5be..0f0696450 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import find_packages, setup -VERSION = (7, 4, 1, "rover.prod.py311") +VERSION = (7, 4, 1, "py311") __version__ = VERSION __versionstr__ = ".".join(map(str, VERSION)) From 1d6dc5177df3968a9450f3bc1026c070c731a3d5 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:40:56 -0800 Subject: [PATCH 08/10] Update version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0f0696450..3c282ba8c 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import find_packages, setup -VERSION = (7, 4, 1, "py311") +VERSION = (7, 4, 1, "dev3") __version__ = VERSION __versionstr__ = ".".join(map(str, VERSION)) From 29b745f80c5342ca5cc66f2bfc13dd7178ac651e Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:43:53 -0800 Subject: [PATCH 09/10] Update es test-linux matrix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b57562999..672230e4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,8 +60,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.10, 3.11] - es-version: [7.0.0, 7.10.0] + python-version: [3.11] + es-version: [7.10.0, 7.10.1] steps: - name: Checkout Repository From 58cbb612997b23a92bdd7bf4289654015abfbd24 Mon Sep 17 00:00:00 2001 From: Pearson Daniels Date: Thu, 16 Jan 2025 12:45:40 -0800 Subject: [PATCH 10/10] Remove references to python 3.10 --- noxfile.py | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index dc430e5d3..b2bb221b8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -28,7 +28,7 @@ ) -@nox.session(python=["3.10", "3.11"]) +@nox.session(python=["3.11"]) def test(session): session.install(".[develop]") diff --git a/setup.py b/setup.py index 3c282ba8c..4caecdbbc 100644 --- a/setup.py +++ b/setup.py @@ -67,7 +67,6 @@ "Intended Audience :: Developers", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy",