Skip to content

Commit f8eb340

Browse files
authored
Merge 573b8aa into e60c31b
2 parents e60c31b + 573b8aa commit f8eb340

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

.conda/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ requirements:
2424
- python >=3.6
2525
- cloudpickle
2626
- pytask >=0.0.11
27+
- loky
2728

2829
test:
2930
requires:

CHANGES.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ all releases are available on `PyPI <https://pypi.org/project/pytask-parallel>`_
77
`Anaconda.org <https://anaconda.org/pytask/pytask-parallel>`_.
88

99

10-
0.0.7 - 2021-xx-xx
10+
0.0.7 - 2021-03-03
1111
------------------
1212

1313
- :gh:`14` fixes some post-release issues.
14+
- :gh:`16` add dependencies to ``setup.py`` and changes the default backend to ``loky``.
1415

1516

1617
0.0.6 - 2021-02-27

MANIFEST.in

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
include versioneer.py
2-
include src/pytask_parallel/_version.py
3-
include LICENSE
1+
prune .conda
2+
prune tests
43

54
exclude *.rst
65
exclude *.yaml
76
exclude *.yml
87
exclude tox.ini
98

10-
prune .conda
11-
prune tests
9+
include README.rst
10+
include LICENSE
11+
include versioneer.py
12+
include src/pytask_parallel/_version.py

README.rst

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,12 @@ pytask-parallel is available on `PyPI <https://pypi.org/project/pytask-parallel>
5252
$ conda config --add channels conda-forge --add channels pytask
5353
$ conda install pytask-parallel
5454
55-
The plugin uses the ``ProcessPoolExecutor`` or ``ThreadPoolExecutor`` in the
56-
`concurrent.futures <https://docs.python.org/3/library/concurrent.futures.html>`_ module
57-
to execute tasks asynchronously. By default, processes are used for parallelization.
55+
By default, the plugin uses a robust implementation of the ``ProcessPoolExecutor`` from
56+
``loky``.
5857

59-
It is also possible to install ``loky`` with
60-
61-
.. code-block:: console
62-
63-
$ conda install -c conda-forge loky
64-
65-
which is a more robust implementation of the ``ProcessPoolExecutor`` and the default
66-
backend if installed.
58+
It is also possible to select the ``ProcessPoolExecutor`` or ``ThreadPoolExecutor`` in
59+
the `concurrent.futures <https://docs.python.org/3/library/concurrent.futures.html>`_
60+
module as backends to execute tasks asynchronously.
6761

6862

6963
Usage
@@ -101,7 +95,7 @@ You can also set the options in one of the configuration files (``pytask.ini``,
10195
10296
[pytask]
10397
n_workers = 1
104-
parallel_backend = processes # or loky if installed.
98+
parallel_backend = loky # or processes or threads
10599
106100
107101
Changes

setup.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@
3939
"Programming Language :: Python :: 3.8",
4040
"Programming Language :: Python :: 3.9",
4141
],
42+
install_requires=[
43+
"pytask >= 0.0.11",
44+
"cloudpickle",
45+
"loky",
46+
],
4247
platforms="any",
4348
packages=find_packages(where="src"),
4449
package_dir={"": "src"},
4550
entry_points={"pytask": ["pytask_parallel = pytask_parallel.plugin"]},
51+
include_package_data=True,
4652
zip_safe=False,
4753
)

0 commit comments

Comments
 (0)