From 0b78b6151d073ea34c5f46c68e48a6399d4fc9ec Mon Sep 17 00:00:00 2001 From: Hauke D Date: Sun, 6 Oct 2024 13:17:35 +0200 Subject: [PATCH] Remove workaround for pylint-dev/pylint#10000 Also update some versions --- .github/workflows/tests.yml | 5 ----- Makefile | 4 +--- dev/requirements.txt | 2 +- docs/requirements.txt | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0dacca5..45b5baa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,11 +9,6 @@ jobs: matrix: os: [Ubuntu, Windows, macOS] python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] - #TODO Later: The workaround for pylint+3.13.0rc3 isn't working on macOS for some reason - # remove the following exception when that gets fixed (see pylint step in Makefile) - exclude: - - os: macOS - python-version: "3.13" runs-on: ${{ matrix.os }}-latest # Reminder: Keep in sync with dev/local-actions.sh steps: diff --git a/Makefile b/Makefile index 34e053a..52020ba 100644 --- a/Makefile +++ b/Makefile @@ -81,9 +81,7 @@ ver-checks: ## Checks that depend on the Python version $(PYTHON3BIN) -m mypy --config-file pyproject.toml $(py_code_locs) # Note I'm not sure if the following are actually version-dependent, but because they parse the Python code, I'll leave them here. $(PYTHON3BIN) -m flake8 --toml-config=pyproject.toml $(py_code_locs) - #TODO Later: The following is a workaround for https://github.com/pylint-dev/pylint/issues/10000 (on Python 3.13.0rc3), remove when fixed - ISPY13RC="$$( $(PYTHON3BIN) --version | perl -ne 'print "yes" if /Python 3\.13\.0rc/' )" - $(PYTHON3BIN) -m pylint --rcfile=pyproject.toml $${ISPY13RC:+"--disable=no-name-in-module"} --recursive=y $(py_code_locs) + $(PYTHON3BIN) -m pylint --rcfile=pyproject.toml --recursive=y $(py_code_locs) other-checks: ## Checks not depending on the Python version @set -euxo pipefail diff --git a/dev/requirements.txt b/dev/requirements.txt index c332003..6a5364b 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -7,4 +7,4 @@ mypy == 1.11.2 flake8 == 7.1.1 Flake8-pyproject == 1.2.3 pur == 7.3.2 -pre-commit == 3.8.0 +pre-commit == 4.0.0 diff --git a/docs/requirements.txt b/docs/requirements.txt index a3028ec..723949e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ tomli == 2.0.2 sphinx >= 7.4.7 sphinx-markdown-builder == 0.6.7 -types-docutils == 0.21.0.20240907 +types-docutils == 0.21.0.20241005