Merge pull request #4882 from Dallinger/release-v9.4.2

Release version 9.4.2
Dallinger · Feb 14, 2023 · dbc8461 · dbc8461
2 parents 673a07e + 6156399
commit dbc8461
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 71 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 9.5.0a1
+current_version = 9.4.2
 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,15 @@
 
 ## [master](https://github.com/dallinger/dallinger/tree/master) (xxxx-xx-xx)
 
+## [v9.4.2](https://github.com/dallinger/dallinger/tree/v9.4.2) (2023-02-14)
+
+- Fixes:
+  - Updated error catching logic to standardise case before catching `ExecuteException` error when deploying with Docker-SSH.
+  - The `collate_experiment_files` function is responsible for constructing the experiment directory that is eventually deployed. Due to an oversight, the original version was written in a way such that it was impossible to override built-in Dallinger resources using the `extra_files` hook; such cases were instead silently ignored. This has now been rectified.
+  - Added `db.session.commit()` at the end of scheduled task `check_db_for_missing_notifications` in case the server process has to be restarted. This would cause errors otherwise, because there would never be a moment at which the connection could be gracefully terminated.
+  - Fixed URL link of Dallinger logo.
+- Infrastructure: Update dependencies; add `pyopenssl` to `install_requires` in setup.py.
+
 ## [v9.4.1](https://github.com/dallinger/dallinger/tree/v9.4.1) (2023-02-07)
 
 - Fixed: Docker image caching problems with SSH deployment.

diff --git a/dallinger/version.py b/dallinger/version.py
@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "9.5.0a1"
+__version__ = "9.4.2"
diff --git a/demos/dlgr/demos/bartlett1932/constraints.txt b/demos/dlgr/demos/bartlett1932/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/chatroom/constraints.txt b/demos/dlgr/demos/chatroom/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -59,13 +59,13 @@ click==8.1.3
     #   nltk
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -209,7 +209,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -261,7 +261,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/concentration/constraints.txt b/demos/dlgr/demos/concentration/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/function_learning/constraints.txt b/demos/dlgr/demos/function_learning/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/iterated_drawing/constraints.txt b/demos/dlgr/demos/iterated_drawing/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/mcmcp/constraints.txt b/demos/dlgr/demos/mcmcp/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger

diff --git a/demos/dlgr/demos/rogers/constraints.txt b/demos/dlgr/demos/rogers/constraints.txt
@@ -24,11 +24,11 @@ attrs==22.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-boto3==1.26.65
+boto3==1.26.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.29.65
+botocore==1.29.70
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -58,13 +58,13 @@ click==8.1.3
     #   flask
     #   pip-tools
     #   rq
-dallinger==9.4.1
+dallinger==9.4.2
     # via -r requirements.txt
 exceptiongroup==1.1.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   trio
-faker==16.6.1
+faker==17.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -204,7 +204,7 @@ pytz-deprecation-shim==0.1.0.post0
     # via
     #   -c ../../../../dev-requirements.txt
     #   tzlocal
-redis==4.4.2
+redis==4.5.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -254,7 +254,7 @@ tabulate==0.9.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-tenacity==8.1.0
+tenacity==8.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger