[Python-modules-commits] [django-polymorphic] 04/17: merge patched-experimental into experimental
Michael Fladischer
fladi at moszumanska.debian.org
Mon Mar 6 12:51:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch experimental
in repository django-polymorphic.
commit 541cfd1e92601ca370047c95ac12d54675d09fdf
Merge: 92903e0 bb7145f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Mar 6 12:01:21 2017 +0100
merge patched-experimental into experimental
debian/.git-dpm | 6 +-
...0001-use-local-objects.inv-where-possible.patch | 33 +-
.../_ext/djangodummy}/__init__.py | 0
docs/_ext/djangodummy/requirements.txt | 3 +
docs/_ext/djangodummy/settings.py | 11 +
.../_ext/djangoext}/__init__.py | 0
docs/_ext/djangoext/docstrings.py | 47 ++
docs/_ext/djangoext/roles.py | 8 +
docs/advanced.rst | 3 +-
docs/api/index.rst | 13 +
docs/api/polymorphic.admin.rst | 93 ++++
docs/api/polymorphic.contrib.extra_views.rst | 7 +
docs/api/polymorphic.contrib.guardian.rst | 7 +
docs/api/polymorphic.formsets.rst | 41 ++
docs/api/polymorphic.managers.rst | 21 +
docs/api/polymorphic.models.rst | 8 +
docs/api/polymorphic.templatetags.rst | 4 +
docs/api/polymorphic.utils.rst | 5 +
docs/changelog.rst | 10 +
docs/conf.py | 37 +-
docs/index.rst | 10 +-
docs/migrating.rst | 19 +-
docs/third-party.rst | 52 +-
polymorphic/__init__.py | 5 +-
polymorphic/admin/__init__.py | 1 +
polymorphic/admin/childadmin.py | 3 -
polymorphic/admin/generic.py | 8 +-
polymorphic/admin/inlines.py | 9 +-
polymorphic/admin/parentadmin.py | 2 -
polymorphic/contrib/extra_views.py | 126 +++++
polymorphic/formsets/__init__.py | 17 -
polymorphic/formsets/generic.py | 19 +-
polymorphic/formsets/models.py | 14 +-
polymorphic/formsets/utils.py | 1 +
polymorphic/manager.py | 2 +-
polymorphic/managers.py | 10 +-
polymorphic/models.py | 62 +--
polymorphic/query.py | 36 +-
polymorphic/query_translate.py | 8 +-
polymorphic/showfields.py | 2 +-
polymorphic/templatetags/__init__.py | 77 +++
.../templatetags/polymorphic_formset_tags.py | 79 +++
polymorphic/tests/__init__.py | 418 ++++++++++++++++
polymorphic/tests/test_admin.py | 31 ++
polymorphic/tests/test_multidb.py | 106 ++++
polymorphic/{tests.py => tests/test_orm.py} | 554 +--------------------
polymorphic/tests/test_regression.py | 24 +
polymorphic/utils.py | 29 ++
setup.cfg | 4 +
49 files changed, 1391 insertions(+), 694 deletions(-)
diff --cc debian/.git-dpm
index 97c2f26,0000000..b898f51
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
- 4a90ce165efb82deb0dc6517fe6165016f86f7d9
- 4a90ce165efb82deb0dc6517fe6165016f86f7d9
- 698c35df35f1bc7e3123674abf62a67f3e6ea81c
++bb7145f73c6a96f3861cfc01224ca6ac4d616c91
++bb7145f73c6a96f3861cfc01224ca6ac4d616c91
++9e36e07a53bb6f3d100cc5f51f162d36da9aa918
+9e36e07a53bb6f3d100cc5f51f162d36da9aa918
+django-polymorphic_1.1.orig.tar.gz
+6abe4a9df5041bea9e67211f988c0b4615f9d983
+96348
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-local-objects.inv-where-possible.patch
index eca811e,0000000..185417d
mode 100644,000000..100644
--- a/debian/patches/0001-use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-use-local-objects.inv-where-possible.patch
@@@ -1,39 -1,0 +1,44 @@@
- From 4a90ce165efb82deb0dc6517fe6165016f86f7d9 Mon Sep 17 00:00:00 2001
++From bb7145f73c6a96f3861cfc01224ca6ac4d616c91 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Sun, 21 Aug 2016 13:17:22 +0200
+Subject: use local objects.inv where possible
+
+Upstream uses intersphinx mappings that fetch the objects.inv for python django
+through HTTP from a remote host. Using the local objects.inv from python and
+django enables the package to build without network connection.
+---
- docs/conf.py | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
++ docs/conf.py | 21 ++++++++++++++++-----
++ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index f14fa5f..e826275 100644
++index 8ae26d3..675e67a 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -249,8 +249,17 @@ texinfo_documents = [
++@@ -257,11 +257,22 @@ texinfo_documents = [
+ #texinfo_show_urls = 'footnote'
+
+
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+- #'http://docs.python.org/': None,
- - 'https://docs.djangoproject.com/en/dev': 'https://docs.djangoproject.com/en/dev/_objects',
++- 'https://docs.djangoproject.com/en/stable': 'https://docs.djangoproject.com/en/stable/_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/dev',
- + '/usr/share/doc/python-django-doc/html/objects.inv'))
+++intersphinx_mapping.update(
+++ check_object_path(
+++ 'django',
+++ 'https://docs.djangoproject.com/en/{v}'.format(
+++ v='.'.join(map(str, django.vERSION[:2]))
+++ ),
+++ '/usr/share/doc/python-django-doc/html/objects.inv'
+++ )
+++)
++
++ # autodoc settings
++ autodoc_member_order = 'groupwise'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-polymorphic.git
More information about the Python-modules-commits
mailing list