From ac573f8e81f3a60f414704e31f0779ba7a198fec Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 5 Jun 2022 11:37:10 +0300 Subject: [PATCH 1/3] Support Python 3.10 --- .github/workflows/ci.yml | 10 +++++++++- noxfile.py | 13 ++++++++++++- setup.py | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3a116bd6..3d31afb87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,15 @@ jobs: strategy: fail-fast: false matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + ] es-version: [7.0.0, 7.10.0] steps: diff --git a/noxfile.py b/noxfile.py index 12ff627cb..dfe4b94a8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -28,7 +28,18 @@ ) -@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", + ] +) def test(session): session.install(".[develop]") diff --git a/setup.py b/setup.py index 09c633053..d06f6a715 100644 --- a/setup.py +++ b/setup.py @@ -76,6 +76,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ], From 198ba61da85a175d2480cb8764109eefd909bbc2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 5 Jun 2022 11:37:30 +0300 Subject: [PATCH 2/3] Bump other CI versions --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d31afb87..f083f070f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,34 +8,34 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v1 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | - python3.8 -m pip install setuptools wheel twine + python3 -m pip install setuptools wheel twine - name: Build packages run: | - python3.8 utils/build-dists.py + python3 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 -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 - uses: actions/setup-python@v1 + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | - python3.8 -m pip install nox + python3 -m pip install nox - name: Lint the code run: nox -s lint @@ -43,14 +43,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | - python3.8 -m pip install nox + python3 -m pip install nox - name: Build the docs run: nox -s docs @@ -73,19 +73,19 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Elasticsearch run: | mkdir /tmp/elasticsearch wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${{ matrix.es-version }}-linux-x86_64.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1 /tmp/elasticsearch/bin/elasticsearch -d - name: Setup Python - ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Set up Python 3.8 for Nox - if: matrix.python-version != '3.8' - uses: actions/setup-python@v2 + - name: Set up Python for Nox + if: matrix.python-version != '3.10' + uses: actions/setup-python@v3 with: python-version: 3 - name: Install dependencies From 470cb9f0d1bb2f911769160c50ee9b5b9e0ef58e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 27 Oct 2022 11:46:49 +0300 Subject: [PATCH 3/3] Add support for Python 3.11 --- .github/workflows/ci.yml | 19 ++++++++++--------- noxfile.py | 1 + setup.py | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd3429737..91fffeeda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,9 +10,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python3 -m pip install setuptools wheel twine @@ -30,9 +30,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python3 -m pip install nox @@ -45,9 +45,9 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python3 -m pip install nox @@ -66,6 +66,7 @@ jobs: "3.8", "3.9", "3.10", + "3.11", ] es-version: [7.0.0, 7.10.0] @@ -78,12 +79,12 @@ jobs: wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${{ matrix.es-version }}-linux-x86_64.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1 /tmp/elasticsearch/bin/elasticsearch -d - name: Setup Python - ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Set up Python for Nox - if: matrix.python-version != '3.10' - uses: actions/setup-python@v3 + if: matrix.python-version != '3.11' + uses: actions/setup-python@v4 with: python-version: 3 - name: Install dependencies diff --git a/noxfile.py b/noxfile.py index 260b840c3..3d8cb35d2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -35,6 +35,7 @@ "3.8", "3.9", "3.10", + "3.11", ] ) def test(session): diff --git a/setup.py b/setup.py index e6deb7a39..5c23ad1fd 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,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", ],