Merge pull request #984 from OasisLMF/release/1.27.8

Release 1.27.8

CHANGELOG.rst

@@ -1,6 +1,8 @@
 OasisPlatform Changelog
 =======================
 
+.. _`1.27.8`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.7...1.27.8
+
 .. _`1.27.7`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.6...1.27.7
 
 `1.27.6`_

Dockerfile.api_server

@@ -20,7 +20,7 @@ USER server
 FROM ubuntu:22.04
 RUN apt-get update \
  && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends sudo python3 python3-pip curl libmariadbclient-dev-compat \
+ && apt-get install -y --no-install-recommends sudo python3 python3-pkg-resources curl libmariadbclient-dev-compat \
  && rm -rf /var/lib/apt/lists/
 
 RUN adduser --home /home/server --shell /bin/bash --disabled-password --gecos "" server

VERSION

@@ -1 +1 @@
-1.27.7
+1.27.8

requirements-server.txt

@@ -71,15 +71,15 @@ coreschema==0.0.4
     # via
     #   coreapi
     #   drf-yasg
-cryptography==41.0.2
+cryptography==42.0.4
     # via
     #   autobahn
     #   azure-storage-blob
     #   pyopenssl
     #   service-identity
 daphne==4.0.0
     # via -r requirements-server.in
-django==3.2.20
+django==3.2.23
     # via
     #   -r requirements-server.in
     #   channels
@@ -179,7 +179,7 @@ prompt-toolkit==3.0.38
     # via click-repl
 psycopg2-binary==2.9.6
     # via -r requirements-server.in
-pyarrow==12.0.0
+pyarrow==14.0.1
     # via -r requirements-server.in
 pyasn1==0.5.0
     # via
@@ -193,7 +193,7 @@ pyjwt==2.7.0
     # via djangorestframework-simplejwt
 pymysql==1.0.3
     # via -r requirements-server.in
-pyopenssl==23.2.0
+pyopenssl==24.0.0
     # via twisted
 pyrsistent==0.19.3
     # via jsonschema

requirements-worker.txt

@@ -75,7 +75,7 @@ cookiecutter==2.1.1
     # via oasislmf
 cramjam==2.6.2
     # via fastparquet
-cryptography==41.0.2
+cryptography==42.0.4
     # via azure-storage-blob
 exceptiongroup==1.1.3
     # via pytest
@@ -142,10 +142,8 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.7
-    # via
-    #   -r requirements-worker.in
-    #   oasislmf
+oasislmf[extra]==1.27.8
+    # via -r requirements-worker.in
 ods-tools==3.0.8
     # via oasislmf
 packaging==23.1
@@ -168,7 +166,7 @@ prompt-toolkit==3.0.38
     # via click-repl
 psycopg2-binary==2.9.6
     # via -r requirements-worker.in
-pyarrow==12.0.0
+pyarrow==14.0.1
     # via oasislmf
 pycparser==2.21
     # via cffi

requirements.txt

@@ -128,7 +128,7 @@ coverage[toml]==7.2.5
     #   pytest-cov
 cramjam==2.6.2
     # via fastparquet
-cryptography==41.0.2
+cryptography==42.0.4
     # via
     #   autobahn
     #   azure-storage-blob
@@ -138,7 +138,7 @@ daphne==4.0.0
     # via -r ./requirements-server.in
 distlib==0.3.6
     # via virtualenv
-django==3.2.20
+django==3.2.23
     # via
     #   -r ./requirements-server.in
     #   channels
@@ -287,10 +287,8 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.7
-    # via
-    #   -r ./requirements-worker.in
-    #   oasislmf
+oasislmf[extra]==1.27.8
+    # via -r ./requirements-worker.in
 ods-tools==3.0.8
     # via
     #   -r ./requirements-server.in
@@ -332,7 +330,7 @@ psycopg2-binary==2.9.6
     # via
     #   -r ./requirements-server.in
     #   -r ./requirements-worker.in
-pyarrow==12.0.0
+pyarrow==14.0.1
     # via
     #   -r ./requirements-server.in
     #   oasislmf
@@ -354,7 +352,7 @@ pymysql==1.0.3
     # via
     #   -r ./requirements-server.in
     #   -r ./requirements-worker.in
-pyopenssl==23.2.0
+pyopenssl==24.0.0
     # via
     #   -r requirements.in
     #   twisted

src/conf/celeryconf.py

@@ -1,3 +1,4 @@
+import urllib
 from src.conf.iniconf import settings
 
 #: Celery config - ignore result?
@@ -21,8 +22,8 @@
 else:
     CELERY_RESULT_BACKEND = '{DB_ENGINE}://{DB_USER}:{DB_PASS}@{DB_HOST}:{DB_PORT}/{DB_NAME}'.format(
         DB_ENGINE=settings.get('celery', 'db_engine'),
-        DB_USER=settings.get('celery', 'db_user'),
-        DB_PASS=settings.get('celery', 'db_pass'),
+        DB_USER=urllib.parse.quote(settings.get('celery', 'db_user')),
+        DB_PASS=urllib.parse.quote(settings.get('celery', 'db_pass')),
         DB_HOST=settings.get('celery', 'db_host'),
         DB_PORT=settings.get('celery', 'db_port'),
         DB_NAME=settings.get('celery', 'db_name', fallback='celery'),

src/model_execution_worker/storage_manager.py

@@ -130,7 +130,7 @@ def _store_file(self, file_path, suffix=None):
             self.media_root,
             self._get_unique_filename(ext))
         self.logger.info('Store file: {} -> {}'.format(file_path, stored_fp))
-        return shutil.copy(file_path, stored_fp)
+        return shutil.copyfile(file_path, stored_fp)
 
     def _store_dir(self, directory_path, suffix=None, arcname=None):
         """ Compress and store a directory

src/model_execution_worker/tasks.py

@@ -639,7 +639,7 @@ def prepare_complex_model_file_inputs(complex_model_files, run_directory):
             to_path = os.path.join(run_directory, orig_fn)
             if os.name == 'nt':
                 logging.info(f'complex_model_file: copy {from_path} to {to_path}')
-                shutil.copy(from_path, to_path)
+                shutil.copyfile(from_path, to_path)
             else:
                 logging.info(f'complex_model_file: link {from_path} to {to_path}')
                 os.symlink(from_path, to_path)