From eeacb3d9faad82362af91f0188c444a96f65fe80 Mon Sep 17 00:00:00 2001 From: Bernat Gabor Date: Thu, 4 Jun 2020 09:04:02 +0100 Subject: [PATCH] Add 3.9-dev and 3.10-dev via deadsnakes Signed-off-by: Bernat Gabor --- .github/workflows/check.yml | 13 ++++++++++--- tests/unit/seed/test_pip_invoke.py | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ae914487b..6fac481db 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -38,6 +38,8 @@ jobs: include: - {os: MacOs, py: brew@py3} - {os: MacOs, py: brew@py2} + - {os: Ubuntu, py: 3.9-dev} + - {os: Ubuntu, py: 3.10-dev} steps: - name: install OS dependencies run: | @@ -55,17 +57,22 @@ jobs: - name: use local virtualenv for tox run: python -m pip install . - name: setup python for test ${{ matrix.py }} - if: "!startsWith(matrix.py,'brew@py')" + if: "!( startsWith(matrix.py,'brew@py') || endsWith(matrix.py, '-dev') )" uses: actions/setup-python@v2 with: python-version: ${{ matrix.py }} - - name: load python from ${{ matrix.py }} + - name: setup DEV python for test ${{ matrix.py }} + uses: deadsnakes/action@v1.0.0 + if: endsWith(matrix.py, '-dev') + with: + python-version: ${{ matrix.py }} + - name: setup brew python for test ${{ matrix.py }} if: startsWith(matrix.py,'brew@py') run: | import os; import subprocess version = "${{matrix.py}}"[-1] subprocess.check_call(["brew", "install", f"python@{version}"]) - print(f'::add-path::/usr/local/opt/python@{version}') + print(f"::add-path::/usr/local/opt/python@{version}") shell: python - name: pick environment to run run: | diff --git a/tests/unit/seed/test_pip_invoke.py b/tests/unit/seed/test_pip_invoke.py index 18e7fed69..65314aaab 100644 --- a/tests/unit/seed/test_pip_invoke.py +++ b/tests/unit/seed/test_pip_invoke.py @@ -5,14 +5,14 @@ from virtualenv.discovery.py_info import PythonInfo from virtualenv.run import cli_run from virtualenv.seed.embed.pip_invoke import PipInvoke -from virtualenv.seed.embed.wheels import BUNDLE_SUPPORT +from virtualenv.seed.embed.wheels import BUNDLE_SUPPORT, MAX from virtualenv.seed.embed.wheels.acquire import BUNDLE_FOLDER @pytest.mark.slow @pytest.mark.parametrize("no", ["pip", "setuptools", "wheel", ""]) def test_base_bootstrap_via_pip_invoke(tmp_path, coverage_env, mocker, current_fastest, no): - bundle_ver = BUNDLE_SUPPORT[PythonInfo.current_system().version_release_str] + bundle_ver = BUNDLE_SUPPORT.get(PythonInfo.current_system().version_release_str) or BUNDLE_SUPPORT.get(MAX) extra_search_dir = tmp_path / "extra" extra_search_dir.mkdir()