[Python-modules-commits] r31909 - in packages/python-keyring/trunk/debian (4 files)

[mitya57 at users.alioth.debian.org]

    Date: Tuesday, February 24, 2015 @ 09:46:02
  Author: mitya57
Revision: 31909

Add a patch to get the version number from debian/changelog,
not from hg which is not available.

Added:
  packages/python-keyring/trunk/debian/patches/
  packages/python-keyring/trunk/debian/patches/no_hgtools.diff
  packages/python-keyring/trunk/debian/patches/series
Modified:
  packages/python-keyring/trunk/debian/changelog

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2015-02-24 09:03:32 UTC (rev 31908)
+++ packages/python-keyring/trunk/debian/changelog	2015-02-24 09:46:02 UTC (rev 31909)
@@ -6,6 +6,8 @@
   * Update my e-mail address.
   * Simplify uscan command in get-orig-source target.
   * Convert debian/copyright to machine-readable format.
+  * Add a patch to get the version number from debian/changelog,
+    not from hg which is not available.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 24 Feb 2015 11:39:49 +0300
 

Added: packages/python-keyring/trunk/debian/patches/no_hgtools.diff
===================================================================
--- packages/python-keyring/trunk/debian/patches/no_hgtools.diff	                        (rev 0)
+++ packages/python-keyring/trunk/debian/patches/no_hgtools.diff	2015-02-24 09:46:02 UTC (rev 31909)
@@ -0,0 +1,40 @@
+Description: get the version number from debian/changelog, not from hg
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-02-24
+
+--- a/setup.py
++++ b/setup.py
+@@ -11,6 +11,7 @@
+ 
+ import setuptools
+ 
++from subprocess import check_output
+ 
+ def load(filename):
+     """
+@@ -62,9 +63,12 @@
+ # only request pytest_runner when command-line indicates invocation
+ pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+ 
++deb_version = check_output(('dpkg-parsechangelog', '-S', 'Version')).decode('utf-8')
++upstream_version = deb_version.split('-')[0]
++
+ setup_params = dict(
+     name='keyring',
+-    use_vcs_version=dict(increment='1.0'),
++    version=upstream_version,
+     description="Store and access your passwords safely.",
+     url="http://bitbucket.org/kang/python-keyring-lib",
+     keywords="keyring Keychain GnomeKeyring Kwallet password storage",
+@@ -87,9 +91,7 @@
+     packages=setuptools.find_packages(),
+     extras_require={'test': test_requirements},
+     tests_require=test_requirements,
+-    setup_requires=[
+-        'hgtools',
+-    ] + pytest_runner,
++    setup_requires=pytest_runner,
+     entry_points={
+         'console_scripts': [
+             'keyring=keyring.cli:main',

Added: packages/python-keyring/trunk/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-keyring/trunk/debian/patches/series	2015-02-24 09:46:02 UTC (rev 31909)
@@ -0,0 +1 @@
+no_hgtools.diff