Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/test-summary/act…
Browse files Browse the repository at this point in the history
…ion-2.4
  • Loading branch information
bdraco authored Aug 17, 2024
2 parents 56f6cf7 + 5284f53 commit b6f4b90
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ jobs:
strategy:
matrix:
pyver:
- 3.13
- 3.12
- 3.11
- >-
Expand Down Expand Up @@ -215,6 +216,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.pyver }}
allow-prereleases: true
cache: pip
cache-dependency-path: requirements/*.txt
- name: Install dependencies
Expand Down
22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.5.0'
rev: 'v4.6.0'
hooks:
- id: check-merge-conflict
- repo: https://github.com/asottile/yesqa
Expand All @@ -21,13 +21,13 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: '23.12.1'
rev: '24.4.2'
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.8+

- repo: https://github.com/python-jsonschema/check-jsonschema.git
rev: 0.27.3
rev: 0.28.6
hooks:
- id: check-github-workflows
files: ^\.github/workflows/[^/]+$
Expand All @@ -45,7 +45,7 @@ repos:
- id: check-readthedocs

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.5.0'
rev: 'v4.6.0'
hooks:
- id: end-of-file-fixer
exclude: >-
Expand Down Expand Up @@ -78,30 +78,30 @@ repos:
- id: detect-private-key
exclude: ^examples/
- repo: https://github.com/asottile/pyupgrade
rev: 'v3.15.0'
rev: 'v3.16.0'
hooks:
- id: pyupgrade
args: ['--py36-plus']
- repo: https://github.com/PyCQA/flake8
rev: '6.1.0'
rev: '7.1.0'
hooks:
- id: flake8
exclude: "^docs/"

- repo: https://github.com/codespell-project/codespell.git
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell

- repo: https://github.com/adrienverge/yamllint.git
rev: v1.33.0
rev: v1.35.1
hooks:
- id: yamllint
args:
- --strict

- repo: https://github.com/MarcoGorelli/cython-lint.git
rev: v0.16.0
rev: v0.16.2
hooks:
- id: cython-lint

Expand Down Expand Up @@ -159,7 +159,7 @@ repos:
types: [file, rst]

- repo: https://github.com/pre-commit/mirrors-mypy.git
rev: v1.8.0
rev: v1.10.1
hooks:
- id: mypy
alias: mypy-py312
Expand Down Expand Up @@ -211,7 +211,7 @@ repos:
pass_filenames: false

- repo: https://github.com/rhysd/actionlint
rev: v1.6.26
rev: v1.7.1
hooks:
- id: actionlint-docker
args:
Expand Down
1 change: 1 addition & 0 deletions CHANGES/595.packaging.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Declared Python 3.13 supported officially in the distribution package metadata.
1 change: 1 addition & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- Contributors -
----------------
Andrew Svetlov
Edgar Ramírez-Mondragón
Marcin Konowalczyk
Martijn Pieters
Pau Freixes
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ classifiers =
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy

Expand Down
7 changes: 6 additions & 1 deletion tests/test_frozenlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
class FrozenListMixin:
FrozenList = NotImplemented

SKIP_METHODS = {"__abstractmethods__", "__slots__"}
SKIP_METHODS = {
"__abstractmethods__",
"__slots__",
"__static_attributes__",
"__firstlineno__",
}

def test___class_getitem__(self) -> None:
assert self.FrozenList[str] is not None
Expand Down

0 comments on commit b6f4b90

Please sign in to comment.