Skip to content

Commit

Permalink
Remove workaround for pylint-dev/pylint#10000
Browse files Browse the repository at this point in the history
Also update some versions
  • Loading branch information
haukex committed Oct 6, 2024
1 parent 128cc8c commit 0b78b61
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0b78b61

Please sign in to comment.