[Python-modules-commits] [django-polymorphic] 06/14: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Sun Sep 4 07:30:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-polymorphic.
commit df831dc62477d979ed970d85136f885d6c4dc74d
Merge: 73c370a 1b07f0f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sat Sep 3 21:57:03 2016 +0200
merge patched into master
.travis.yml | 67 ++--
MANIFEST.in | 3 +-
README.rst | 27 +-
debian/.git-dpm | 6 +-
...parate-test-configuration-for-Django-1.10.patch | 124 -------
...001-use-local-objects.inv-where-possible.patch} | 4 +-
debian/patches/series | 3 +-
docs/admin.rst | 232 ++++++++++---
docs/changelog.rst | 32 +-
docs/conf.py | 4 +-
docs/contributing.rst | 2 +-
docs/formsets.rst | 44 +++
docs/index.rst | 19 +-
docs/third-party.rst | 30 +-
example/example/settings.py | 1 +
example/orders/__init__.py | 0
example/orders/admin.py | 43 +++
example/orders/migrations/0001_initial.py | 88 +++++
example/orders/migrations/__init__.py | 0
example/orders/models.py | 78 +++++
example/pexp/admin.py | 74 ++---
example/pexp/management/commands/p2cmd.py | 58 ++--
example/pexp/management/commands/pcmd.py | 19 +-
example/pexp/management/commands/polybench.py | 7 +-
.../commands/polymorphic_create_test_data.py | 14 -
example/pexp/migrations/0001_initial.py | 124 +++----
example/pexp/migrations/0002_modelc_field4.py | 20 --
example/pexp/models.py | 69 ++--
polymorphic/__init__.py | 2 +-
polymorphic/admin/__init__.py | 46 +++
polymorphic/admin/childadmin.py | 194 +++++++++++
polymorphic/admin/filters.py | 35 ++
polymorphic/admin/forms.py | 18 +
polymorphic/admin/generic.py | 61 ++++
polymorphic/admin/helpers.py | 139 ++++++++
polymorphic/admin/inlines.py | 248 ++++++++++++++
polymorphic/{admin.py => admin/parentadmin.py} | 267 +++------------
polymorphic/base.py | 180 +++++-----
polymorphic/formsets/__init__.py | 53 +++
polymorphic/formsets/generic.py | 112 +++++++
polymorphic/formsets/models.py | 369 +++++++++++++++++++++
polymorphic/formsets/utils.py | 10 +
polymorphic/managers.py | 16 +-
polymorphic/models.py | 16 +-
polymorphic/query.py | 16 +-
polymorphic/query_translate.py | 37 ++-
polymorphic/showfields.py | 28 +-
.../static/polymorphic/css/polymorphic_inlines.css | 32 ++
.../static/polymorphic/js/polymorphic_inlines.js | 334 +++++++++++++++++++
.../admin/polymorphic/edit_inline/stacked.html | 36 ++
polymorphic/tests.py | 238 ++++++++++---
runtests.py | 116 +++----
setup.py | 14 +-
tox.ini | 7 +-
54 files changed, 2848 insertions(+), 968 deletions(-)
diff --cc debian/.git-dpm
index ddc9ed2,0000000..52ed8af
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
- 68a6eb676bede0455fbbe4ca52af99bb4b5efade
- 68a6eb676bede0455fbbe4ca52af99bb4b5efade
- d95b26a48a4bb5c234781c000b2ef40933f5e20c
++1b07f0f4b36dc5d50b6cd285bfd302a06d42db06
++1b07f0f4b36dc5d50b6cd285bfd302a06d42db06
++93943378499436b2ade3fde81454ae4a38490adb
+93943378499436b2ade3fde81454ae4a38490adb
+django-polymorphic_1.0.orig.tar.gz
+8790a24dd9e0d1fc65297cb3b4cf4083a44e5b9f
+89410
+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 43123fd,0000000..e6d4070
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,39 @@@
- From 68a6eb676bede0455fbbe4ca52af99bb4b5efade Mon Sep 17 00:00:00 2001
++From 1b07f0f4b36dc5d50b6cd285bfd302a06d42db06 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(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 7f84262..901f846 100644
++index 6bada59..a5bb377 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -249,8 +249,17 @@ 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',
+-}
++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'))
diff --cc debian/patches/series
index 517e7f0,0000000..7f0b5b6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Add-separate-test-configuration-for-Django-1.10.patch
- 0002-use-local-objects.inv-where-possible.patch
++0001-use-local-objects.inv-where-possible.patch
--
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