Skip to content

Commit 225b9e0

Browse files
authored
Merge branch 'master' into dependabot/pip/tqdm-4.41.0
2 parents d44863c + 9a7ae7a commit 225b9e0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs_rst/controlworker.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Another simple method to direct FireWorks to FireWorks is by assigning *categori
6969
Once you've set these values, job execution occurs as follows:
7070

7171
* FireWorkers with no ``category`` variable set will be able to run **any** Firework (even FireWorks with a ``_category`` key in the spec!).
72-
* FireWorkers with a ``_category`` variable set to the special keyword ``__none__`` will only be able to run Fireworks with no ``_category`` key in the spec. If this option is set, it must be the only category for the FWorker.
72+
* FireWorkers with a ``category`` variable set to the special keyword ``__none__`` will only be able to run Fireworks with no ``_category`` key in the spec. If this option is set, it must be the only category for the FWorker.
7373
* FireWorkers with a ``category`` set will only run the FireWorks with an exactly matching ``_category`` variable in the Firework spec.
7474

7575

requirements-ci.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pytest==5.2.4
1+
pytest==5.3.2
22
pytest-cov==2.8.1
33
coverage==4.5.4
44
pycodestyle==2.5.0

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ruamel.yaml==0.16.5
2-
pymongo==3.9.0
2+
pymongo==3.10.0
33
Jinja2==2.10.3
44
six==1.13.0
55
monty==3.0.2
66
python-dateutil==2.8.1
77
tabulate==0.8.6
88
flask==1.1.1
99
flask-paginate==0.5.5
10-
gunicorn==20.0.0
10+
gunicorn==20.0.4
1111
tqdm==4.41.0

0 commit comments

Comments
 (0)