From ef4ecd3c4073a35ec0d0233ba7c03e66156a3bed Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 15 Jul 2023 21:16:09 +0300 Subject: [PATCH] CI(GHActions): Install all Python and PyPy versions from `conda-forge` --- .github/workflows/run-tests.yaml | 10 +++++++--- devscripts/requirements/requirements.txt | 2 -- docs/news.rst | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 7d51773..c7b0332 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -4,6 +4,8 @@ on: [push, pull_request] jobs: run-tests: + env: + not_in_conda: "[]" strategy: matrix: @@ -37,12 +39,13 @@ jobs: - uses: actions/checkout@v2 - uses: s-weigand/setup-conda@v1 with: + conda-channels: conda-forge python-version: ${{ matrix.python-version }} - if: ${{ runner.os == 'Linux' && matrix.python-version != '3.11' }} + if: ${{ !contains(fromJSON(env.not_in_conda), matrix.python-version) }} - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - if: ${{ runner.os != 'Linux' || matrix.python-version == '3.11' }} + if: ${{ contains(fromJSON(env.not_in_conda), matrix.python-version) }} - name: Cache pip uses: actions/cache@v3 with: @@ -53,9 +56,10 @@ jobs: - name: Install dependencies run: | python --version + python -m ensurepip python -m pip install --upgrade pip setuptools wheel pip --version - pip install --upgrade virtualenv "tox < 4" + pip install --upgrade virtualenv "tox >= 3.15, < 4" - name: Set TOXENV run: | import os, sys diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt index abe3d94..08b0cd3 100644 --- a/devscripts/requirements/requirements.txt +++ b/devscripts/requirements/requirements.txt @@ -1,5 +1,3 @@ ---install-option=-O2 - sqlparse SQLObject>=2.2.1; python_version >= '2.7' and python_version < '3.0' SQLObject>=3.0.0; python_version >= '3.4' diff --git a/docs/news.rst b/docs/news.rst index a557348..4f15f88 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -6,6 +6,8 @@ Version 0.3.1 (in development) * Python 3.11. +* CI(GHActions): Install all Python and PyPy versions from ``conda-forge``. + Version 0.3.0 (2021-09-24) -------------------------- -- 2.39.5