dependencies: update the dependencies lock file

* Fixes problem with regex in datetime:
scrapinghub/dateparser#1045
* Fixes flask_celerxext mappings for scheduler.

Co-Authored-by:  Peter Weber <Peter.Weber@rero.ch>

pyproject.toml

@@ -52,7 +52,7 @@ jsonschema = "<4.0.0"
 
 ## RERO ILS specific python modules
 PyYAML = ">=5.3.1"
-dateparser = ">=0.7.0"
+dateparser = ">=1.1.1"
 isbnlib = ">=3.9.1"
 requests = ">=2.20.0"
 polib = "*"

rero_ils/config.py

@@ -292,7 +292,6 @@ def _(x):
 # Celery configuration
 # ====================
 
-BROKER_URL = 'amqp://guest:guest@localhost:5672/'
 #: URL of message broker for Celery (default is RabbitMQ).
 CELERY_BROKER_URL = 'amqp://guest:guest@localhost:5672/'
 #: URL of backend for result storage (default is Redis).

rero_ils/schedulers.py

@@ -25,6 +25,7 @@
 from celery import current_app as current_celery
 from celery.utils.log import get_logger
 from flask.cli import with_appcontext
+from flask_celeryext._mapping import FLASK_TO_CELERY_MAPPING
 from redisbeat.scheduler import RedisScheduler as OriginalRedisScheduler
 from werkzeug.local import LocalProxy
 
@@ -110,7 +111,8 @@ def merge_inplace(self, tasks):
 
     def setup_schedule(self):
         """Init entries from CELERY_BEAT_SCHEDULE."""
-        config = deepcopy(self.app.conf.CELERY_BEAT_SCHEDULE)
+        beat_schedule = FLASK_TO_CELERY_MAPPING['CELERY_BEAT_SCHEDULE']
+        config = deepcopy(self.app.conf.get(beat_schedule))
         self.merge_inplace(config)
         msg = 'Current schedule:\n{tasks}'.format(
             tasks='\n'.join(self.display_all(prefix='- Tasks: '))

tests/conftest.py

@@ -150,7 +150,6 @@ def can_delete_json_header():
 @pytest.fixture(scope='module')
 def app_config(app_config):
     """Create temporary instance dir for each test."""
-    app_config['BROKER_URL'] = 'memory://'
     app_config['CELERY_BROKER_URL'] = 'memory://'
     app_config['RATELIMIT_STORAGE_URL'] = 'memory://'
     app_config['CACHE_TYPE'] = 'simple'

tests/scheduler/conftest.py

@@ -34,7 +34,6 @@ def create_app():
 @pytest.fixture(scope='module')
 def app_config(app_config):
     """Create temporary instance dir for each test."""
-    app_config['BROKER_URL'] = 'memory://'
     app_config['CELERY_BROKER_URL'] = 'memory://'
     app_config['RATELIMIT_STORAGE_URL'] = 'memory://'
     app_config['CACHE_TYPE'] = 'simple'

tests/scheduler/test_scheduler.py

@@ -36,6 +36,8 @@ def test_scheduler(app):
     # clean the REDIS DB
     current_scheduler._remove_db()
     # create the scheduled test tasks
+    print('--->', app.config.get('CELERY_BEAT_SCHEDULE'))
+    print('>>>>', current_celery.conf.get('beat_schedule'))
     RedisScheduler(app=current_celery)
     assert current_scheduler.display_all() == display_tasks
     assert not current_scheduler.get_entry_enabled('bulk-indexer')