Skip to content

Commit 56fe95e

Browse files
authored
Merge branch 'main' into tmp_list
2 parents f193f52 + 12ce6c6 commit 56fe95e

File tree

44 files changed

+419
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+419
-181
lines changed

.github/workflows/announce-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Post to Mastodon
2222
uses: snakemake/mastodon-release-post-action@v1

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
- name: Codespell
2424
uses: codespell-project/actions-codespell@v2
2525
with:

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.repository == 'snakemake/snakemake'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414

1515
- name: Set up Docker Buildx
1616
uses: docker/setup-buildx-action@v2

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
if: github.event.pull_request.merged != true || github.ref != 'refs/heads/main'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020

2121
- name: Install Pixi
22-
uses: prefix-dev/[email protected].1
22+
uses: prefix-dev/[email protected].3
2323
with:
2424
environments: "docs"
2525
pixi-version: v0.42.1
@@ -40,10 +40,10 @@ jobs:
4040
if: github.event.pull_request.merged != true || github.ref != 'refs/heads/main'
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v5
43+
- uses: actions/checkout@v6
4444

4545
- name: Install Pixi
46-
uses: prefix-dev/[email protected].1
46+
uses: prefix-dev/[email protected].3
4747
with:
4848
environments: "docs"
4949
pixi-version: v0.42.1

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
pull-requests: write # for marocchino/sticky-pull-request-comment to create or update PR comment
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323

2424
- name: Install Pixi
25-
uses: prefix-dev/[email protected].1
25+
uses: prefix-dev/[email protected].3
2626
with:
2727
environments: "quality"
2828
pixi-version: v0.42.1
@@ -69,12 +69,12 @@ jobs:
6969
ZENODO_SANDBOX_PAT: "${{ secrets.ZENODO_SANDBOX_PAT }}"
7070
CI: true
7171
steps:
72-
- uses: actions/checkout@v5
72+
- uses: actions/checkout@v6
7373
with:
7474
fetch-depth: 0
7575

7676
- name: Install Pixi
77-
uses: prefix-dev/[email protected].1
77+
uses: prefix-dev/[email protected].3
7878
with:
7979
environments: ${{ matrix.env }}
8080
pixi-version: v0.42.1
@@ -141,7 +141,7 @@ jobs:
141141
runs-on: ubuntu-latest
142142
needs: tests
143143
steps:
144-
- uses: actions/checkout@v5
144+
- uses: actions/checkout@v6
145145

146146
- name: Build container image
147147
run: docker build .

.github/workflows/release-please.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
release-type: python
1717
token: ${{ secrets.RELEASE_PLEASE_PR_CI_TOKEN }}
1818

19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
if: ${{ steps.release.outputs.release_created }}
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Set up Pixi
2525
if: ${{ steps.release.outputs.release_created }}
26-
uses: prefix-dev/[email protected].1
26+
uses: prefix-dev/[email protected].3
2727
with:
2828
environments: quality
2929
pixi-version: v0.47.0

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
# Changelog
22

33

4+
## [9.14.0](https://github.com/snakemake/snakemake/compare/v9.13.7...v9.14.0) (2025-11-27)
5+
6+
7+
### Features
8+
9+
* Support Hy in script directive ([#3824](https://github.com/snakemake/snakemake/issues/3824)) ([2329c9e](https://github.com/snakemake/snakemake/commit/2329c9ed7ac37b422e1b42f9f25865682b15a73d))
10+
11+
12+
### Bug Fixes
13+
14+
* Add support for pathlib in `notebook` field ([#3811](https://github.com/snakemake/snakemake/issues/3811)) ([7b2180a](https://github.com/snakemake/snakemake/commit/7b2180a33c6bd8efbdb213ef0caafe7c3febbe7c))
15+
* Addressed race condition in workdir_handler.py ([#3844](https://github.com/snakemake/snakemake/issues/3844)) ([8dbfcfb](https://github.com/snakemake/snakemake/commit/8dbfcfb23d9fe35f28a8153180c644c384ae21ee))
16+
* cleanup update-marked output files of failed jobs if there was no backup to restore them ([#3843](https://github.com/snakemake/snakemake/issues/3843)) ([41f1ce8](https://github.com/snakemake/snakemake/commit/41f1ce838fdca84c764eb4126419dfc5d910308f))
17+
* correct Windows callable path handling ([#3832](https://github.com/snakemake/snakemake/issues/3832)) ([5caad70](https://github.com/snakemake/snakemake/commit/5caad70003bdda91a6b9965e7742c7e796a1cc12))
18+
* expand env vars on resources ([#3823](https://github.com/snakemake/snakemake/issues/3823)) ([fcfa1bc](https://github.com/snakemake/snakemake/commit/fcfa1bc0449a1a1fbaa9effdc4a30f264e129070))
19+
* fix backup for output marked by `update` ([#3839](https://github.com/snakemake/snakemake/issues/3839)) ([09c64b7](https://github.com/snakemake/snakemake/commit/09c64b7789e36d700c9806b86a0659e9a2d2b7ad))
20+
* Minor fixes/additions to logging module. ([#3802](https://github.com/snakemake/snakemake/issues/3802)) ([3b3986d](https://github.com/snakemake/snakemake/commit/3b3986ddc9ce6b796a465bb37c0053b3a5cce207))
21+
* mount local storage prefix into containers ([#3840](https://github.com/snakemake/snakemake/issues/3840)) ([f1e8b62](https://github.com/snakemake/snakemake/commit/f1e8b6293803339ba49ef1fdd7cfe451a4e9c853))
22+
* properly format input/output files in case of missing rule to produce them ([#3849](https://github.com/snakemake/snakemake/issues/3849)) ([69d5d24](https://github.com/snakemake/snakemake/commit/69d5d246e90b8976e9228c6e6151d0d447e782df))
23+
* Unpack AnnotatedString in _apply_wildcards ([#3798](https://github.com/snakemake/snakemake/issues/3798)) ([7886508](https://github.com/snakemake/snakemake/commit/7886508641ce9a1912dd94f3f2b522f8b222c050))
24+
25+
26+
### Performance Improvements
27+
28+
* retrieve storage inputs immediately before scheduling jobs instead of before running the entire workflow ([#3850](https://github.com/snakemake/snakemake/issues/3850)) ([4ac6cda](https://github.com/snakemake/snakemake/commit/4ac6cdaf9a0826563535387de344b25db26c2ef1))
29+
430
## [9.13.7](https://github.com/snakemake/snakemake/compare/v9.13.6...v9.13.7) (2025-11-07)
531

632

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ cmd = [
171171
"tests/test_executor_test_suite.py",
172172
"tests/test_api.py",
173173
"tests/test_internals.py",
174+
"tests/test_jupyter_notebook_pathlike.py",
174175
# the tests below were never tested in the old CI and currently fail
175176
# "tests/test_args.py",
176177
# "tests/test_output_index.py",

src/snakemake/common/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
)
4949

5050

51+
def func_true(job):
52+
return True
53+
54+
5155
def get_snakemake_searchpaths():
5256
paths = [str(Path(__file__).parent.parent.parent)] + [
5357
path for path in sys.path if os.path.isdir(path)

src/snakemake/common/workdir_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def change_to(self):
1616
self.olddir = Path.cwd()
1717
if not self.workdir.exists():
1818
logger.info(f"Creating specified working directory {self.workdir}.")
19-
self.workdir.mkdir(parents=True)
19+
self.workdir.mkdir(parents=True, exist_ok=True)
2020
os.chdir(self.workdir)
2121

2222
def change_back(self):

0 commit comments

Comments
 (0)