From 8bfe3c6be56e5ee096946b3ec3ac49ce4f0943c0 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 24 Jun 2022 10:09:46 -0700 Subject: [PATCH 1/2] Disable python2 + poetry --- .github/workflows/python-deps.yml | 5 +++++ CHANGELOG.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 3c616cf675..313e5f768b 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -18,6 +18,11 @@ jobs: os: [ubuntu-latest, macos-latest] python_deps_type: [pipenv, poetry, requirements, setup_py] python_version: [2, 3] + exclude: + # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374 + - python_version: 2 + python_deps_type: poetry + env: PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 51a9b378f1..1bddec8857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -No user facing changes. +- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. ## 2.1.14 - 22 Jun 2022 From 934c0340a70fb56323d3ec2669f06963da606390 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 24 Jun 2022 10:12:49 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- .github/workflows/python-deps.yml | 4 ++++ CHANGELOG.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 313e5f768b..28efa81053 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -120,6 +120,10 @@ jobs: matrix: python_deps_type: [pipenv, poetry, requirements, setup_py] python_version: [2, 3] + exclude: + # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374 + - python_version: 2 + python_deps_type: poetry env: PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bddec8857..e8d5f9c9e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. +- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. [#1124](https://github.com/github/codeql-action/pull/1124) ## 2.1.14 - 22 Jun 2022