Skip to content

Commit 1e66929

Browse files
authored
Merge branch 'main' into pickleable_all_codecs
2 parents 4c229b7 + 65e16c3 commit 1e66929

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ repos:
1414
- id: debug-statements
1515

1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.11.4
17+
rev: v0.11.8
1818
hooks:
1919
- id: ruff
2020
args: ["--fix", "--show-fixes"]
2121
- id: ruff-format
2222

2323
- repo: https://github.com/scientific-python/cookie
24-
rev: 2025.01.22
24+
rev: 2025.05.02
2525
hooks:
2626
- id: sp-repo-review
2727

docs/contributing.rst

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,11 @@ contributors.
203203
Merging pull requests
204204
~~~~~~~~~~~~~~~~~~~~~
205205

206-
Pull requests submitted by an external contributor should be reviewed and approved by at least
207-
one core developers before being merged. Ideally, pull requests submitted by a core developer
208-
should be reviewed and approved by at least one other core developers before being merged.
206+
Pull requests should be reviewed and approved by at least one core developer
207+
(other than the pull request author) before being merged.
209208

210-
Pull requests should not be merged until all CI checks have passed (Travis, AppVeyor,
211-
Codecov) against code that has had the latest main merged in.
209+
Pull requests should not be merged until all CI checks have passed against code
210+
that has had the latest main merged in.
212211

213212
Compatibility and versioning policies
214213
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -278,6 +277,10 @@ hard-and-fast rules, e.g., it is fine to make a minor release to make a single n
278277
feature available; equally, it is fine to make a minor release that includes a number of
279278
changes.
280279

280+
When making a minor release, open an issue stating your intention so other developers
281+
know that a release is planned. At least a week's notice should be given for other
282+
developers to be aware of and possibly add to the contents of the release.
283+
281284
Major releases obviously need to be given careful consideration, and should be done as
282285
infrequently as possible, as they will break existing code and/or affect data
283286
compatibility in some way.

0 commit comments

Comments
 (0)