[Python-modules-commits] r33672 - in packages/python-keyring/trunk/debian (4 files)
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Sun Aug 9 16:49:11 UTC 2015
Date: Sunday, August 9, 2015 @ 16:49:10
Author: mitya57
Revision: 33672
Rename no_hgtools.diff to no_setuptools_scm.diff and rebase against
the latest version.
Added:
packages/python-keyring/trunk/debian/patches/no_setuptools_scm.diff
(from rev 33671, packages/python-keyring/trunk/debian/patches/no_hgtools.diff)
Modified:
packages/python-keyring/trunk/debian/changelog
packages/python-keyring/trunk/debian/patches/series
Deleted:
packages/python-keyring/trunk/debian/patches/no_hgtools.diff
Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog 2015-08-09 16:26:19 UTC (rev 33671)
+++ packages/python-keyring/trunk/debian/changelog 2015-08-09 16:49:10 UTC (rev 33672)
@@ -2,6 +2,8 @@
* New upstream release.
* Update debian/watch to support tar.gz tarballs.
+ * Rename no_hgtools.diff to no_setuptools_scm.diff and rebase against
+ the latest version.
-- Dmitry Shachnev <mitya57 at debian.org> Sun, 09 Aug 2015 19:25:50 +0300
Deleted: packages/python-keyring/trunk/debian/patches/no_hgtools.diff
===================================================================
--- packages/python-keyring/trunk/debian/patches/no_hgtools.diff 2015-08-09 16:26:19 UTC (rev 33671)
+++ packages/python-keyring/trunk/debian/patches/no_hgtools.diff 2015-08-09 16:49:10 UTC (rev 33672)
@@ -1,40 +0,0 @@
-Description: get the version number from debian/changelog, not from hg
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-07-19
-
---- a/setup.py
-+++ b/setup.py
-@@ -11,6 +11,7 @@
-
- import setuptools
-
-+from subprocess import check_output
-
- def load(filename):
- """
-@@ -67,9 +68,12 @@
- []
- )
-
-+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=True,
-+ 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",
-@@ -92,9 +96,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',
Copied: packages/python-keyring/trunk/debian/patches/no_setuptools_scm.diff (from rev 33671, packages/python-keyring/trunk/debian/patches/no_hgtools.diff)
===================================================================
--- packages/python-keyring/trunk/debian/patches/no_setuptools_scm.diff (rev 0)
+++ packages/python-keyring/trunk/debian/patches/no_setuptools_scm.diff 2015-08-09 16:49:10 UTC (rev 33672)
@@ -0,0 +1,40 @@
+Description: get the version number from debian/changelog, not from scm
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-08-09
+
+--- a/setup.py
++++ b/setup.py
+@@ -11,6 +11,7 @@
+
+ import setuptools
+
++from subprocess import check_output
+
+ def load(filename):
+ """
+@@ -67,9 +68,12 @@
+ []
+ )
+
++deb_version = check_output(('dpkg-parsechangelog', '-S', 'Version')).decode('utf-8')
++upstream_version = deb_version.split('-')[0]
++
+ setup_params = dict(
+ name='keyring',
+- use_scm_version=True,
++ 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",
+@@ -92,9 +96,7 @@
+ packages=setuptools.find_packages(),
+ extras_require={'test': test_requirements},
+ tests_require=test_requirements,
+- setup_requires=[
+- 'setuptools_scm',
+- ] + pytest_runner,
++ setup_requires=pytest_runner,
+ entry_points={
+ 'console_scripts': [
+ 'keyring=keyring.cli:main',
Modified: packages/python-keyring/trunk/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series 2015-08-09 16:26:19 UTC (rev 33671)
+++ packages/python-keyring/trunk/debian/patches/series 2015-08-09 16:49:10 UTC (rev 33672)
@@ -1 +1 @@
-no_hgtools.diff
+no_setuptools_scm.diff
More information about the Python-modules-commits
mailing list