From 1127085f643f630f8b0ff6e62adb9173a5a2951c Mon Sep 17 00:00:00 2001 From: Ubuntu <19364610+tuncK@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:54:33 +0000 Subject: [PATCH] bump python linting from 3.7->3.8 against linting failure --- .github/workflows/lint.yaml | 2 +- lib/galaxy/dependencies/pinned-lint-requirements.txt | 11 ++++------- lib/galaxy/dependencies/update_lint_requirements.sh | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 532ad6a2fec1..da48dc24330b 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.12'] + python-version: ['3.8', '3.12'] env: LINT_PATH: 'lib/galaxy/dependencies/pinned-lint-requirements.txt' TYPE_PATH: 'lib/galaxy/dependencies/pinned-typecheck-requirements.txt' diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt index 08d44e583e9b..6a86cc66b7c3 100644 --- a/lib/galaxy/dependencies/pinned-lint-requirements.txt +++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt @@ -1,10 +1,7 @@ attrs==23.1.0 -flake8==5.0.4 -flake8-bugbear==23.3.12 -importlib-metadata==4.2.0 +flake8==6.1.0 +flake8-bugbear==23.9.16 mccabe==0.7.0 -pycodestyle==2.9.1 -pyflakes==2.5.0 +pycodestyle==2.11.0 +pyflakes==3.1.0 ruff==0.0.292 -typing_extensions==4.7.1 -zipp==3.15.0 diff --git a/lib/galaxy/dependencies/update_lint_requirements.sh b/lib/galaxy/dependencies/update_lint_requirements.sh index e1f57a7abf02..5e413870a291 100755 --- a/lib/galaxy/dependencies/update_lint_requirements.sh +++ b/lib/galaxy/dependencies/update_lint_requirements.sh @@ -4,14 +4,14 @@ set -e # This script updates the pinned requirements for linting. # The lint requirements are split from the the other ones due to incompatible -# dependencies: flake8 requires importlib-metadata 4.2, while the Galaxy's core -# dependencies depend on importlib-metadata 4.13. +# dependencies. +# Flake8 v6.0.0 supports python v3.8.1+ only. THIS_DIRECTORY="$(cd "$(dirname "$0")" > /dev/null && pwd)" update_pinned_reqs() { VENV=$(mktemp -d "${TMPDIR:-/tmp}/$1_venv.XXXXXXXXXX") - python3.7 -m venv "${VENV}" + python3.8 -m venv "${VENV}" . "${VENV}/bin/activate" pip install --upgrade pip setuptools pip install -r "${THIS_DIRECTORY}/$1-requirements.txt"