From 19c4052f98e5dc4fe9d7edd7125df6a66efbd79f Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sat, 18 Nov 2023 16:58:25 +0100 Subject: [PATCH] Refs #34118 -- Used Python 3.12 for GitHub actions. --- .github/workflows/docs.yml | 4 ++-- .github/workflows/linters.yml | 4 ++-- .github/workflows/schedule_tests.yml | 10 +++++++--- .github/workflows/selenium.yml | 8 ++++++-- .github/workflows/tests.yml | 2 +- tests/requirements/py3.txt | 6 +++--- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c7ec6da8e2..a12a9eac31 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'docs/requirements.txt' - run: python -m pip install -r docs/requirements.txt @@ -48,7 +48,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - run: python -m pip install blacken-docs - name: Build docs run: | diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 28526264a9..f590b5a7dc 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - run: python -m pip install flake8 - name: flake8 # Pinned to v2.0.0. @@ -44,7 +44,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - run: python -m pip install isort - name: isort # Pinned to v2.0.0. diff --git a/.github/workflows/schedule_tests.yml b/.github/workflows/schedule_tests.yml index b3faa2061c..33f33a9708 100644 --- a/.github/workflows/schedule_tests.yml +++ b/.github/workflows/schedule_tests.yml @@ -18,7 +18,7 @@ jobs: python-version: - '3.10' - '3.11' - - '3.12-dev' + - '3.12' name: Windows, SQLite, Python ${{ matrix.python-version }} continue-on-error: true steps: @@ -60,9 +60,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev - name: Install and upgrade packaging tools run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r tests/requirements/py3.txt -e . @@ -94,9 +96,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev - name: Install and upgrade packaging tools run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e . diff --git a/.github/workflows/selenium.yml b/.github/workflows/selenium.yml index 57f84ff821..57c82be242 100644 --- a/.github/workflows/selenium.yml +++ b/.github/workflows/selenium.yml @@ -24,9 +24,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev - name: Install and upgrade packaging tools run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r tests/requirements/py3.txt -e . @@ -59,9 +61,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev - name: Install and upgrade packaging tools run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e . diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 559a3af107..18a3b7f083 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: python-version: - - '3.11' + - '3.12' name: Windows, SQLite, Python ${{ matrix.python-version }} steps: - name: Checkout diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt index aad91469ec..b915eaab39 100644 --- a/tests/requirements/py3.txt +++ b/tests/requirements/py3.txt @@ -4,10 +4,10 @@ argon2-cffi >= 19.2.0 bcrypt black docutils >= 0.19 -geoip2; python_version < '3.12' +geoip2 jinja2 >= 2.11.0 -numpy; python_version < '3.12' -Pillow >= 6.2.1; sys.platform != 'win32' or python_version < '3.12' +numpy +Pillow >= 6.2.1 # pylibmc/libmemcached can't be built on Windows. pylibmc; sys.platform != 'win32' pymemcache >= 3.4.0