Skip to content

Commit 85efba4

Browse files
authored
Enable workflows for main branch (#502)
## Overview This PR fixes #355 Changes: * Updated workflows to run against `main` * Updated `pre-commit` hooks to format TOML files * Formatted TOML files * Removed obsolete locustfile ## Related Issue / Discussion The `main` branch is now set both here and within various PAVICS configuration files. The `master` branch can safely be deleted once all running instances have been updated.
2 parents 7e96451 + 233580e commit 85efba4

File tree

7 files changed

+51
-369
lines changed

7 files changed

+51
-369
lines changed

.github/workflows/bump-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Conditional Bump Version
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
paths-ignore:
88
- .*
99
- .github/*/*.md

.github/workflows/docker-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Docker-based Testing Suite
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
concurrency:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Finch Testing Suite ⚙️
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
concurrency:

.pre-commit-config.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,29 @@ repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
1111
rev: v5.0.0
1212
hooks:
13-
- id: trailing-whitespace
14-
- id: end-of-file-fixer
15-
exclude: ".ipynb"
13+
- id: check-merge-conflict
1614
- id: check-json
15+
- id: check-toml
1716
- id: check-yaml
1817
args: [ '--allow-multiple-documents' ]
1918
- id: debug-statements
19+
- id: end-of-file-fixer
20+
exclude: ".ipynb"
21+
- id: fix-byte-order-marker
22+
- id: mixed-line-ending
23+
- id: name-tests-test
24+
args: [ '--pytest-test-first' ]
25+
exclude: "_utils.py|_common.py"
26+
- id: no-commit-to-branch
27+
args: [ '--branch', 'main' ]
2028
- id: pretty-format-json
2129
args: [ '--autofix', '--no-ensure-ascii', '--no-sort-keys' ]
2230
exclude: ".geojson|.ipynb"
31+
- id: trailing-whitespace
32+
- repo: https://github.com/pappasam/toml-sort
33+
rev: v0.24.2
34+
hooks:
35+
- id: toml-sort-fix
2336
- repo: https://github.com/adrienverge/yamllint.git
2437
rev: v1.37.1
2538
hooks:
@@ -42,7 +55,7 @@ repos:
4255
- id: black
4356
args: [ '--target-version=py310' ]
4457
- repo: https://github.com/astral-sh/ruff-pre-commit
45-
rev: v0.12.2
58+
rev: v0.12.7
4659
hooks:
4760
- id: ruff
4861
args: [ '--fix', '--show-fixes' ]
@@ -73,10 +86,10 @@ repos:
7386
additional_dependencies: [ 'black==25.1.0' ]
7487
- id: nbqa-pyupgrade
7588
args: [ '--py310-plus' ]
76-
additional_dependencies: [ 'pyupgrade==3.19.1' ]
89+
additional_dependencies: [ 'pyupgrade==3.20.0' ]
7790
- id: nbqa-isort
7891
args: [ '--settings-file=pyproject.toml' ]
79-
additional_dependencies: [ 'isort==6.0.0' ]
92+
additional_dependencies: [ 'isort==6.0.1' ]
8093
- repo: https://github.com/kynan/nbstripout
8194
rev: 0.8.1
8295
hooks:

0 commit comments

Comments
 (0)