[med-svn] [Git][med-team/python-easydev][master] 4 commits: BUild-Depends: python-pytest
Andreas Tille
gitlab at salsa.debian.org
Tue Jan 22 20:48:39 GMT 2019
Andreas Tille pushed to branch master at Debian Med / python-easydev
Commits:
b47f44c9 by Andreas Tille at 2019-01-22T20:06:26Z
BUild-Depends: python-pytest
- - - - -
9a7de48c by Andreas Tille at 2019-01-22T20:06:48Z
Do not use pkg_resources to avoid build failure
- - - - -
7995c1de by Andreas Tille at 2019-01-22T20:07:02Z
debhelper 12
- - - - -
9f62bf07 by Andreas Tille at 2019-01-22T20:08:55Z
Cleanup changelog
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/no_pkg_resources.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,17 @@
python-easydev (0.9.37-1) UNRELEASED; urgency=medium
+ [ Andreas Tille ]
* Team upload.
* Fix watch file
- * debhelper 11
+ * debhelper 12
* Activate Testsuite field
* Point Vcs fields to salsa.debian.org
* Standards-Version: 4.3.0
* Remove trailing whitespace in debian/copyright
+ [ Piotr Ożarowski ]
+ * do not use pkg_resources
+
-- Andreas Tille <tille at debian.org> Wed, 09 Jan 2019 16:45:57 +0100
python-easydev (0.9.35+dfsg-2) unstable; urgency=medium
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12
=====================================
debian/control
=====================================
@@ -4,18 +4,20 @@ Uploaders: Afif Elghraoui <afif at debian.org>
Section: python
Testsuite: autopkgtest-pkg-python
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
dh-python,
python-all,
python-setuptools,
python-appdirs,
python-colorama,
python-pexpect,
+ python-pytest,
python3-all,
python3-setuptools,
python3-appdirs,
python3-colorama,
- python3-pexpect
+ python3-pexpect,
+ python3-pytest,
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/python-easydev
Vcs-Git: https://salsa.debian.org/med-team/python-easydev.git
=====================================
debian/patches/no_pkg_resources.patch
=====================================
@@ -0,0 +1,24 @@
+From: Piotr Ożarowski <piotr at debian.org>
+Date: Wed, 16 Jan 2019 10:34:07 +0100
+Origin: https://lists.debian.org/debian-python/2019/01/msg00060.html
+Description: Do not use pkg_resources to avoid build failure
+ kg_resources.DistributionNotFound: The 'easydev' distribution was not found and is required by the application
+
+--- a/easydev/__init__.py
++++ b/easydev/__init__.py
+@@ -20,15 +20,6 @@ from __future__ import print_function
+
+
+ __version__ = "0.9.36"
+-try:
+- import pkg_resources
+-except ImportError as err:
+- print(err)
+- print("version set to {} manually.".format(__version__))
+- version = __version__
+-else:
+- version = pkg_resources.require("easydev")[0].version
+- __version__ = version
+
+ from . import browser
+ from .browser import browse as onweb
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
external-appdirs.patch
privacy.patch
+no_pkg_resources.patch
View it on GitLab: https://salsa.debian.org/med-team/python-easydev/compare/86679fcbc6003db225eed512775a829159c07326...9f62bf076497c9beddc7e16d7ed0237450ca54a2
--
View it on GitLab: https://salsa.debian.org/med-team/python-easydev/compare/86679fcbc6003db225eed512775a829159c07326...9f62bf076497c9beddc7e16d7ed0237450ca54a2
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/20190122/8a40396b/attachment-0001.html>
More information about the debian-med-commit
mailing list