[Python-modules-commits] [django-guardian] 03/09: merge patched into master

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository django-guardian.

commit d9c1eac096727d7627aca473f0c44a79eb8f798f
Merge: fbfb690 18a86fb
Author: Brian May <bam at debian.org>
Date:   Sun Apr 3 14:17:34 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 debian/patches/0003-Don-t-use-setuptools-scm.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 guardian/version.py                                |  2 +-
 setup.py                                           | 12 +----
 5 files changed, 57 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 4e98872,0000000..1884b09
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
- 2e725651d02a4d7da8e0823462a6f9d9ed0de506
- 2e725651d02a4d7da8e0823462a6f9d9ed0de506
++18a86fb4dc63a85a065211bc16b31ab9084c1e4a
++18a86fb4dc63a85a065211bc16b31ab9084c1e4a
 +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 0000000,0000000..8c1371b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Don-t-use-setuptools-scm.patch
@@@ -1,0 -1,0 +1,51 @@@
++From 18a86fb4dc63a85a065211bc16b31ab9084c1e4a 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
++---
++ guardian/version.py |  2 +-
++ setup.py            | 12 ++----------
++ 2 files changed, 3 insertions(+), 11 deletions(-)
++
++diff --git a/guardian/version.py b/guardian/version.py
++index 3136771..5023a30 100644
++--- a/guardian/version.py
+++++ b/guardian/version.py
++@@ -1,4 +1,4 @@
++ # coding: utf-8
++ # file generated by setuptools_scm
++ # don't change, don't track in version control
++-version = '1.4.3'
+++version = '2.dev12+ngfbfb690'
++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',
diff --cc debian/patches/series
index a9a1181,0000000..4ddbe71
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Append-uncompressed-JavaScript-libraries.patch
 +0002-Remove-nonlocal-image-for-Travis-ci.patch
++0003-Don-t-use-setuptools-scm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-guardian.git