Skip to content

Commit dcfe547

Browse files
committed
Merge branch 'main' into add-typing
2 parents 670881b + 49a58b5 commit dcfe547

18 files changed

+240
-311
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
---
1+
______________________________________________________________________
22

3-
name: Bug Report
4-
about: Create a bug report to help us improve pytask-parallel
5-
title: "BUG:"
6-
labels: "bug"
3+
name: Bug Report about: Create a bug report to help us improve pytask-parallel title:
4+
"BUG:" labels: "bug"
75

8-
---
6+
______________________________________________________________________
97

108
- [ ] I have checked that this issue has not already been reported.
119

@@ -14,11 +12,11 @@ labels: "bug"
1412
- [ ] (optional) I have confirmed this bug exists on the `main` branch of
1513
pytask-parallel.
1614

17-
---
15+
______________________________________________________________________
1816

19-
**Note**: Please read [this
20-
guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing
21-
how to provide the necessary information for us to reproduce your bug.
17+
**Note**: Please read
18+
[this guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
19+
detailing how to provide the necessary information for us to reproduce your bug.
2220

2321
#### Code Sample, a copy-pastable example
2422

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
---
1+
______________________________________________________________________
22

3-
name: Documentation Improvement
4-
about: Report wrong or missing documentation
5-
title: "DOC:"
6-
labels: "documentation"
3+
name: Documentation Improvement about: Report wrong or missing documentation title:
4+
"DOC:" labels: "documentation"
75

8-
---
6+
______________________________________________________________________
97

108
#### Location of the documentation
119

.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
---
1+
______________________________________________________________________
22

3-
name: Enhancement
4-
about: Suggest an idea for pytask-parallel
5-
title: "ENH:"
6-
labels: "enhancement"
3+
name: Enhancement about: Suggest an idea for pytask-parallel title: "ENH:" labels:
4+
"enhancement"
75

8-
---
6+
______________________________________________________________________
97

108
#### Is your feature request related to a problem?
119

1210
Provide a description of what the problem is, e.g. "I wish I could use pytask-parallel
13-
to do [...]".
11+
to do \[...\]".
1412

1513
#### Describe the solution you'd like
1614

.github/ISSUE_TEMPLATE/question.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
---
1+
______________________________________________________________________
22

3-
name: Submit Question
4-
about: Ask a general question about pytask-parallel
5-
title: "QST:"
3+
name: Submit Question about: Ask a general question about pytask-parallel title: "QST:"
64
labels: "question"
75

8-
---
6+
______________________________________________________________________
97

108
#### Question about pytask-parallel
119

12-
**Note**: If you'd still like to submit a question, please read [this guide](
13-
https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing how to
14-
provide the necessary information for us to reproduce your question.
10+
**Note**: If you'd still like to submit a question, please read
11+
[this guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
12+
detailing how to provide the necessary information for us to reproduce your question.
1513

1614
```python
1715
# Your code here, if applicable

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Provide a description and/or bullet points to describe the changes in this PR.
66

77
- [ ] Reference issues which can be closed due to this PR with "Closes #x".
88
- [ ] Review whether the documentation needs to be updated.
9-
- [ ] Document PR in docs/changes.rst.
9+
- [ ] Document PR in CHANGES.md.

.github/workflows/continuous-integration-workflow.yml renamed to .github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration Workflow
1+
name: main
22

33
# Automatically cancel a previous run.
44
concurrency:
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Run unit tests and doctests.
4343
shell: bash -l {0}
44-
run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
44+
run: tox -e pytest -- tests -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
4545

4646
- name: Upload coverage report for unit tests and doctests.
4747
if: runner.os == 'Linux' && matrix.python-version == '3.9'
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Run integration tests.
5252
shell: bash -l {0}
53-
run: tox -e pytest -- -m integration --cov=./ --cov-report=xml -n auto
53+
run: tox -e pytest -- tests -m integration --cov=./ --cov-report=xml -n auto
5454

5555
- name: Upload coverage reports of integration tests.
5656
if: runner.os == 'Linux' && matrix.python-version == '3.9'
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Run end-to-end tests.
6161
shell: bash -l {0}
62-
run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto
62+
run: tox -e pytest -- tests -m end_to_end --cov=./ --cov-report=xml -n auto
6363

6464
- name: Upload coverage reports of end-to-end tests.
6565
if: runner.os == 'Linux' && matrix.python-version == '3.9'

.pre-commit-config.yaml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.1.0
3+
rev: v4.2.0
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=100']
@@ -16,33 +16,25 @@ repos:
1616
- id: python-no-eval
1717
- id: python-no-log-warn
1818
- id: python-use-type-annotations
19-
- id: rst-backticks
20-
- id: rst-directive-colons
21-
- id: rst-inline-touching-normal
2219
- id: text-unicode-replacement-char
2320
- repo: https://github.com/asottile/pyupgrade
24-
rev: v2.31.0
21+
rev: v2.32.0
2522
hooks:
2623
- id: pyupgrade
2724
args: [--py37-plus]
2825
- repo: https://github.com/asottile/reorder_python_imports
29-
rev: v2.7.1
26+
rev: v3.0.1
3027
hooks:
3128
- id: reorder-python-imports
3229
args: [--py37-plus, --add-import, 'from __future__ import annotations']
3330
- repo: https://github.com/asottile/setup-cfg-fmt
34-
rev: v1.20.0
31+
rev: v1.20.1
3532
hooks:
3633
- id: setup-cfg-fmt
3734
- repo: https://github.com/psf/black
38-
rev: 22.1.0
35+
rev: 22.3.0
3936
hooks:
4037
- id: black
41-
- repo: https://github.com/asottile/blacken-docs
42-
rev: v1.12.1
43-
hooks:
44-
- id: blacken-docs
45-
additional_dependencies: [black]
4638
- repo: https://github.com/PyCQA/flake8
4739
rev: 4.0.1
4840
hooks:
@@ -64,20 +56,24 @@ repos:
6456
pydocstyle,
6557
Pygments,
6658
]
67-
- repo: https://github.com/PyCQA/doc8
68-
rev: 0.10.1
69-
hooks:
70-
- id: doc8
7159
- repo: https://github.com/econchick/interrogate
7260
rev: 1.5.0
7361
hooks:
7462
- id: interrogate
7563
args: [-v, --fail-under=40, src, tests]
64+
- repo: https://github.com/executablebooks/mdformat
65+
rev: 0.7.14
66+
hooks:
67+
- id: mdformat
68+
additional_dependencies: [
69+
mdformat-gfm,
70+
mdformat-black,
71+
]
72+
args: [--wrap, "88"]
7673
- repo: https://github.com/codespell-project/codespell
7774
rev: v2.1.0
7875
hooks:
7976
- id: codespell
80-
args: [-L unparseable]
8177
- repo: https://github.com/pre-commit/mirrors-mypy
8278
rev: 'v0.930'
8379
hooks:
@@ -94,7 +90,7 @@ repos:
9490
pass_filenames: false
9591
language_version: "3.9"
9692
- repo: https://github.com/mgedmin/check-manifest
97-
rev: "0.47"
93+
rev: "0.48"
9894
hooks:
9995
- id: check-manifest
10096
args: [--no-build-isolation]

CHANGES.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Changes
2+
3+
This is a record of all past pytask-parallel releases and what went into them in reverse
4+
chronological order. Releases follow [semantic versioning](https://semver.org/) and all
5+
releases are available on [PyPI](https://pypi.org/project/pytask-parallel) and
6+
[Anaconda.org](https://anaconda.org/conda-forge/pytask-parallel).
7+
8+
## 0.2.0 - 2022-xx-xx
9+
10+
- {pull}`31` adds types to the package.
11+
- {pull}`36` adds a test for <https://github.com/pytask-dev/pytask/issues/216>.
12+
- {pull}`37` aligns pytask-parallel with pytask v0.2.
13+
14+
## 0.1.1 - 2022-02-08
15+
16+
- {pull}`30` removes unnecessary content from `tox.ini`.
17+
- {pull}`33` skips concurrent CI builds.
18+
- {pull}`34` deprecates Python 3.6 and adds support for Python 3.10.
19+
20+
## 0.1.0 - 2021-07-20
21+
22+
- {pull}`19` adds `conda-forge` to the `README.rst`.
23+
- {pull}`22` add note that the debugger cannot be used together with pytask-parallel.
24+
- {pull}`24` replaces versioneer with setuptools-scm.
25+
- {pull}`25` aborts build and prints reports on `KeyboardInterrupt`.
26+
- {pull}`27` enables rich tracebacks from subprocesses.
27+
28+
## 0.0.8 - 2021-03-05
29+
30+
- {pull}`17` fixes the unidentifiable version.
31+
32+
## 0.0.7 - 2021-03-04
33+
34+
- {pull}`14` fixes some post-release issues.
35+
- {pull}`16` add dependencies to `setup.py` and changes the default backend to `loky`.
36+
37+
## 0.0.6 - 2021-02-27
38+
39+
- {pull}`12` replaces all occurrences of `n_processes` with `n_workers`.
40+
- {pull}`13` adds a license, versioneer, and allows publishing on PyPI.
41+
42+
## 0.0.5 - 2020-12-28
43+
44+
- {pull}`5` fixes the CI and other smaller issues.
45+
- {pull}`8` aligns pytask-parallel with task priorities in pytask v0.0.11.
46+
- {pull}`9` enables --max-failures. Closes {issue}`7`.
47+
- {pull}`10` releases v0.0.5.
48+
49+
## 0.0.4 - 2020-10-30
50+
51+
- {pull}`4` implement an executor with `loky`.
52+
53+
## 0.0.3 - 2020-09-12
54+
55+
- {pull}`3` align the program with pytask v0.0.6.
56+
57+
## 0.0.2 - 2020-08-12
58+
59+
- {pull}`1` prepares the plugin for pytask v0.0.5.
60+
- {pull}`2` better parsing and callbacks.
61+
62+
## 0.0.1 - 2020-07-17
63+
64+
- Initial commit which combined the whole effort to release v0.0.1.

CHANGES.rst

Lines changed: 0 additions & 86 deletions
This file was deleted.

MANIFEST.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
prune tests
22

3-
exclude *.rst
3+
exclude *.md
44
exclude *.yaml
55
exclude *.yml
66
exclude tox.ini
77

8-
include README.rst
8+
include README.md
99
include LICENSE
10-
include versioneer.py
11-
include src/pytask_parallel/_version.py

0 commit comments

Comments
 (0)