Merge pull request #5166 from Dallinger/release-v9.7.0

Release version 9.7.0.
Dallinger · Apr 27, 2023 · 7fe8d43 · 7fe8d43
2 parents 4c6767a + 8f29f21
commit 7fe8d43
Show file tree

Hide file tree

Showing 17 changed files with 150 additions and 93 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 9.7.0a1
+current_version = 9.7.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<build>\d+))?
 serialize = 
 	{major}.{minor}.{patch}{release}{build}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## [master](https://github.com/dallinger/dallinger/tree/master) (xxxx-xx-xx)
 
+## [v9.7.0](https://github.com/dallinger/dallinger/tree/v9.7.0) (2023-04-27)
+
+- Fixed: Fixed failure in `docker-ssh deploy` that occurred when the app existed already.
+- Fixed: Fixed a bug where config dashboard credentials weren't being propagated to Docker deployments.
+- Fixed: Fixed a bug where app name / ID (`app_name`) was not set appropriately in config during Docker deployment. Now when deploying with `docker-ssh` using a specified `--app` argument this is saved as expected in `config.heroku_app_id`.
+- Fixed: Fixed a bug where dollar signs weren't being escaped in docker-compose.yml.
+- Fixed: Fixed a bug where the dashboard tab was closed on `submitAssignment()`.
+- Fixed: Replace Heroku obsolete dyno type 'hobby' with 'basic'.
+- Enhancement: Added UI switch to the dashboard's experiment monitoring tab to toggle auto recruitment (`auto_recruit`) on/off.
+- Enhancement: Added new boolean config variable `activate_recruiter_on_start` (default: `True`). If the variable is set to `True`, then existing behavior is preserved; if set to `False`, then `open_recruitment()` is skipped when the experiment launches. This means that the user has to manually initialize recruitment (e.g. via the Prolific panel).
+- Infrastructure: Updated dependencies.
+
 ## [v9.6.0](https://github.com/dallinger/dallinger/tree/v9.6.0) (2023-04-18)
 
 - Fixed: Fixed GitHub CI builds by removing the codecov package from setup.py and migrating the codecov setup according to https://docs.codecov.com/docs/deprecated-uploader-migration-guide#python-uploader.
@@ -10,6 +22,7 @@
 - Fixed: The original `Bot` constructor assumed that the participant recruitment URL was specified in snake case. However the Docker CI tests use participant recruit URLs with camel case. This was causing Bot parameters (assignment ID, worker ID, participant ID) to be left unset, and seemed to have caused occasional CI errors in the Docker tests.
 - Fixed: Fixed bug in docker-ssh export caused by upgrade to docker compose v2.
 - Enhancement: Enhanced efficiency in dashboard monitor data loading. Previously the dashboard could take a very long time to load when the database contained many custom object classes. In such cases we are now running about 1000 times faster.
+- Infrastructure: Updated dependencies.
 
 ## [v9.5.0](https://github.com/dallinger/dallinger/tree/v9.5.0) (2023-03-29)
 

diff --git a/dallinger/version.py b/dallinger/version.py
@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "9.7.0a1"
+__version__ = "9.7.0"
diff --git a/demos/dlgr/demos/bartlett1932/constraints.txt b/demos/dlgr/demos/bartlett1932/constraints.txt
@@ -23,11 +23,15 @@ attrs==23.1.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.115
+blinker==1.6.2
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   flask
+boto3==1.26.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.115
+botocore==1.29.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -65,18 +69,18 @@ cryptography==40.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.6.0
+dallinger==9.7.0
     # via -r requirements.txt
 exceptiongroup==1.1.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
     #   trio-websocket
-faker==18.4.0
+faker==18.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==2.2.3
+flask==2.3.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -225,7 +229,7 @@ redis==4.5.4
     #   -c ../../../../dev-requirements.txt
     #   dallinger
     #   rq
-requests==2.28.2
+requests==2.29.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -238,7 +242,7 @@ s3transfer==0.6.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.8.3
+selenium==4.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -316,7 +320,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-werkzeug==2.2.3
+werkzeug==2.3.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask

diff --git a/demos/dlgr/demos/chatroom/constraints.txt b/demos/dlgr/demos/chatroom/constraints.txt
@@ -23,11 +23,15 @@ attrs==23.1.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.115
+blinker==1.6.2
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   flask
+boto3==1.26.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.115
+botocore==1.29.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -66,18 +70,18 @@ cryptography==40.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.6.0
+dallinger==9.7.0
     # via -r requirements.txt
 exceptiongroup==1.1.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
     #   trio-websocket
-faker==18.4.0
+faker==18.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==2.2.3
+flask==2.3.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -232,7 +236,7 @@ redis==4.5.4
     #   rq
 regex==2022.3.15
     # via nltk
-requests==2.28.2
+requests==2.29.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -245,7 +249,7 @@ s3transfer==0.6.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.8.3
+selenium==4.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -325,7 +329,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-werkzeug==2.2.3
+werkzeug==2.3.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask

diff --git a/demos/dlgr/demos/concentration/constraints.txt b/demos/dlgr/demos/concentration/constraints.txt
@@ -23,11 +23,15 @@ attrs==23.1.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.115
+blinker==1.6.2
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   flask
+boto3==1.26.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.115
+botocore==1.29.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -65,18 +69,18 @@ cryptography==40.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.6.0
+dallinger==9.7.0
     # via -r requirements.txt
 exceptiongroup==1.1.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
     #   trio-websocket
-faker==18.4.0
+faker==18.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==2.2.3
+flask==2.3.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -225,7 +229,7 @@ redis==4.5.4
     #   -c ../../../../dev-requirements.txt
     #   dallinger
     #   rq
-requests==2.28.2
+requests==2.29.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -238,7 +242,7 @@ s3transfer==0.6.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.8.3
+selenium==4.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -316,7 +320,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-werkzeug==2.2.3
+werkzeug==2.3.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask

diff --git a/demos/dlgr/demos/function_learning/constraints.txt b/demos/dlgr/demos/function_learning/constraints.txt
@@ -23,11 +23,15 @@ attrs==23.1.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.115
+blinker==1.6.2
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   flask
+boto3==1.26.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.115
+botocore==1.29.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -65,18 +69,18 @@ cryptography==40.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.6.0
+dallinger==9.7.0
     # via -r requirements.txt
 exceptiongroup==1.1.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
     #   trio-websocket
-faker==18.4.0
+faker==18.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==2.2.3
+flask==2.3.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -225,7 +229,7 @@ redis==4.5.4
     #   -c ../../../../dev-requirements.txt
     #   dallinger
     #   rq
-requests==2.28.2
+requests==2.29.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -238,7 +242,7 @@ s3transfer==0.6.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.8.3
+selenium==4.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -316,7 +320,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-werkzeug==2.2.3
+werkzeug==2.3.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask

diff --git a/demos/dlgr/demos/iterated_drawing/constraints.txt b/demos/dlgr/demos/iterated_drawing/constraints.txt
@@ -23,11 +23,15 @@ attrs==23.1.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.115
+blinker==1.6.2
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   flask
+boto3==1.26.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.115
+botocore==1.29.121
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -65,18 +69,18 @@ cryptography==40.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.6.0
+dallinger==9.7.0
     # via -r requirements.txt
 exceptiongroup==1.1.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
     #   trio-websocket
-faker==18.4.0
+faker==18.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==2.2.3
+flask==2.3.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -225,7 +229,7 @@ redis==4.5.4
     #   -c ../../../../dev-requirements.txt
     #   dallinger
     #   rq
-requests==2.28.2
+requests==2.29.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -238,7 +242,7 @@ s3transfer==0.6.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.8.3
+selenium==4.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -316,7 +320,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-werkzeug==2.2.3
+werkzeug==2.3.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask