[Python-modules-commits] [python-django-etcd-settings] 07/08: change version to 0.1.13+dfsg-1 (UNRELEASED) New upstream release.
Michael Fladischer
fladi at moszumanska.debian.org
Thu Jan 12 19:29:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-etcd-settings.
commit c90fb50984ccf1a5804a9a0af9c327b3b630722c
Merge: 400cc40 410cb7a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Jan 12 20:03:14 2017 +0100
change version to 0.1.13+dfsg-1 (UNRELEASED)
New upstream release.
MANIFEST.in | 1 +
debian/.git-dpm | 6 +++---
debian/changelog | 6 ++++++
.../0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch | 2 +-
debian/patches/0002-Remove-plantuml-sphinx-extension.patch | 2 +-
debian/patches/0003-Remove-mathjax-sphinx-extension.patch | 2 +-
.../patches/0004-Use-local-objects.inv-files-for-intersphinx.patch | 2 +-
setup_gen.py | 2 +-
tests/conftest.py | 1 +
9 files changed, 16 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index 712fe5c,0000000..ad9ef7d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 805dfbd47bdd1ab9cda0d60475b05d42237b9b07
- 805dfbd47bdd1ab9cda0d60475b05d42237b9b07
- 8f621f963901bc060b322d52b9033ba29d618fae
++410cb7aaf03e81be3f2470ee68e3890723db2523
++410cb7aaf03e81be3f2470ee68e3890723db2523
++b1662fd309ba2cad0ecf73db3cc2d090e90b4cf2
+b1662fd309ba2cad0ecf73db3cc2d090e90b4cf2
+python-django-etcd-settings_0.1.13+dfsg.orig.tar.gz
+5216bab6fb83c23a78c314d10af452ff4921f1c2
+21587
diff --cc debian/changelog
index 097dcfc,0000000..3b38223
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,11 @@@
++python-django-etcd-settings (0.1.13+dfsg-1) UNRELEASED; urgency=low
++
++ * New upstream release.
++
++ -- Michael Fladischer <fladi at debian.org> Thu, 12 Jan 2017 20:03:15 +0100
++
+python-django-etcd-settings (0.1.11+dfsg-1) unstable; urgency=low
+
+ * Initial release (Closes: #848120).
+
+ -- Michael Fladischer <fladi at debian.org> Mon, 05 Dec 2016 22:30:25 +0100
diff --cc debian/patches/0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
index 0e20ad7,0000000..e11c9a1
mode 100644,000000..100644
--- a/debian/patches/0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
+++ b/debian/patches/0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
@@@ -1,63 -1,0 +1,63 @@@
- From 06f9af2d293e0ef3774c3e99983f951a548a1ee7 Mon Sep 17 00:00:00 2001
++From cf5f7a5aeb3d5b29bb0ce81b058a3256f55dc159 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Tue, 13 Dec 2016 22:12:01 +0100
+Subject: Add setup file to avoid yet another Build-Depends on py-pkgversion.
+
+py-pkgversion is not yet packaged for Debian.
+---
+ .gitignore | 1 -
+ setup.py | 36 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 1 deletion(-)
+ create mode 100755 setup.py
+
+diff --git a/.gitignore b/.gitignore
+index e9c84a9..1d75ac2 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -170,4 +170,3 @@ Session.vim
+
+ # Project files
+ unittest.sqlite
+-/setup.py
+diff --git a/setup.py b/setup.py
+new file mode 100755
+index 0000000..4f83c3e
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,36 @@
++#!/usr/bin/env python
++# -*- coding: utf-8 -*-
++import io
++
++from setuptools import setup, find_packages
++
++
++setup(
++ name='django-etcd-settings',
++ version='0.1.11',
++ description="A dynamic settings management solution for Django using ETCD",
++ long_description=io.open('README.rst', encoding='utf-8').read(),
++ author="Enrique Paz",
++ author_email='enrique.pazperez at kpn.com',
++ url='https://github.com/kpn-digital/django-etcd-settings',
++ install_requires=[
++ 'Django>=1.7.5'
++ 'python-etcd>=0.4.1',
++ 'python-dateutil>=2.2',
++ 'six>=1.10.0',
++ ],
++ packages=find_packages(exclude=['tests*']),
++ tests_require=['tox'],
++ include_package_data=True,
++ zip_safe=False,
++ classifiers=[
++ 'Development Status :: 5 - Production/Stable',
++ 'Environment :: Web Environment',
++ 'Intended Audience :: Developers',
++ 'Operating System :: OS Independent',
++ 'Programming Language :: Python',
++ 'Programming Language :: Python :: 2',
++ 'Programming Language :: Python :: 2.7',
++ 'Topic :: Internet :: WWW/HTTP',
++ ]
++)
diff --cc debian/patches/0002-Remove-plantuml-sphinx-extension.patch
index f72332f,0000000..749bac4
mode 100644,000000..100644
--- a/debian/patches/0002-Remove-plantuml-sphinx-extension.patch
+++ b/debian/patches/0002-Remove-plantuml-sphinx-extension.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 97b5098bc8340bc5f630d15431012349b0f24381 Mon Sep 17 00:00:00 2001
++From eae544be8b7bb062145bdecb773955922bd52751 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 14 Dec 2016 09:50:12 +0100
+Subject: Remove plantuml sphinx extension.
+
+It is not used anywhere in the documentation sources.
+---
+ docs/conf.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 84610cf..bf3d3f8 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -37,12 +37,8 @@ extensions = [
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.mathjax',
+ 'sphinx.ext.napoleon',
+- 'sphinxcontrib.plantuml',
+ ]
+
+-plantuml_jar_path = os.path.abspath('./_plantuml/plantuml.jar')
+-plantuml = 'java -Djava.awt.headless=true -jar {0}'.format(plantuml_jar_path)
+-
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+
diff --cc debian/patches/0003-Remove-mathjax-sphinx-extension.patch
index b65d4f2,0000000..5c2811a
mode 100644,000000..100644
--- a/debian/patches/0003-Remove-mathjax-sphinx-extension.patch
+++ b/debian/patches/0003-Remove-mathjax-sphinx-extension.patch
@@@ -1,22 -1,0 +1,22 @@@
- From fd055c60876de44fbe634413f20c0c465434e0a7 Mon Sep 17 00:00:00 2001
++From d8442b1562e5523705706c80194d82480b2c7fad Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 14 Dec 2016 09:52:21 +0100
+Subject: Remove mathjax sphinx extension.
+
+It is not used anywhere in the documentation sources.
+---
+ docs/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index bf3d3f8..085a773 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -35,7 +35,6 @@ extensions = [
+ 'sphinx.ext.intersphinx',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.coverage',
+- 'sphinx.ext.mathjax',
+ 'sphinx.ext.napoleon',
+ ]
+
diff --cc debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
index 07540e7,0000000..eb8a9be
mode 100644,000000..100644
--- a/debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
+++ b/debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
@@@ -1,52 -1,0 +1,52 @@@
- From 805dfbd47bdd1ab9cda0d60475b05d42237b9b07 Mon Sep 17 00:00:00 2001
++From 410cb7aaf03e81be3f2470ee68e3890723db2523 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 14 Dec 2016 10:04:52 +0100
+Subject: Use local objects.inv files for intersphinx.
+
+---
+ docs/conf.py | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 085a773..ca9e3e0 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -16,6 +16,8 @@ import sys
+ import os
+ import shlex
+
++import django
++
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+@@ -292,10 +294,23 @@ texinfo_documents = [
+
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+- 'https://docs.python.org/': None,
+- 'django': (
+- 'http://docs.djangoproject.com/en/1.8/',
+- 'http://docs.djangoproject.com/en/1.8/_objects/'
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(
++ check_object_path(
++ 'python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python' + '.'.join([str(x) for x in sys.version_info[0:2]]) + '/html/objects.inv'
+ )
+-}
++)
++intersphinx_mapping.update(
++ check_object_path(
++ 'django',
++ 'https://docs.djangoproject.com/en/' + django.get_version() + '/',
++ '/usr/share/doc/python-django-doc/html/objects.inv'
++ )
++)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-etcd-settings.git
More information about the Python-modules-commits
mailing list