Skip to content

Commit ebabd84

Browse files
committed
Merge branch 'main' into delayed-nodes
2 parents 0d41ac6 + 9b27ec5 commit ebabd84

File tree

155 files changed

+467
-515
lines changed

Some content is hidden

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

155 files changed

+467
-515
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: tox -e test -- -m "unit or (not integration and not end_to_end)" --cov=src --cov=tests --cov-report=xml -n auto
5454

5555
- name: Upload unit test coverage reports to Codecov with GitHub Action
56-
uses: codecov/codecov-action@v3
56+
uses: codecov/codecov-action@v4
5757
with:
5858
flags: unit
5959

@@ -62,7 +62,7 @@ jobs:
6262
run: tox -e test -- -m integration --cov=src --cov=tests --cov-report=xml -n auto
6363

6464
- name: Upload integration test coverage reports to Codecov with GitHub Action
65-
uses: codecov/codecov-action@v3
65+
uses: codecov/codecov-action@v4
6666
with:
6767
flags: integration
6868

@@ -71,6 +71,6 @@ jobs:
7171
run: tox -e test -- -m end_to_end --cov=src --cov=tests --cov-report=xml -n auto
7272

7373
- name: Upload end_to_end test coverage reports to Codecov with GitHub Action
74-
uses: codecov/codecov-action@v3
74+
uses: codecov/codecov-action@v4
7575
with:
7676
flags: end_to_end

.github/workflows/update-plugin-list.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: python scripts/update_plugin_list.py
3838

3939
- name: Create Pull Request
40-
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
40+
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
4141
with:
4242
commit-message: '[automated] Update plugin list'
4343
author: 'Tobias Raabe <[email protected]>'

.pre-commit-config.yaml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ repos:
2424
- id: python-check-mock-methods
2525
- id: python-no-log-warn
2626
- id: text-unicode-replacement-char
27-
- repo: https://github.com/asottile/reorder-python-imports
28-
rev: v3.12.0
29-
hooks:
30-
- id: reorder-python-imports
31-
args: [--py38-plus, --add-import, 'from __future__ import annotations']
32-
exclude: ^(docs_src/)
33-
- repo: https://github.com/asottile/reorder-python-imports
34-
rev: v3.12.0
35-
hooks:
36-
- id: reorder-python-imports
37-
args: [--py38-plus]
38-
files: ^(docs_src/)
3927
# - repo: https://github.com/tox-dev/pyproject-fmt
4028
# rev: 1.2.0
4129
# hooks:
@@ -45,7 +33,7 @@ repos:
4533
hooks:
4634
- id: sort-all
4735
- repo: https://github.com/astral-sh/ruff-pre-commit
48-
rev: v0.2.0
36+
rev: v0.3.1
4937
hooks:
5038
- id: ruff-format
5139
- id: ruff
@@ -90,14 +78,14 @@ repos:
9078
]
9179
files: (docs/.)
9280
- repo: https://github.com/nbQA-dev/nbQA
93-
rev: 1.7.1
81+
rev: 1.8.4
9482
hooks:
9583
- id: nbqa-black
9684
- id: nbqa-isort
9785
- id: nbqa-mypy
9886
args: [--ignore-missing-imports]
9987
- repo: https://github.com/kynan/nbstripout
100-
rev: 0.6.2
88+
rev: 0.7.1
10189
hooks:
10290
- id: nbstripout
10391
exclude: (docs)

docs/source/changes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ releases are available on [PyPI](https://pypi.org/project/pytask) and
1717
relative to the config file.
1818
- {pull}`555` uses new-style hook wrappers and requires pluggy 1.3 for typing.
1919
- {pull}`557` fixes an issue with `@task(after=...)` in notebooks and terminals.
20+
- {pull}`566` makes universal-pathlib an official dependency.
21+
- {pull}`568` restricts `task_files` to a list of patterns and raises a better error.
22+
- {pull}`569` removes the hooks related to the creation of the DAG.
2023

2124
## 0.4.5 - 2024-01-09
2225

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
documentation: https://www.sphinx-doc.org/en/master/usage/configuration.html
55
66
"""
7+
78
from __future__ import annotations
89

910
import inspect

docs/source/how_to_guides/remote_files.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@ lots of use cases to deal with remote files.
77
get started. So, some tasks reference remote files instead of local files.
88
- You store the workflow results in remote storage to save and distribute them.
99

10-
pytask uses [universal_pathlib](https://github.com/fsspec/universal_pathlib) to work
10+
pytask uses [universal-pathlib](https://github.com/fsspec/universal_pathlib) to work
1111
with remote files. The package provides a {mod}`pathlib`-like interface, making it very
1212
easy to interact with files from an HTTP(S)-, Dropbox-, S3-, GCP-, Azure-based
1313
filesystem, and many more.
1414

15-
```{warning}
16-
universal_pathlib does currently not support Python 3.12. To track progress, check the
17-
[releases `>0.1.4`](https://github.com/fsspec/universal_pathlib/releases).
18-
```
19-
2015
## HTTP(S)-based filesystem
2116

2217
As an example for dealing with an HTTP(S)-based filesystem, we will download the iris

docs/source/reference_guides/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ strict_markers = true
242242
Change the pattern which identify task files.
243243
244244
```toml
245-
task_files = "task_*.py" # default
245+
task_files = ["task_*.py"] # default
246246
247247
task_files = ["task_*.py", "tasks_*.py"]
248248
```

docs/source/reference_guides/hookspecs.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,6 @@ The following hooks traverse directories and collect tasks from files.
6262
.. autofunction:: pytask_collect_log
6363
```
6464

65-
## Resolving Dependencies
66-
67-
The following hooks are designed to build a DAG from tasks and dependencies and check
68-
which files have changed and need to be re-run.
69-
70-
```{warning}
71-
This step is still experimental and likely to change in the future. If you are planning
72-
to write a plugin which extends pytask in this dimension, please, start a discussion
73-
before writing a plugin. It may make your life easier if changes in pytask anticipate
74-
your plugin.
75-
```
76-
77-
```{eval-rst}
78-
.. autofunction:: pytask_dag
79-
.. autofunction:: pytask_dag_create_dag
80-
.. autofunction:: pytask_dag_log
81-
82-
```
83-
8465
## Execution
8566

8667
The following hooks execute the tasks and log information on the result in the terminal.

docs/source/tutorials/defining_dependencies_products.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ task has finished, pytask will check whether the file exists.
7272
7373
````
7474
75-
````{tab-item} prodouces
75+
````{tab-item} produces
7676
:sync: produces
7777
7878
```{literalinclude} ../../../docs_src/tutorials/defining_dependencies_products_products_produces.py
@@ -132,7 +132,7 @@ annotation are dependencies of the task.
132132
133133
````
134134
135-
````{tab-item} prodouces
135+
````{tab-item} produces
136136
:sync: produces
137137
138138
To specify that the task relies on the data set `data.pkl`, you can add the path to the
@@ -178,7 +178,7 @@ are assumed to point to a location relative to the task module.
178178
179179
````
180180
181-
````{tab-item} prodouces
181+
````{tab-item} produces
182182
:sync: produces
183183
184184
```{literalinclude} ../../../docs_src/tutorials/defining_dependencies_products_relative_produces.py

docs/source/tutorials/making_tasks_persist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ in the database such that the subsequent execution will skip the task successful
1313

1414
## When is this useful?
1515

16-
- You ran a formatter like Black on the files in your project and want to prevent the
16+
- You ran a formatter like ruff on the files in your project and want to prevent the
1717
longest-running tasks from being rerun.
1818
- You extend a repetition of a task function but do not want to rerun all tasks.
1919
- You want to integrate a task that you have already run elsewhere. Copy over the

0 commit comments

Comments
 (0)