Skip to content

Commit 8946d3f

Browse files
authored
Merge branch 'master' into migrate-to-pyproject
2 parents d6941b9 + ec2ff51 commit 8946d3f

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ jobs:
2222
# a pull request then we can checkout the head.
2323
fetch-depth: 2
2424

25-
# If this run was triggered by a pull request event, then checkout
26-
# the head of the pull request instead of the merge commit.
27-
- run: git checkout HEAD^2
28-
if: ${{ github.event_name == 'pull_request' }}
29-
3025
# Initializes the CodeQL tools for scanning.
3126
- name: Initialize CodeQL
3227
uses: github/codeql-action/init@v4

.pre-commit-config.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ repos:
3838
- repo: https://github.com/astral-sh/ruff-pre-commit
3939
rev: v0.14.3
4040
hooks:
41-
# Run the linter.
4241
- id: ruff-check
4342
args: [ --fix ]
44-
45-
- repo: https://github.com/psf/black-pre-commit-mirror
46-
rev: 25.9.0
47-
hooks:
48-
- id: black
43+
- id: ruff-format
4944

5045
- repo: https://github.com/tox-dev/pyproject-fmt
5146
rev: v2.11.0

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envlist = py310,py311,py312,py313,py314,py314t,pypy3
44
[base]
55
deps =
66
kazoo
7-
requests>=2.0
7+
requests>=2.32.5
88

99
[testenv]
1010
allowlist_externals = {toxinidir}/run-tests.py

0 commit comments

Comments
 (0)