Merge pull request #259 from raphaelrpl/patch-1.0

🐛 Fix bug related jinja2 dependency (close #258) and 💡 remove warnings celery 5.x

Author: raphaelrpl

cube_builder/celery/__init__.py

@@ -57,14 +57,20 @@ def create_celery_app(flask_app: Flask) -> Celery:
     celery.autodiscover_tasks(CELERY_TASKS)
 
     # Set same config of Flask into Celery flask_app
-    celery.conf.update(flask_app.config)
+    flask_conf = {
+        key: value for key, value in flask_app.config.items()
+        # Disable the following patterns for env vars due deprecation in celery 5.x+
+        if not key.startswith('CELERY_') and not key.startswith('CELERYD_')
+    }
+
+    celery.conf.update(flask_conf)
 
     always_eager = flask_app.config.get('TESTING', False)
     celery.conf.update(dict(
-        CELERY_ACKS_LATE=to_bool(os.getenv('CELERY_ACKS_LATE', '1')),
-        CELERY_TASK_ALWAYS_EAGER=always_eager,
-        CELERYD_PREFETCH_MULTIPLIER=Config.CELERYD_PREFETCH_MULTIPLIER,
-        CELERY_RESULT_BACKEND='db+{}'.format(flask_app.config.get('SQLALCHEMY_DATABASE_URI')),
+        task_acks_late=to_bool(os.getenv('CELERY_ACKS_LATE', '1')),
+        task_always_eager=always_eager,
+        worker_prefetch_multiplier=Config.CELERYD_PREFETCH_MULTIPLIER,
+        result_backend='db+{}'.format(flask_app.config.get('SQLALCHEMY_DATABASE_URI')),
     ))
 
     TaskBase = celery.Task

setup.py

@@ -64,7 +64,8 @@
     'bdc-auth-client @ git+https://github.com/brazil-data-cube/bdc-auth-client.git@v0.4.3#egg=bdc-auth-client',
     'bdc-catalog @ git+https://github.com/brazil-data-cube/bdc-catalog.git@v1.0.1#egg=bdc-catalog',
     'celery>=5.2',  # For PEP517
-    'Flask>=1.1.1,<2',
+    # Remove Flask 2.3 limitation due warnings related dependencies (flask-redoc)
+    "Flask>=1.1.1,<2.3",
     'flask-redoc>=0.2.1',
     'marshmallow-sqlalchemy>=0.19.0,<0.25',
     'numpy>=1.17.2',
@@ -77,7 +78,6 @@
     'rio_cogeo==3.0.2',
     'shapely>=1.7,<2',
     'SQLAlchemy-Utils>=0.34.2,<1',
-    'MarkupSafe==2.0.1',
 ]
 
 packages = find_packages()