[Python-modules-commits] [python-django] 06/09: merge debian/patched-experimental into debian/experimental
Raphaël Hertzog
hertzog at moszumanska.debian.org
Tue Oct 13 10:20:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
hertzog pushed a commit to branch debian/experimental
in repository python-django.
commit 9c43cbf587fbf3bf067dae6785bd3a8291b51c2f
Merge: 6a82196 8ab2975
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Tue Oct 13 11:36:30 2015 +0200
merge debian/patched-experimental into debian/experimental
AUTHORS | 1 +
Django.egg-info/PKG-INFO | 2 +-
Django.egg-info/SOURCES.txt | 1 +
Django.egg-info/requires.txt | 3 +-
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../patches/02_disable-sources-in-sphinxdoc.diff | 2 +-
.../06_use_debian_geoip_database_as_default.diff | 2 +-
django/__init__.py | 2 +-
django/contrib/admin/tests.py | 7 +
django/contrib/admin/utils.py | 7 +-
django/contrib/gis/maps/google/overlays.py | 10 +-
django/core/cache/backends/base.py | 2 +-
django/core/management/__init__.py | 19 ++-
django/core/management/base.py | 1 +
django/core/management/commands/runserver.py | 4 +
django/core/urlresolvers.py | 5 +-
django/db/backends/base/creation.py | 2 +-
django/db/backends/mysql/schema.py | 3 +-
django/db/backends/oracle/creation.py | 52 ++++---
django/db/backends/sqlite3/introspection.py | 5 +-
django/db/migrations/questioner.py | 4 +-
django/db/migrations/state.py | 2 +-
django/db/migrations/writer.py | 2 +-
django/db/models/aggregates.py | 4 +-
django/db/models/expressions.py | 8 ++
django/db/models/fields/related.py | 12 +-
django/db/models/query.py | 4 +-
django/db/models/sql/compiler.py | 2 +-
django/db/models/sql/query.py | 3 +-
django/db/transaction.py | 7 -
django/forms/models.py | 14 +-
django/forms/utils.py | 2 +-
django/utils/autoreload.py | 23 ++-
django/utils/functional.py | 56 ++++----
django/utils/ipv6.py | 2 +-
django/utils/translation/__init__.py | 4 +-
docs/howto/custom-template-tags.txt | 8 +-
docs/howto/deployment/wsgi/modwsgi.txt | 6 +-
docs/howto/static-files/index.txt | 6 +-
.../contributing/writing-code/unit-tests.txt | 6 +-
docs/internals/deprecation.txt | 11 +-
docs/internals/team.txt | 4 +-
docs/intro/tutorial01.txt | 13 +-
docs/ref/applications.txt | 15 +-
docs/ref/class-based-views/generic-date-based.txt | 26 ++--
docs/ref/class-based-views/index.txt | 2 +-
docs/ref/contrib/admin/index.txt | 7 +
docs/ref/contrib/contenttypes.txt | 47 +++---
docs/ref/contrib/gis/install/geolibs.txt | 2 +-
docs/ref/contrib/gis/install/index.txt | 26 +++-
docs/ref/contrib/gis/tutorial.txt | 4 +-
docs/ref/contrib/messages.txt | 2 +-
docs/ref/contrib/sites.txt | 2 +-
docs/ref/contrib/syndication.txt | 3 +-
docs/ref/csrf.txt | 6 +-
docs/ref/databases.txt | 32 +++--
docs/ref/django-admin.txt | 11 +-
docs/ref/migration-operations.txt | 32 ++++-
docs/ref/models/querysets.txt | 10 +-
docs/ref/request-response.txt | 8 +-
docs/ref/settings.txt | 27 +++-
docs/ref/templates/api.txt | 7 +
docs/ref/templates/builtins.txt | 25 ++--
docs/ref/unicode.txt | 6 +
docs/ref/utils.txt | 2 +-
docs/releases/1.8.5.txt | 60 ++++++++
docs/releases/1.8.txt | 11 +-
docs/releases/index.txt | 1 +
docs/spelling_wordlist | 5 +
docs/topics/auth/default.txt | 4 +-
docs/topics/class-based-views/generic-display.txt | 2 +-
docs/topics/class-based-views/index.txt | 2 +-
docs/topics/class-based-views/intro.txt | 4 +-
docs/topics/class-based-views/mixins.txt | 5 +-
docs/topics/db/aggregation.txt | 4 +-
docs/topics/db/examples/one_to_one.txt | 2 +-
docs/topics/db/models.txt | 8 +-
docs/topics/db/sql.txt | 42 ++++--
docs/topics/db/transactions.txt | 14 +-
docs/topics/forms/index.txt | 3 +
docs/topics/http/urls.txt | 2 +-
docs/topics/i18n/translation.txt | 5 +-
docs/topics/install.txt | 149 +++----------------
docs/topics/logging.txt | 4 +-
docs/topics/security.txt | 15 +-
docs/topics/settings.txt | 4 +-
docs/topics/testing/advanced.txt | 47 +++---
docs/topics/testing/overview.txt | 26 ++--
docs/topics/testing/tools.txt | 19 ++-
setup.cfg | 2 +-
tests/admin_views/admin.py | 6 +-
tests/admin_views/tests.py | 20 ++-
tests/admin_widgets/tests.py | 21 ++-
tests/aggregation/tests.py | 6 +
tests/aggregation_regress/tests.py | 2 +-
tests/custom_managers/tests.py | 4 +
tests/expressions/tests.py | 1 +
tests/i18n/tests.py | 3 +
tests/m2m_regress/models.py | 11 ++
tests/m2m_regress/tests.py | 13 +-
tests/migrations/test_autodetector.py | 12 +-
tests/migrations/test_state.py | 7 +
tests/model_formsets/models.py | 4 +
tests/model_meta/results.py | 20 +--
tests/model_meta/tests.py | 2 +-
tests/one_to_one/models.py | 2 +-
tests/one_to_one/tests.py | 20 ++-
tests/queries/models.py | 1 +
tests/queries/tests.py | 30 +++-
tests/requirements/mysql.txt | 3 +-
tests/requirements/py2.txt | 3 +-
tests/schema/tests.py | 12 ++
tests/test_runner/test_debug_sql.py | 24 ++--
tests/transactions/tests.py | 17 ++-
tests/utils_tests/models.py | 4 +
tests/utils_tests/test_autoreload.py | 157 ++++++++++++++++-----
tests/utils_tests/test_lazyobject.py | 92 ++++++++++++
tests/validators/valid_urls.txt | 2 +-
119 files changed, 1021 insertions(+), 561 deletions(-)
diff --cc debian/.git-dpm
index 8ed666b,0000000..ad44ee9
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
- 72af8e33f60c7194b60008a7615d267a57973ab9
- 72af8e33f60c7194b60008a7615d267a57973ab9
- 44d7cd6d064c7a4c6bb1a35f6af33923f603305e
++8ab29752b004d5deeb0a8a1fce27f07894e41d73
++8ab29752b004d5deeb0a8a1fce27f07894e41d73
++498fc878694353cf7bde7baed7ce6e04311ade66
+498fc878694353cf7bde7baed7ce6e04311ade66
+python-django_1.8.5.orig.tar.gz
+86a0d2ab3c1a78b7d631aedbd97b2716aec493e8
+7270297
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/02_disable-sources-in-sphinxdoc.diff
index bd95745,0000000..661a965
mode 100644,000000..100644
--- a/debian/patches/02_disable-sources-in-sphinxdoc.diff
+++ b/debian/patches/02_disable-sources-in-sphinxdoc.diff
@@@ -1,33 -1,0 +1,33 @@@
- From 6e6c97dc9122b7f6a881d01a3e2ac521b8ef3e0d Mon Sep 17 00:00:00 2001
++From 3928fb453cb5bcc019500a486895ce0d215173da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog at debian.org>
+Date: Sun, 11 Oct 2015 11:43:19 +1100
+Subject: Disable creation of _sources directory by Sphinx
+
+ We do this to save some space as the sources of the documentation
+ are not really useful in a binary package.
+ .
+ This is a Debian specific patch.
+Forwarded: not-needed
+Origin: vendor
+
+Patch-Name: 02_disable-sources-in-sphinxdoc.diff
+---
+ docs/conf.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 03bf668..609357a 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -202,7 +202,10 @@ html_additional_pages = {}
+ # html_split_index = False
+
+ # If true, links to the reST sources are added to the pages.
+-# html_show_sourcelink = True
++html_show_sourcelink = False
++
++# Do not ship a copy of the sources
++html_copy_source = False
+
+ # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+ # html_show_sphinx = True
diff --cc debian/patches/06_use_debian_geoip_database_as_default.diff
index cdb447b,0000000..aac4877
mode 100644,000000..100644
--- a/debian/patches/06_use_debian_geoip_database_as_default.diff
+++ b/debian/patches/06_use_debian_geoip_database_as_default.diff
@@@ -1,69 -1,0 +1,69 @@@
- From 72af8e33f60c7194b60008a7615d267a57973ab9 Mon Sep 17 00:00:00 2001
++From 8ab29752b004d5deeb0a8a1fce27f07894e41d73 Mon Sep 17 00:00:00 2001
+From: Tapio Rantala <tapio.rantala at iki.fi>
+Date: Sun, 11 Oct 2015 11:43:20 +1100
+Subject: Use Debian GeoIP database path as default
+
+ Default to Debian standard path for GeoIP directory and for GeoIP city
+ file. Avoids the need to declare them in each project.
+ .
+ This is a Debian specific patch.
+Bug-Debian: http://bugs.debian.org/645094
+Forwarded: not-needed
+
+Patch-Name: 06_use_debian_geoip_database_as_default.diff
+---
+ django/contrib/gis/geoip/base.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/django/contrib/gis/geoip/base.py b/django/contrib/gis/geoip/base.py
+index 0b160ff..0420bba 100644
+--- a/django/contrib/gis/geoip/base.py
++++ b/django/contrib/gis/geoip/base.py
+@@ -66,7 +66,8 @@ class GeoIP(object):
+ * path: Base directory to where GeoIP data is located or the full path
+ to where the city or country data files (*.dat) are located.
+ Assumes that both the city and country data sets are located in
+- this directory; overrides the GEOIP_PATH settings attribute.
++ this directory. Overrides the GEOIP_PATH settings attribute.
++ If neither is set, defaults to '/usr/share/GeoIP'.
+
+ * cache: The cache settings when opening up the GeoIP datasets,
+ and may be an integer in (0, 1, 2, 4, 8) corresponding to
+@@ -75,11 +76,13 @@ class GeoIP(object):
+ settings, respectively. Defaults to 0, meaning that the data is read
+ from the disk.
+
+- * country: The name of the GeoIP country data file. Defaults to
+- 'GeoIP.dat'; overrides the GEOIP_COUNTRY settings attribute.
++ * country: The name of the GeoIP country data file. Overrides
++ the GEOIP_COUNTRY settings attribute. If neither is set,
++ defaults to 'GeoIP.dat'
+
+- * city: The name of the GeoIP city data file. Defaults to
+- 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute.
++ * city: The name of the GeoIP city data file. Overrides the
++ GEOIP_CITY settings attribute. If neither is set, defaults
++ to 'GeoIPCity.dat'.
+ """
+ # Checking the given cache option.
+ if cache in self.cache_options:
+@@ -89,9 +92,7 @@ class GeoIP(object):
+
+ # Getting the GeoIP data path.
+ if not path:
+- path = GEOIP_SETTINGS.get('GEOIP_PATH', None)
+- if not path:
+- raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
++ path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
+ if not isinstance(path, six.string_types):
+ raise TypeError('Invalid path type: %s' % type(path).__name__)
+
+@@ -104,7 +105,7 @@ class GeoIP(object):
+ self._country = GeoIP_open(force_bytes(country_db), cache)
+ self._country_file = country_db
+
+- city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
++ city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoIPCity.dat'))
+ if os.path.isfile(city_db):
+ self._city = GeoIP_open(force_bytes(city_db), cache)
+ self._city_file = city_db
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git
More information about the Python-modules-commits
mailing list