Skip to content

Commit 0170103

Browse files
committed
Merge remote-tracking branch 'fork/main' into customize_id_generation
2 parents dbbd8a7 + 4691a61 commit 0170103

File tree

14 files changed

+357
-242
lines changed

14 files changed

+357
-242
lines changed

.github/workflows/test_code.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,8 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-latest, windows-latest, macos-latest]
15-
python-version: ["3.11"]
16-
# We only run latest Python on macOS and Windows to save resources.
17-
include:
18-
- os: ubuntu-latest
19-
python-version: "3.8"
20-
- os: ubuntu-latest
21-
python-version: "3.9"
22-
- os: ubuntu-latest
23-
python-version: "3.10"
14+
os: [ubuntu-latest, windows-latest]
15+
python-version: ["3.8", "3.12"]
2416

2517
steps:
2618
- uses: actions/checkout@v3

.github/workflows/test_mypy.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Mypy type hint checks
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
run:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup Micromamba env
17+
uses: mamba-org/setup-micromamba@v1
18+
with:
19+
environment-name: TEST
20+
create-args: >-
21+
python=3
22+
--file requirements.txt
23+
--file requirements-dev.txt
24+
25+
- name: Install branca from source
26+
shell: bash -l {0}
27+
run: |
28+
python -m pip install -e . --no-deps --force-reinstall
29+
30+
- name: Mypy test
31+
shell: bash -l {0}
32+
run: |
33+
mypy branca

.pre-commit-config.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
ci:
2+
autofix_prs: false
13
repos:
24
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
5+
rev: v6.0.0
46
hooks:
57
- id: trailing-whitespace
68
- id: check-ast
@@ -12,45 +14,45 @@ repos:
1214
files: requirements-dev.txt
1315

1416
- repo: https://github.com/PyCQA/flake8
15-
rev: 7.0.0
17+
rev: 7.3.0
1618
hooks:
1719
- id: flake8
1820
exclude: docs/source/conf.py
19-
args: [--max-line-length=105]
21+
args: [--max-line-length=105, "--ignore=E203,W503"]
2022

2123
- repo: https://github.com/pycqa/isort
22-
rev: 5.13.2
24+
rev: 6.0.1
2325
hooks:
2426
- id: isort
2527
additional_dependencies: [toml]
2628
args: ["--profile", "black", "--filter-files"]
2729

2830
- repo: https://github.com/psf/black
29-
rev: 24.2.0
31+
rev: 25.9.0
3032
hooks:
3133
- id: black
3234
language_version: python3
3335

3436
- repo: https://github.com/keewis/blackdoc
35-
rev: v0.3.9
37+
rev: v0.4.1
3638
hooks:
3739
- id: blackdoc
3840

3941
- repo: https://github.com/codespell-project/codespell
40-
rev: v2.2.6
42+
rev: v2.4.1
4143
hooks:
4244
- id: codespell
4345
args:
4446
- --ignore-words-list=thex
4547

4648
- repo: https://github.com/asottile/pyupgrade
47-
rev: v3.15.1
49+
rev: v3.20.0
4850
hooks:
4951
- id: pyupgrade
5052
args:
5153
- --py36-plus
5254

5355
- repo: https://github.com/asottile/add-trailing-comma
54-
rev: v3.1.0
56+
rev: v3.2.0
5557
hooks:
5658
- id: add-trailing-comma

0 commit comments

Comments
 (0)