This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-guardian.
commit b2f8cf4b3fe55f6b8bfe5430fa08cd000cbf0668
Merge: d3cb4ee 94ba99a
Author: Brian May <bam at debian.org>
Date: Sun Apr 3 14:25:36 2016 +1000
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0003-Don-t-use-setuptools-scm.patch | 21 ++++++++++++++++++---
docs/conf.py | 3 +--
3 files changed, 21 insertions(+), 7 deletions(-)
diff --cc debian/.git-dpm
index 028dedb,0000000..6bf1f88
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- bc8fe1c6fde0edccda6a75401934738086b4be6e
- bc8fe1c6fde0edccda6a75401934738086b4be6e
++94ba99a0d7b248604d597d5076e1678ae9316631
++94ba99a0d7b248604d597d5076e1678ae9316631
+1bd34f4d6d85b6e90fff6806a66740626d83ee70
+1bd34f4d6d85b6e90fff6806a66740626d83ee70
+django-guardian_1.4.3.orig.tar.gz
+0be9b4a3c2c051fc8e2c812a14b231a31d74fa57
+145045
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Don-t-use-setuptools-scm.patch
index cc082df,0000000..a1407f9
mode 100644,000000..100644
--- a/debian/patches/0003-Don-t-use-setuptools-scm.patch
+++ b/debian/patches/0003-Don-t-use-setuptools-scm.patch
@@@ -1,40 -1,0 +1,55 @@@
- From bc8fe1c6fde0edccda6a75401934738086b4be6e Mon Sep 17 00:00:00 2001
++From 94ba99a0d7b248604d597d5076e1678ae9316631 Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Sun, 3 Apr 2016 14:16:36 +1000
+Subject: Don't use setuptools-scm
+
+It gets the version wrong with the Debian git repository. See
+https://github.com/pypa/setuptools_scm/issues/83
+---
- setup.py | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
++ docs/conf.py | 3 +--
++ setup.py | 12 ++----------
++ 2 files changed, 3 insertions(+), 12 deletions(-)
+
++diff --git a/docs/conf.py b/docs/conf.py
++index 5b2fc68..a3080fa 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -62,8 +62,7 @@ copyright = u'2010-2013, Lukasz Balcerzak'
++ # built documents.
++ #
++ # The short X.Y version.
++-from setuptools_scm import get_version
++-version = get_version(root="..")
+++version = "1.4.3"
++ # The full version, including alpha/beta/rc tags.
++ release = version
++
+diff --git a/setup.py b/setup.py
+index 5e31881..d7a780e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,22 +4,14 @@ from setuptools import setup, find_packages
+ from extras import RunFlakesCommand
+
+
+-def version_scheme(version):
+- from setuptools_scm.version import guess_next_dev_version
+- version = guess_next_dev_version(version)
+- return version.lstrip("v")
+-
+ readme_file = os.path.join(os.path.dirname(__file__), 'README.rst')
+ with open(readme_file, 'r') as f:
+ long_description = f.readline().strip()
+
+ setup(
+ name='django-guardian',
+- use_scm_version={
+- 'write_to': "guardian/version.py",
+- 'version_scheme': version_scheme,
+- },
+- setup_requires=['setuptools_scm', 'pytest-runner'],
++ version="1.4.3",
++ setup_requires=['pytest-runner'],
+ url='http://github.com/django-guardian/django-guardian',
+ author='Lukasz Balcerzak',
+ author_email='lukaszbalcerzak at gmail.com',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-guardian.git