[med-svn] [Git][med-team/biomaj3-download][master] 7 commits: routine-update: New upstream version
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Jun 29 12:22:33 BST 2022
Andreas Tille pushed to branch master at Debian Med / biomaj3-download
Commits:
05439a4e by Andreas Tille at 2022-06-29T11:55:49+02:00
routine-update: New upstream version
- - - - -
42551f7c by Andreas Tille at 2022-06-29T11:55:50+02:00
New upstream version 3.2.7
- - - - -
e305a93a by Andreas Tille at 2022-06-29T11:55:50+02:00
Update upstream source from tag 'upstream/3.2.7'
Update to upstream version '3.2.7'
with Debian dir b395bca5c8d1549f0b4587cc5ad7e73d49b8c13c
- - - - -
9c893dbf by Andreas Tille at 2022-06-29T11:55:50+02:00
routine-update: Standards-Version: 4.6.1
- - - - -
8889edfe by Andreas Tille at 2022-06-29T11:55:52+02:00
routine-update: Remove trailing whitespace in debian/changelog
- - - - -
7cea8166 by Andreas Tille at 2022-06-29T12:08:04+02:00
Fix import name for autopkgtest
- - - - -
4358e02e by Andreas Tille at 2022-06-29T13:15:51+02:00
Remove debian/test/control
- - - - -
9 changed files:
- CHANGES.txt
- bin/biomaj_download_consumer.py
- biomaj_download/biomaj_download_web.py
- biomaj_download/downloadservice.py
- debian/changelog
- debian/control
- − debian/test/control
- + debian/test/pkg-python/import-name
- 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)
=====================================
debian/changelog
=====================================
@@ -1,6 +1,16 @@
+biomaj3-download (3.2.7-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Standards-Version: 4.6.1 (routine-update)
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Fix import name for autopkgtest
+
+ -- Andreas Tille <tille at debian.org> Wed, 29 Jun 2022 11:55:49 +0200
+
biomaj3-download (3.2.6-1) unstable; urgency=medium
- * New upstream release, fixing tenacity breaking changes and minor fixes
+ * New upstream release, fixing tenacity breaking changes and minor fixes
(Closes: #1005457).
-- Olivier Sallou <osallou at debian.org> Mon, 14 Feb 2022 07:52:05 +0000
=====================================
debian/control
=====================================
@@ -30,7 +30,7 @@ Build-Depends: debhelper-compat (= 13),
python3-tenacity <!nocheck>,
python3-simpleeval <!nocheck>,
rsync
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/biomaj3-download
Vcs-Git: https://salsa.debian.org/med-team/biomaj3-download.git
Homepage: https://github.com/genouest/biomaj-download
@@ -41,7 +41,6 @@ Architecture: all
Depends: ${misc:Depends},
${python3:Depends}
Suggests: python3-gunicorn,
- mongodb,
redis-server
Description: BioMAJ download management library
BioMAJ downloads remote data banks, checks their status and applies
=====================================
debian/test/control deleted
=====================================
@@ -1,3 +0,0 @@
-Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$AUTOPKGTEST_TMP" ; echo "Testing with $py:" ; $py -c "import biomaj-download; print(biomaj-download)" ; done
-Depends: python3-all, python3-biomaj3-download
-Restrictions: allow-stderr, superficial
=====================================
debian/test/pkg-python/import-name
=====================================
@@ -0,0 +1 @@
+biomaj_download
=====================================
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/-/compare/7be7b3f0cc02c9860e03eae7ef5f0a92f5c5c28b...4358e02ee7f4e6e041f219fcd14d48f86e6cd7f5
--
View it on GitLab: https://salsa.debian.org/med-team/biomaj3-download/-/compare/7be7b3f0cc02c9860e03eae7ef5f0a92f5c5c28b...4358e02ee7f4e6e041f219fcd14d48f86e6cd7f5
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/4a89e1c5/attachment-0001.htm>
More information about the debian-med-commit
mailing list