[med-svn] [Git][med-team/biomaj3-download][upstream] New upstream version 3.2.7

[Andreas Tille (@tille)]

Andreas Tille pushed to branch upstream at Debian Med / biomaj3-download


Commits:
42551f7c by Andreas Tille at 2022-06-29T11:55:50+02:00
New upstream version 3.2.7
- - - - -


5 changed files:

- CHANGES.txt
- bin/biomaj_download_consumer.py
- biomaj_download/biomaj_download_web.py
- biomaj_download/downloadservice.py
- setup.py


Changes:

=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,6 @@
+3.2.7
+  Normalize pyyaml setup with other biomaj components
+
 3.2.6:
   Disabled test with tenacity, compat.make_retry_state removed from lib
 


=====================================
bin/biomaj_download_consumer.py
=====================================
@@ -6,8 +6,12 @@ import os
 import logging
 
 import requests
-import yaml
 import consul
+import yaml
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
 
 from biomaj_download.downloadservice import DownloadService
 from biomaj_core.utils import Utils
@@ -18,7 +22,7 @@ if 'BIOMAJ_CONFIG' in os.environ:
 
 config = None
 with open(config_file, 'r') as ymlfile:
-    config = yaml.load(ymlfile, Loader=yaml.FullLoader)
+    config = yaml.load(ymlfile, Loader=Loader)
     Utils.service_config_override(config)
 
 


=====================================
biomaj_download/biomaj_download_web.py
=====================================
@@ -7,6 +7,10 @@ import ssl
 import os
 
 import yaml
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
 from flask import Flask
 from flask import jsonify
 from flask import request
@@ -34,7 +38,7 @@ if 'BIOMAJ_CONFIG' in os.environ:
 
 config = None
 with open(config_file, 'r') as ymlfile:
-    config = yaml.load(ymlfile, Loader=yaml.FullLoader)
+    config = yaml.load(ymlfile, Loader=Loader)
     Utils.service_config_override(config)
 
 


=====================================
biomaj_download/downloadservice.py
=====================================
@@ -3,6 +3,10 @@ import datetime
 import logging
 import logging.config
 import yaml
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
 import redis
 import uuid
 import traceback
@@ -85,7 +89,7 @@ class DownloadService(object):
         self.bank = None
         self.download_callback = None
         with open(config_file, 'r') as ymlfile:
-            self.config = yaml.load(ymlfile, Loader=yaml.FullLoader)
+            self.config = yaml.load(ymlfile, Loader=Loader)
             Utils.service_config_override(self.config)
 
         Zipkin.set_config(self.config)


=====================================
setup.py
=====================================
@@ -22,7 +22,7 @@ config = {
     'url': 'http://biomaj.genouest.org',
     'download_url': 'http://biomaj.genouest.org',
     'author_email': 'olivier.sallou at irisa.fr',
-    'version': '3.2.6',
+    'version': '3.2.7',
     'classifiers': [
         # How mature is this project? Common values are
         #   3 - Alpha



View it on GitLab: https://salsa.debian.org/med-team/biomaj3-download/-/commit/42551f7cb13ca63c684762315078f897d0e79577

-- 
View it on GitLab: https://salsa.debian.org/med-team/biomaj3-download/-/commit/42551f7cb13ca63c684762315078f897d0e79577
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220629/a092619f/attachment-0001.htm>