Andrew Godwin
b6a957f0ba
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
Anssi Kääriäinen
ddeb20e31b
Fixed GIS regression caused by force_subq
...
Caused by commit 7737305a4f
2013-08-19 16:35:11 +03:00
Harm Geerts
240886183b
Fixed #20829 -- Skip postgis metadata tables with introspection
2013-08-16 21:14:29 +02:00
Alasdair Nicol
22c6497f99
Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value
...
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.
2013-08-15 19:47:26 -04:00
Andrew Godwin
de64c4d6e9
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/core/management/commands/flush.py
django/core/management/commands/syncdb.py
django/db/models/loading.py
docs/internals/deprecation.txt
docs/ref/django-admin.txt
docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
Alex Gaynor
3e0eb2d788
Fixed a number of lint warnings, particularly around unused variables.
2013-08-04 09:17:10 -07:00
Harm Geerts
fd0d486467
Fixed #20838 -- Fixed Geodjango spatialrefsys test failure with postgis-2.0.3
2013-08-02 09:26:53 -04:00
Tai Lee
31e6d58d46
Fixed #20348 -- Consistently handle Promise objects in model fields.
...
All Promise objects were passed to force_text() deep in ORM query code.
Not only does this make it difficult or impossible for developers to
prevent or alter this behaviour, but it is also wrong for non-text
fields.
This commit changes `Field.get_prep_value()` from a no-op to one that
resolved Promise objects. All subclasses now call super() method first
to ensure that they have a real value to work with.
2013-07-31 15:54:17 +03:00
Andrew Godwin
12e9804d16
Rename allow_syncdb to allow_migrate
2013-07-30 12:08:59 +01:00
Andrew Godwin
68e0a169c4
Rename pre_ and post_syncdb to *_migrate, with aliases from old names
2013-07-30 11:52:52 +01:00
Claude Paroz
5c1143910e
Removed most of absolute_import imports
...
Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.
2013-07-29 20:28:13 +02:00
Claude Paroz
fdd7a355bf
Deprecated django.utils.importlib
...
This was a shim for pre-Python 2.7 support.
2013-07-29 17:10:22 +02:00
Julien Phalip
47c755327b
Fixed a number of minor misspellings.
2013-07-27 18:46:03 -07:00
Marc Tamlyn
29a09b3638
Merge pull request #1390 from garnertb/master
...
Fixed small grammatical error in docstring.
2013-07-22 07:34:30 -07:00
Tyler Garner
8e98652416
Fixed small grammatical error in docstring.
2013-07-22 10:32:09 -04:00
Claude Paroz
27c1a72576
Fixed #20773 -- [gis] Fixed regression in GoogleMap output
...
Thanks Martyn Clement for the report and the initial patch.
2013-07-22 09:55:45 +02:00
Claude Paroz
6157192b6e
Added a test for the envelope() GeoQuerySet method
...
Refs #20718 .
2013-07-09 20:37:01 +02:00
Claude Paroz
550b6195ed
Made an aggregate test pass with spatialite backend
...
backends.tests.SqliteAggregationTests was failing with spatialite.
2013-07-09 19:47:57 +02:00
Claude Paroz
bd563f0f57
Trusted test skipping about gis tests running or not
...
With the new test discovery system, gis tests are discovered as
other tests. They should be properly skipped now when dependencies
are missing. So let's stop special casing their inclusion.
2013-07-09 15:17:26 +02:00
Claude Paroz
74bc63b109
Isolate geoapp test from sitemaps app being installed or not
2013-07-09 15:14:11 +02:00
Claude Paroz
57815e2630
Partial revert of commit 2bf403ecbd
...
Homework: write 100 times geoapp is not geogapp.
2013-07-09 13:13:43 +02:00
Alex Gaynor
df3d7e66da
Replaced some dicts with sets.
2013-07-08 09:48:56 +10:00
Claude Paroz
c94093c5ba
[gis] Dropped official support for GDAL < 1.6
2013-07-06 17:25:46 +02:00
Claude Paroz
4367c637d6
Tweaked proj string regex in gis tests
2013-07-06 14:26:28 +02:00
Claude Paroz
7442eb1a24
Fixed #20224 -- Update docs examples which mention __unicode__
...
Thanks Marc Tamlyn and Tim Graham for the review.
2013-07-05 19:27:07 +02:00
Aymeric Augustin
e021b87c00
Fixed a few more imports of django.utils.unittest.
...
One import per line please! Refs #20680 .
2013-07-01 22:49:07 +02:00
Aymeric Augustin
cfcf4b3605
Stopped using django.utils.unittest in the test suite.
...
Refs #20680 .
2013-07-01 14:29:33 +02:00
Ramiro Morales
425a429208
Made GeoDjango GeometryField stop accepting a 'null' keyword argument as per its deprecation in 1.5.
2013-06-28 23:16:06 -03:00
Aymeric Augustin
ffcf24c9ce
Removed several unused imports.
2013-06-19 17:18:40 +02:00
Loic Bistuer
ee77d4b253
Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields
2013-06-18 08:01:17 -04:00
Claude Paroz
b14bd60404
Reimplemented PostGIS spatial_version with cached_property
2013-05-27 12:06:56 +02:00
Ramiro Morales
0fa8d43e74
Replaced `and...or...` constructs with PEP 308 conditional expressions.
2013-05-26 23:47:50 -03:00
Aymeric Augustin
9c487b5974
Replaced an antiquated pattern.
...
Thanks Lennart Regebro for pointing it out.
2013-05-17 18:08:58 +02:00
Claude Paroz
b16b72d415
Fixed #5472 --Added OpenLayers-based widgets in contrib.gis
...
Largely inspired from django-floppyforms. Designed to not depend
on OpenLayers at code level.
2013-05-17 13:33:40 +02:00
Claude Paroz
0a29057ebe
Fixed #20415 -- Ensured srid is not localized in openlayers template
...
Thanks pierremarc07 at gmail.com for the report.
2013-05-16 13:48:38 +02:00
Mike Fogel
3188775174
Fix bug introduced in contrib.gis in 74f3884ae0
2013-05-15 14:07:34 -07:00
Mike Fogel
74f3884ae0
Fixed #20413 - Respect Query.get_meta()
2013-05-15 12:55:30 -07:00
Florian Apolloner
ebfb71c64a
Fixed previous commit. (Don't commit from DjangCon!)
2013-05-15 16:50:33 +02:00
Florian Apolloner
f6d1ca56c9
Don't unregister OSMGeoAdmin, other tests rely on it.
2013-05-15 16:47:03 +02:00
Florian Apolloner
a6edde3260
Fixed embarrassing typo.
2013-05-11 22:57:01 +02:00
Florian Apolloner
01820466ca
Don't hardcode primary keys in gis tests.
2013-05-11 22:42:39 +02:00
Florian Apolloner
2bf403ecbd
Fixed a regression from e23a5f9a47
.
...
Excluded postgis specific gis tests from other spatial databases.
Refs #17365 , #17366 , #18727 .
2013-05-11 18:29:08 +02:00
Carl Meyer
9012833af8
Fixed #17365 , #17366 , #18727 -- Switched to discovery test runner.
...
Thanks to Preston Timmons for the bulk of the work on the patch, especially
updating Django's own test suite to comply with the requirements of the new
runner. Thanks also to Jannis Leidel and Mahdi Yusuf for earlier work on the
patch and the discovery runner.
Refs #11077 , #17032 , and #18670 .
2013-05-10 23:08:45 -04:00
Claude Paroz
7b00d90208
[py3] Made GeoIP tests pass with Python 3
2013-05-10 13:21:07 +02:00
Claude Paroz
465a29abe0
Fixed #20384 -- Forced GeoIP_open path argument to bytestring
...
Thanks Julian Wachholz for the report.
2013-05-10 13:21:07 +02:00
Aymeric Augustin
1906cb9360
Fixed conditional skipping of test for left/right lookup types.
...
connection.ops.spatial_version is None for some backends (eg. MySQL) and
the comparison fails on Python 3 with TypeError.
2013-05-09 17:39:56 +02:00
Alex Gaynor
a53d7a0a50
Made gis_terms be a set, rather than a dict with None for all keys.
2013-05-09 08:13:13 -07:00
Claude Paroz
9f7a01ef2b
Updated translation templates and removed en translations
...
"en" translations have been mistakenly committed in 87cc3da81
.
2013-05-02 16:25:23 +02:00
Claude Paroz
53df89c0fe
Updated get_ogr_db_string in inspectapp tests to support MySQL/Spatialite
...
The OGRInspectTest.test_time_field does still not succeed with these
databases (even when removing the postgis guard), but at least it's now
possible to setup a datasource.
2013-04-15 20:27:58 +02:00
Claude Paroz
1628dfd0b9
Properly used test skipping in OGRInspectTest TestCase
2013-04-15 19:38:24 +02:00