[Python-modules-commits] [django-guardian] 06/09: Don't use setuptools-scm
Brian May
bam at moszumanska.debian.org
Mon Apr 4 06:12:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-guardian.
commit 94ba99a0d7b248604d597d5076e1678ae9316631
Author: Brian May <bam at debian.org>
Date: Sun Apr 3 14:16:36 2016 +1000
Don't use setuptools-scm
It gets the version wrong with the Debian git repository. See
https://github.com/pypa/setuptools_scm/issues/83
---
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
More information about the Python-modules-commits
mailing list