[med-svn] [Git][med-team/biomaj3-user][upstream] New upstream version 3.0.12

[Andreas Tille (@tille)]

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


Commits:
0ee3e18e by Andreas Tille at 2022-06-29T14:34:15+02:00
New upstream version 3.0.12
- - - - -


5 changed files:

- CHANGES.txt
- bin/biomaj-users.py
- biomaj_user/biomaj_user_service.py
- requirements.txt
- setup.py


Changes:

=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,8 @@
+
+3.0.12:
+  Normalize yaml loader between biomaj components and fix dependencies
+3.0.11:
+  Force yaml loader
 3.0.10:
   Force yaml loader to skip warning on output
 3.0.9:


=====================================
bin/biomaj-users.py
=====================================
@@ -3,6 +3,10 @@ from argparse import Namespace as options
 import os
 import random
 import yaml
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
 import string
 import sys
 import bcrypt
@@ -46,7 +50,7 @@ def main():
     else:
         config = 'config.yml'
     with open(config, 'r') as ymlfile:
-        config = yaml.load(ymlfile, Loader=yaml.FullLoader)
+        config = yaml.load(ymlfile, Loader=Loader)
         Utils.service_config_override(config)
 
     BmajUser.set_config(config)


=====================================
biomaj_user/biomaj_user_service.py
=====================================
@@ -3,6 +3,10 @@ import os
 import random
 import string
 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
@@ -18,7 +22,7 @@ if 'BIOMAJ_CONFIG' in os.environ:
 
 config = None
 with open(config_file, 'r') as ymlfile:
-    config = yaml.load(ymlfile)
+    config = yaml.load(ymlfile, Loader=Loader)
     Utils.service_config_override(config)
 
 BmajUser.set_config(config)


=====================================
requirements.txt
=====================================
@@ -2,7 +2,7 @@ biomaj_core
 nose
 mock
 ldap3>=2.2.4
-pymongo
+pymongo>=3.12.3,<4
 py-bcrypt
 flask
 python-consul


=====================================
setup.py
=====================================
@@ -21,7 +21,7 @@ config = {
     'url': 'http://biomaj.genouest.org',
     'download_url': 'http://biomaj.genouest.org',
     'author_email': 'olivier.sallou at irisa.fr',
-    'version': '3.0.10',
+    'version': '3.0.12',
      'classifiers': [
         # How mature is this project? Common values are
         #   3 - Alpha
@@ -38,14 +38,11 @@ config = {
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4'
     ],
     'install_requires': [
                          'ldap3>=2.2.4',
-                         'pymongo',
+                         'pymongo>=3.12.3,<4',
                          'py-bcrypt',
                          'flask',
                          'PyYAML',



View it on GitLab: https://salsa.debian.org/med-team/biomaj3-user/-/commit/0ee3e18e308d398b46773f0aca717add78429542

-- 
View it on GitLab: https://salsa.debian.org/med-team/biomaj3-user/-/commit/0ee3e18e308d398b46773f0aca717add78429542
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/888beaf7/attachment-0001.htm>