Merge pull request #6186 from Dallinger/release-v10.0.0

Release version 10.0.0
Dallinger · Feb 15, 2024 · 62de8e0 · 62de8e0
2 parents 8b347a9 + 6061ed9
commit 62de8e0
Show file tree

Hide file tree

Showing 41 changed files with 496 additions and 425 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 9.13.0a1
+current_version = 10.0.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/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
   rev: 24.2.0 # update with `pre-commit autoupdate`
   hooks:
     - id: black
-      language_version: python3 # Should be a command that runs python3.8+
+      language_version: python3.12
       files: ^(tests|dallinger|dallinger_scripts|demos)/
 
 - repo: https://github.com/PyCQA/flake8

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Change Log
 
-## [master](https://github.com/dallinger/dallinger/tree/master) (xxxx-xx-xx)
+## [v10.0.0](https://github.com/dallinger/dallinger/tree/v10.0.0) (2024-02-15)
+
+#### Breaking
+- Removed support for Python 3.8.
+
+#### Added
+- Added support for Python 3.12.
+  - Remove version pinning for numpy, panda, pre-commit, sphinx, and sphinx-related packages.
+  - CI: Added Python 3.12 to GitHub workflow matrix and run Full tox tests for both Python 3.11 and 3.12.
+  - CI: Use Docker image python:3.12-bullseye.
+- The config parameter `num_dynos_worker` (default: `1`) which allows for the configuration of the number of workers can now also be used in SSH deployments. This change is beneficial for parallellizing heavy background worker processes. Previously, this config parameter only worked for Heroku deployments.
+- Added `grace_period 30s` to Caddy HTTP server configuration to prevent the Caddy server from 'getting stuck' sometimes.
+- Added better checks in `dallinger docker-ssh` for pre-existing apps with the same name.
+- Added Dozzle service to `dallinger docker-ssh` deployments.
+
+#### Changed
+- Revised logging text for Prolific.
+- Improve `handle_launch_data` error reporting and use it also for docker-ssh deployments.
+
+#### Updated
+- Infrastructure: Updated dependencies; pin ipython < 8.19.
 
 ## [v9.12.0](https://github.com/dallinger/dallinger/tree/v9.12.0) (2024-01-03)
 

diff --git a/constraints.txt b/constraints.txt
@@ -46,9 +46,9 @@ bleach==6.1.0
     # via nbconvert
 blinker==1.7.0
     # via flask
-boto3==1.34.41
+boto3==1.34.42
     # via dallinger
-botocore==1.34.41
+botocore==1.34.42
     # via
     #   boto3
     #   s3transfer
@@ -123,7 +123,7 @@ et-xmlfile==1.1.0
     # via openpyxl
 executing==2.0.1
     # via stack-data
-faker==23.1.0
+faker==23.2.0
     # via dallinger
 fastjsonschema==2.19.1
     # via nbformat
@@ -169,7 +169,7 @@ h11==0.14.0
     #   wsproto
 heroku3==5.2.1
     # via dallinger
-httpcore==1.0.2
+httpcore==1.0.3
     # via httpx
 httpx==0.26.0
     # via jupyterlab
@@ -278,7 +278,7 @@ jupyterlab==4.1.1
     # via notebook
 jupyterlab-pygments==0.3.0
     # via nbconvert
-jupyterlab-server==2.25.2
+jupyterlab-server==2.25.3
     # via
     #   jupyterlab
     #   notebook
@@ -333,7 +333,7 @@ nodeenv==1.8.0
     # via pre-commit
 notebook==7.1.0
     # via jupyter
-notebook-shim==0.2.3
+notebook-shim==0.2.4
     # via
     #   jupyterlab
     #   notebook
@@ -448,7 +448,7 @@ pyproject-hooks==1.0.0
     # via build
 pysocks==1.7.1
     # via urllib3
-pytest==7.4.4
+pytest==8.0.0
     # via
     #   dallinger
     #   pytest-rerunfailures
@@ -697,4 +697,4 @@ zope-interface==6.1
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
-# setuptools
+# setuptools
diff --git a/dallinger/docker/tools.py b/dallinger/docker/tools.py
@@ -67,13 +67,16 @@ def copy_docker_compose_files(self):
         if editable_dallinger_path:
             volumes.append(f"{editable_dallinger_path}/dallinger:/dallinger/dallinger")
             volumes.append(
-                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.10/dist-packages/dallinger/"
+                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.12/dist-packages/dallinger/"
             )
             volumes.append(
-                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.9/dist-packages/dallinger/"
+                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.11/dist-packages/dallinger/"
+            )
+            volumes.append(
+                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.10/dist-packages/dallinger/"
             )
             volumes.append(
-                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.8/dist-packages/dallinger/"
+                f"{editable_dallinger_path}/dallinger:/usr/local/lib/python3.9/dist-packages/dallinger/"
             )
         tag = get_experiment_image_tag(self.tmp_dir)
         with open(os.path.join(self.tmp_dir, "docker-compose.yml"), "w") as fh:

diff --git a/dallinger/experiments/__init__.py b/dallinger/experiments/__init__.py
@@ -16,7 +16,7 @@
 try:
     experiments_entry_points = entry_points(group="dallinger.experiments")
 except TypeError:
-    # For Python 3.8 and 3.9 we fall back to using `iter_entry_points`
+    # For Python 3.9 we fall back to using `iter_entry_points`
     from pkg_resources import iter_entry_points
 
     experiments_entry_points = iter_entry_points(group="dallinger.experiments")

diff --git a/dallinger/version.py b/dallinger/version.py
@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "9.13.0a1"
+__version__ = "10.0.0"
diff --git a/demos/dlgr/demos/bartlett1932/constraints.txt b/demos/dlgr/demos/bartlett1932/constraints.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    ./scripts/update_experiments_constraints.sh
@@ -19,19 +19,15 @@ attrs==23.2.0
     #   -c ../../../../dev-requirements.txt
     #   outcome
     #   trio
-backcall==0.2.0
-    # via
-    #   -c ../../../../dev-requirements.txt
-    #   ipython
 blinker==1.7.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask
-boto3==1.34.11
+boto3==1.34.42
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-botocore==1.34.11
+botocore==1.34.42
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
@@ -45,7 +41,7 @@ cached-property==1.5.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   requests
@@ -65,11 +61,11 @@ click==8.1.7
     #   flask
     #   pip-tools
     #   rq
-cryptography==41.0.7
+cryptography==42.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   pyopenssl
-dallinger==9.12.0
+dallinger @ git+https://github.com/Dallinger/Dallinger@release-v10.0.0
     # via -r requirements.txt
 decorator==5.1.1
     # via
@@ -79,11 +75,11 @@ executing==2.0.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   stack-data
-faker==22.0.0
+faker==23.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-flask==3.0.0
+flask==3.0.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -111,7 +107,7 @@ future==0.18.3
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-gevent==23.9.1
+gevent==24.2.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -139,7 +135,7 @@ idna==3.6
     #   -c ../../../../dev-requirements.txt
     #   requests
     #   trio
-ipython==8.12.3
+ipython==8.18.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -152,7 +148,7 @@ jedi==0.19.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   ipython
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask
@@ -165,7 +161,7 @@ localconfig==1.1.3
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via
     #   -c ../../../../dev-requirements.txt
     #   jinja2
@@ -175,7 +171,7 @@ matplotlib-inline==0.1.6
     # via
     #   -c ../../../../dev-requirements.txt
     #   ipython
-numpy==1.24.4
+numpy==1.26.4
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -189,7 +185,7 @@ packaging==23.2
     #   -c ../../../../dev-requirements.txt
     #   build
     #   gunicorn
-pandas==2.0.3
+pandas==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -202,10 +198,6 @@ pexpect==4.9.0
     #   -c ../../../../dev-requirements.txt
     #   dallinger
     #   ipython
-pickleshare==0.7.5
-    # via
-    #   -c ../../../../dev-requirements.txt
-    #   ipython
 pip-tools==7.3.0
     # via
     #   -c ../../../../dev-requirements.txt
@@ -214,7 +206,7 @@ prompt-toolkit==3.0.43
     # via
     #   -c ../../../../dev-requirements.txt
     #   ipython
-psutil==5.9.7
+psutil==5.9.8
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -239,7 +231,7 @@ pygments==2.17.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   ipython
-pyopenssl==23.3.0
+pyopenssl==24.0.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -258,7 +250,7 @@ python-dateutil==2.8.2
     #   faker
     #   heroku3
     #   pandas
-pytz==2023.3.post1
+pytz==2024.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   apscheduler
@@ -281,7 +273,7 @@ s3transfer==0.10.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   boto3
-selenium==4.16.0
+selenium==4.17.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
@@ -326,6 +318,10 @@ tenacity==8.2.3
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
+termcolor==2.4.0
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   yaspin
 timeago==1.0.16
     # via
     #   -c ../../../../dev-requirements.txt
@@ -335,7 +331,7 @@ traitlets==5.14.1
     #   -c ../../../../dev-requirements.txt
     #   ipython
     #   matplotlib-inline
-trio==0.23.2
+trio==0.24.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   selenium
@@ -344,7 +340,11 @@ trio-websocket==0.11.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   selenium
-tzdata==2023.4
+typing-extensions==4.9.0
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   selenium
+tzdata==2024.1
     # via
     #   -c ../../../../dev-requirements.txt
     #   pandas
@@ -369,7 +369,7 @@ user-agents==2.2.0
     # via
     #   -c ../../../../dev-requirements.txt
     #   dallinger
-wcwidth==0.2.12
+wcwidth==0.2.13
     # via
     #   -c ../../../../dev-requirements.txt
     #   prompt-toolkit
@@ -387,10 +387,14 @@ wsproto==1.2.0
     #   -c ../../../../dev-requirements.txt
     #   simple-websocket
     #   trio-websocket
-wtforms==3.1.1
+wtforms==3.1.2
     # via
     #   -c ../../../../dev-requirements.txt
     #   flask-wtf
+yaspin==3.0.1
+    # via
+    #   -c ../../../../dev-requirements.txt
+    #   dallinger
 zope-event==5.0
     # via
     #   -c ../../../../dev-requirements.txt
@@ -403,4 +407,4 @@ zope-interface==6.1
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools
-# generate from file with hash  d0bfb8e6474319a7832980a687befbb2
+# generate from file with hash  a0b6547b6f27818ab8aea36d8b63a692
diff --git a/demos/dlgr/demos/bartlett1932/requirements.txt b/demos/dlgr/demos/bartlett1932/requirements.txt
@@ -1 +1 @@
-dallinger
+dallinger@git+https://github.com/Dallinger/Dallinger@release-v10.0.0