Skip to content

Commit 9496b89

Browse files
authored
Merge pull request #3 from A-Baji/populate-kwargs
Update changelog and fix styling
2 parents 40576ce + 25bbbd2 commit 9496b89

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* Bugfix - Fix count for left-joined `QueryExpressions` (#951) PR #966
1717
* Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
1818
* Update `~jobs.error_stack` from blob to mediumblob to allow error stacks >64kB in jobs (#984) PR #986
19+
* Add - Allow optional keyword arguments for `make()` in `populate()` PR #971
1920

2021
### 0.13.2 -- May 7, 2021
2122
* Update `setuptools_certificate` dependency to new name `otumat`

datajoint/autopopulate.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ def populate(self, *restrictions, suppress_errors=False, return_exception_object
130130
reserve_jobs=False, order="original", limit=None, max_calls=None,
131131
display_progress=False, processes=1, make_kwargs=None):
132132
"""
133-
``table.populate()`` calls ``table.make(key)`` for every primary key in
133+
``table.populate()`` calls ``table.make(key)`` for every primary key in
134134
``self.key_source`` for which there is not already a tuple in table.
135-
136-
:param restrictions: a list of restrictions each restrict
135+
136+
:param restrictions: a list of restrictions each restrict
137137
(table.key_source - target.proj())
138138
:param suppress_errors: if True, do not terminate execution.
139139
:param return_exception_objects: return error objects instead of just error messages
@@ -144,8 +144,8 @@ def populate(self, *restrictions, suppress_errors=False, return_exception_object
144144
:param display_progress: if True, report progress_bar
145145
:param processes: number of processes to use. When set to a large number, then
146146
uses as many as CPU cores
147-
:param make_kwargs: Keyword arguments which do not affect the result of computation
148-
to be passed down to each ``make()`` call. Computation arguments should be
147+
:param make_kwargs: Keyword arguments which do not affect the result of computation
148+
to be passed down to each ``make()`` call. Computation arguments should be
149149
specified within the pipeline e.g. using a `dj.Lookup` table.
150150
:type make_kwargs: dict, optional
151151
"""

docs-parts/intro/Releases_lang1.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
1616
* Bugfix - Fix regression issue with `DISTINCT` clause and `GROUP_BY` (#914) PR #963
1717
* Update `~jobs.error_stack` from blob to mediumblob to allow error stacks >64kB in jobs (#984) PR #986
18+
* Add - Allow optional keyword arguments for `make()` in `populate()` PR #971
1819

1920
0.13.2 -- May 7, 2021
2021
----------------------

0 commit comments

Comments
 (0)