[Python-modules-commits] [python-django] 05/06: merge debian/patched-master into debian/master
Raphaël Hertzog
hertzog at moszumanska.debian.org
Sun Nov 15 19:20:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
hertzog pushed a commit to branch debian/master
in repository python-django.
commit f6eee0ac10badb7a83a3e115a4362aa1e282b7a3
Merge: cf329fa 83cc996
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Sun Nov 15 18:28:50 2015 +0100
merge debian/patched-master into debian/master
AUTHORS | 1 +
Django.egg-info/PKG-INFO | 2 +-
Django.egg-info/SOURCES.txt | 2 +
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/options.py | 4 +-
django/contrib/admindocs/views.py | 3 +-
.../contrib/gis/db/backends/postgis/operations.py | 2 +-
.../contrib/gis/management/commands/ogrinspect.py | 4 +-
django/contrib/postgres/forms/array.py | 2 +-
django/core/files/storage.py | 5 +-
django/core/management/__init__.py | 11 +--
django/core/validators.py | 2 +-
django/db/backends/sqlite3/creation.py | 8 ++-
django/db/migrations/loader.py | 6 ++
django/db/migrations/writer.py | 13 ++--
django/db/models/expressions.py | 11 +++
django/db/models/fields/files.py | 5 +-
django/db/models/fields/related.py | 7 +-
django/db/models/functions.py | 19 ++---
django/db/models/lookups.py | 2 +-
django/db/models/query_utils.py | 9 +--
django/db/utils.py | 13 +++-
django/dispatch/dispatcher.py | 18 +----
django/forms/models.py | 6 +-
django/http/multipartparser.py | 15 ++--
django/template/base.py | 8 ++-
django/utils/deprecation.py | 2 +
django/utils/inspect.py | 81 ++++++++++++++++++++++
docs/faq/install.txt | 4 +-
docs/howto/custom-management-commands.txt | 3 +
docs/intro/tutorial05.txt | 4 +-
.../ref/class-based-views/mixins-single-object.txt | 26 +++++--
docs/ref/contrib/admin/admindocs.txt | 2 +-
docs/ref/contrib/admin/index.txt | 2 +-
docs/ref/contrib/contenttypes.txt | 14 ++--
docs/ref/contrib/gis/geoquerysets.txt | 6 +-
docs/ref/contrib/gis/geos.txt | 6 +-
docs/ref/contrib/gis/install/index.txt | 27 +-------
docs/ref/contrib/gis/install/spatialite.txt | 41 ++---------
docs/ref/contrib/gis/tutorial.txt | 4 +-
docs/ref/forms/validation.txt | 28 +++++---
docs/ref/models/querysets.txt | 11 ++-
docs/ref/request-response.txt | 64 +++++++++--------
docs/ref/settings.txt | 3 +-
docs/ref/templates/api.txt | 4 ++
docs/ref/templates/builtins.txt | 8 +++
docs/ref/templates/language.txt | 2 +
docs/releases/1.4.22.txt | 3 +-
docs/releases/1.7.10.txt | 3 +-
docs/releases/1.7.txt | 13 +++-
docs/releases/1.8.4.txt | 3 +-
docs/releases/1.8.6.txt | 53 ++++++++++++++
docs/releases/1.8.txt | 10 ++-
docs/releases/index.txt | 1 +
docs/topics/auth/default.txt | 2 +-
docs/topics/cache.txt | 9 +++
docs/topics/class-based-views/generic-display.txt | 5 ++
docs/topics/db/models.txt | 2 +-
docs/topics/forms/formsets.txt | 26 ++++---
docs/topics/forms/modelforms.txt | 20 +++---
docs/topics/performance.txt | 4 +-
docs/topics/testing/advanced.txt | 4 +-
docs/topics/testing/tools.txt | 40 +++++++++--
setup.cfg | 2 +-
tests/admin_filters/tests.py | 7 ++
tests/admin_views/admin.py | 27 ++++----
tests/admin_views/models.py | 11 +++
tests/admin_views/tests.py | 8 +++
tests/backends/tests.py | 24 +++++++
tests/db_functions/tests.py | 18 ++++-
tests/defer_regress/tests.py | 20 ++++++
tests/expressions/tests.py | 12 ++++
tests/gis_tests/geoapp/tests.py | 16 ++++-
tests/gis_tests/utils.py | 23 +++++-
tests/invalid_models_tests/test_relative_fields.py | 56 ++++++++-------
tests/mail/tests.py | 3 +
tests/many_to_many/models.py | 17 +++++
tests/many_to_many/tests.py | 27 +++++++-
tests/model_forms/tests.py | 23 ++++++
tests/model_meta/results.py | 20 +++---
tests/model_meta/tests.py | 2 +-
tests/postgres_tests/test_array.py | 5 ++
tests/runtests.py | 3 +
tests/schema/tests.py | 59 ++++++++--------
tests/validators/invalid_urls.txt | 1 +
89 files changed, 778 insertions(+), 338 deletions(-)
diff --cc debian/.git-dpm
index 739f12d,0000000..a45cc47
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
- 8ab29752b004d5deeb0a8a1fce27f07894e41d73
- 8ab29752b004d5deeb0a8a1fce27f07894e41d73
- 498fc878694353cf7bde7baed7ce6e04311ade66
++83cc99670b3286af2fce752a2dae943de42b183b
++83cc99670b3286af2fce752a2dae943de42b183b
++bf9d9d34e53599542047e5129c31ea22e7151902
+bf9d9d34e53599542047e5129c31ea22e7151902
+python-django_1.8.6.orig.tar.gz
+7deae445883823849f51e9553dcd885a7c6981b9
+7341303
+debianTag="debian/%e%v"
+patchedTag="debian/patches/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/02_disable-sources-in-sphinxdoc.diff
index 661a965,0000000..1797eaf
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 3928fb453cb5bcc019500a486895ce0d215173da Mon Sep 17 00:00:00 2001
++From 836389c5bf9ac0ac4b795f9ab1b7c72276a465bb 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 aac4877,0000000..f2b0164
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 8ab29752b004d5deeb0a8a1fce27f07894e41d73 Mon Sep 17 00:00:00 2001
++From 83cc99670b3286af2fce752a2dae943de42b183b 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