[med-svn] [Git][med-team/python-etelemetry][master] Upstream introduced a new dependency on ci-info which is not yet in Debian....
Yaroslav Halchenko
gitlab at salsa.debian.org
Mon Mar 23 16:04:27 GMT 2020
Yaroslav Halchenko pushed to branch master at Debian Med / python-etelemetry
Commits:
21fedf50 by Yaroslav Halchenko at 2020-03-23T11:41:44-04:00
Upstream introduced a new dependency on ci-info which is not yet in Debian. Since it seems to be just to provide additional info, we gracefully skip if import fails
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/deb_optional_ci
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-etelemetry (0.2.0-2) unstable; urgency=medium
+
+ * Upstream introduced a new dependency on ci-info which is not yet
+ in Debian. Since it seems to be just to provide additional info,
+ we gracefully skip if import fails
+
+ -- Yaroslav Halchenko <debian at onerussian.com> Mon, 23 Mar 2020 11:41:38 -0400
+
python-etelemetry (0.2.0-1) unstable; urgency=medium
* New upstream release
=====================================
debian/patches/deb_optional_ci
=====================================
@@ -0,0 +1,42 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Subject: Make use of ci module (from ci-info package) optional
+
+Origin: Debian
+Last-Update: 2020-03-23
+
+--- a/etelemetry/client.py
++++ b/etelemetry/client.py
+@@ -1,7 +1,11 @@
+ from requests import request, ConnectionError, ReadTimeout
+ import os
+
+-import ci
++try:
++ import ci
++except ImportError:
++ # No ci module on Debian yet, we just will not provide CI information
++ ci = None
+
+ from .config import ET_PROJECTS
+
+@@ -13,7 +17,7 @@ def _etrequest(endpoint, method="get", *
+ kwargs['timeout'] = 5
+
+ params = {}
+- if ci.is_ci():
++ if ci and ci.is_ci():
+ # send along CI information
+ params = ci.info()
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -21,7 +21,8 @@ classifiers =
+ python_requires = >= 3.5
+ install_requires =
+ requests
+- ci-info
++ # No ci-info on debian yet, so we will not require it
++ # ci-info
+ test_requires =
+ pytest >= 4.4.0
+ pytest-cov
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+deb_optional_ci
View it on GitLab: https://salsa.debian.org/med-team/python-etelemetry/-/commit/21fedf50a12d794484fd70d10c8e98f4147c0222
--
View it on GitLab: https://salsa.debian.org/med-team/python-etelemetry/-/commit/21fedf50a12d794484fd70d10c8e98f4147c0222
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/20200323/0c9e0263/attachment-0001.html>
More information about the debian-med-commit
mailing list