innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
17,523 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

251 Commits

Author SHA1 Message Date
Alasdair Nicol a800036981 Fixed #21287 -- Fixed E123 pep8 warnings 2013-10-18 10:07:39 +01:00
Alasdair Nicol bab9123daa Fixed #21268 -- Fixed E303 pep8 warnings 2013-10-18 01:46:24 +01:00
Alasdair Nicol eb214452c3 Fixed #21270 -- Fixed E701 pep8 warnings 2013-10-17 12:12:40 +01:00
Larry O'Neill 83b9bfea44 Fixed #21266 -- Fixed E201,E202 pep8 warnings. 2013-10-14 18:12:00 -04:00
Tim Graham b67ab75e82 Fixed assorted flake8 errors. 2013-10-11 07:25:14 -04:00
Tim Graham 1dae4ac177 Whitespace cleanup. 
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
 2013-10-10 16:49:20 -04:00
Claude Paroz 18fb713e7b Properly marked skipped GIS tests as skipped 2013-09-24 12:23:42 +02:00
Claude Paroz 45403d330a Reformatted some GIS distance tests 2013-09-24 12:23:42 +02:00
Claude Paroz c82f6c2227 Add a test for the geo-enabled inspectdb command 2013-09-12 10:30:45 +02:00
Alex Gaynor 96fd5557f9 Removed a ton of unused local vars 2013-09-08 08:05:16 -07:00
Tim Graham 5649c0af9d Fixed "indentation is not a multiple of four" pep8 issues. 2013-09-03 14:22:21 -04:00
Claude Paroz dd656073ad Fixed #21003 -- Ensured geometry widget return value has SRID 
Thanks Mathieu Leplatre for the report and initial patch.
 2013-09-03 13:53:35 +02:00
Claude Paroz b6889c68d7 Prevented rendering attrs to be squashed in OSMWidget 2013-09-03 10:02:55 +02:00
Claude Paroz 6ecbac21a9 Fixed syntax error in OSMWidget 2013-09-03 09:05:01 +02:00
Claude Paroz 973502c047 Fixed gis test to run on non gis-enabled settings 
Refs #20998.
 2013-09-02 14:15:04 +02:00
Claude Paroz 102f26c929 Fixed #20998 -- Allow custom (de)serialization for GIS widgets 
Thanks Mathieu Leplatre for the report and the initial patch.
 2013-09-02 13:32:00 +02:00
Simon Charette 11cd7388f7 Fixed #20989 -- Removed useless explicit list comprehensions. 2013-08-30 10:57:51 -04:00
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
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
Harm Geerts fd0d486467 Fixed #20838 -- Fixed Geodjango spatialrefsys test failure with postgis-2.0.3 2013-08-02 09:26:53 -04:00
Andrew Godwin 12e9804d16 Rename allow_syncdb to allow_migrate 2013-07-30 12:08:59 +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 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 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
Claude Paroz 4367c637d6 Tweaked proj string regex in gis tests 2013-07-06 14:26:28 +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
Aymeric Augustin ffcf24c9ce Removed several unused imports. 2013-06-19 17:18:40 +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
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
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
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
Claude Paroz 18e990fa96 Fixed #16110 -- Fixed GeometryField odd behaviour regarding null values 
Thanks slinkp for the report and the initial patch.
 2013-03-15 21:45:33 +01:00
Claude Paroz 5e80571bf9 Fixed #16594 -- Added wkt 3D support for GEOS geometries 
This requires GEOS >= 3.3.0 to function properly. On previous
versions, the Z dimension will simply not appear in the wkt.
Disabled OpenLayers editing for 3D geometries (unsupported).
 2013-03-09 12:02:22 +01:00
Claude Paroz 8a92139d8a Replaced proj4 testing by a regex 2013-03-08 22:52:41 +01:00
Ramiro Morales 3bbcec0aba Removed mentions of regressiontests. 2013-03-03 17:03:11 -03:00
Aymeric Augustin e74e207cce Fixed #17260 -- Added time zone aware aggregation and lookups. 
Thanks Carl Meyer for the review.

Squashed commit of the following:

commit 4f290bdb60
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Wed Feb 13 21:21:30 2013 +0100

    Used '0:00' instead of 'UTC' which doesn't always exist in Oracle.

    Thanks Ian Kelly for the suggestion.

commit 01b6366f3c
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Wed Feb 13 13:38:43 2013 +0100

    Made tzname a parameter of datetime_extract/trunc_sql.

    This is required to work around a bug in Oracle.

commit 924a144ef8
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Wed Feb 13 14:47:44 2013 +0100

    Added support for parameters in SELECT clauses.

commit b4351d2890
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Mon Feb 11 22:30:22 2013 +0100

    Documented backwards incompatibilities in the two previous commits.

commit 91ef84713c
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Mon Feb 11 09:42:31 2013 +0100

    Used QuerySet.datetimes for the admin's date_hierarchy.

commit 0d0de288a5
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Mon Feb 11 09:29:38 2013 +0100

    Used QuerySet.datetimes in date-based generic views.

commit 9c0859ff7c
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:43:25 2013 +0100

    Implemented QuerySet.datetimes on Oracle.

commit 68ab511a4f
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:43:14 2013 +0100

    Implemented QuerySet.datetimes on MySQL.

commit 22d52681d3
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:42:29 2013 +0100

    Implemented QuerySet.datetimes on SQLite.

commit f6800fd04c
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:43:03 2013 +0100

    Implemented QuerySet.datetimes on PostgreSQL.

commit 0c829c23f4
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:41:08 2013 +0100

    Added datetime-handling infrastructure in the ORM layers.

commit 104d82a777
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Mon Feb 11 10:05:55 2013 +0100

    Updated null_queries tests to avoid clashing with the __second lookup.

commit c01bbb3235
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 23:07:41 2013 +0100

    Updated tests of .dates().

    Replaced .dates() by .datetimes() for DateTimeFields.
    Replaced dates with datetimes in the expected output for DateFields.

commit 50fb7a5246
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 21:40:09 2013 +0100

    Updated and added tests for QuerySet.datetimes.

commit a8451a5004
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 22:34:46 2013 +0100

    Documented the new time lookups and updated the date lookups.

commit 29413eab2b
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Feb 10 16:15:49 2013 +0100

    Documented QuerySet.datetimes and updated QuerySet.dates.
 2013-02-16 09:19:04 +01:00
Claude Paroz a1c470a6f6 Lowered field ordering requirement in ogrinspect test 
This test was randomly failing depending on the library environment.
 2013-02-02 14:01:24 +01:00
Claude Paroz 8eb84081ad Set bigger maxDiff for ogrinspect tests 2013-02-01 09:34:39 +01:00
Claude Paroz ebb504db69 Moved has_changed logic from widget to form field 
Refs #16612. Thanks Aymeric Augustin for the suggestion.
 2013-01-25 20:50:46 +01:00
Claude Paroz 84ea85fb90 Updated comment about PostGIS bug 2035 
PostGIS 2.0.2 has been released on December 3rd 2012, with the
fix included.
 2013-01-03 17:37:44 +01:00
Aymeric Augustin f27a4ee327 Removed django.contrib.localflavor. 
Each localflavor lives on as a separate app.
 2012-12-29 21:59:06 +01:00
Claude Paroz 0907d3c6f5 Fixed #16408 -- Re-fixed value conversion with Spatialite backend 2012-12-26 12:45:41 +01:00
Claude Paroz c91667338a Fixed #19357 -- Allow non-ASCII chars in filesystem paths 
Thanks kujiu for the report and Aymeric Augustin for the review.
 2012-12-08 11:13:52 +01:00
Anssi Kääriäinen b55de81b9e Ensured gis tests aren't run on non-gis Oracle 2012-10-27 18:34:47 +03:00
Brian Galey 95f7ea3af1 Fixed #19028 -- Support GeoJSON output with SpatiaLite 3.0+ 2012-10-12 17:23:22 +02:00
Justin Bronn f578ee32fa Mark the test for left/right lookup types as a known failure on PostGIS 2.0. 2012-10-09 17:20:51 -07:00
Claude Paroz 9a2bceed1a Use smarter string decoding in GeoDjango 
The first try to solve the Python 3 GIS encoding/decoding issue
was too naive. Using decode() on all read strings is bound to fail
as soon as a non-ascii string is concerned.
This patch is a little more clever, leaving ascii decoding when
plain ascii strings are expected, and allowing to specify a custom
encoding in DataSource hierarchy.
 2012-10-08 18:24:42 +02:00
Justin Bronn 75301d99d3 Fixed `inspectapp` tests to work with improved PG driver in GDAL 1.9+. 2012-10-07 20:08:31 -07:00
Claude Paroz 8a2216648f Un-gzipped test geometries fixture as plain json 
This is easier to track changes through the VCS.
 2012-10-06 14:40:00 +02:00
Justin Bronn 84f9741664 Fixed GMLv3 output test failure on PostGIS versions < 1.5. 2012-10-05 16:08:16 -07:00
Justin Bronn 5a64bd38e6 Forgot to import `unittest` from `django.utils`. 2012-10-05 15:51:45 -07:00
Justin Bronn 1c010ce41d Skip `LayerMapRouterTest` if there are not multiple databases. 2012-10-05 15:26:33 -07:00
Justin Bronn c1b06c8137 Lowered tolerance to fix failing distance test. 2012-10-05 14:55:15 -07:00
Justin Bronn db78086b45 Added comment in `geoapp` tests about PostGIS 2.0 change in ST_NumGeometries. 2012-10-05 14:47:04 -07:00
Claude Paroz d25a599dca Fixed #19063 -- Fixed version parameter of gml GeoQuerySet method 
Thanks lmisek@go2.pl for the report.
 2012-10-03 13:32:26 +02:00
Flavio Curella 92b5341b19 Fixed #16455 -- Added support for PostGIS 2.0 
Thanks ckarrie for the report and the initial patches, Flavio Curella
for updating the patch, and Anssi Kääriäinen for testing. See ticket
for other valuable contributors.
 2012-09-30 22:49:41 +02:00
Claude Paroz ffdd6595ea Fixed #18919 -- Stopped dropping Z attribute when transforming geometries 
Previously, the wkb of geometries was dropping the Z attribute.
Thanks luizvital for the report and tests and georger.silva@gmail.com
for the tests.
 2012-09-29 12:33:18 +02:00
Claude Paroz 43c7f8c3a3 [py3] Fixed unicode string in geoapp test 2012-09-23 22:11:46 +02:00
Brian Galey 0ab8c58ca8 Fixed #18968 -- Only use separate GML regex for SpatiaLite < 3.0 2012-09-22 15:10:42 +02:00
Claude Paroz 59afc18f37 Made geo3d tests independent from each other 2012-09-22 11:39:53 +02:00
Claude Paroz 7e32dab3a6 Fixed #17687 -- Made LayerMapping router-aware 
Thanks nosamanuel@gmail.com for the report and the initial patch.
 2012-09-20 10:12:47 +02:00
Claude Paroz 65793d714c Used ST_AsText for testing PostGIS raw query 
AsText will not be supported in further versions of PostGIS (>=2).
 2012-09-15 12:02:28 +02:00
Claude Paroz 7e5ebcce53 Fixed #18795 -- Fixed failing GeoDjango tests 
Proj.4 and SRS strings may slightly vary depending on the installed
libraries. Made some tests pass again with recent Proj.4/GDAL lib
versions.
 2012-09-13 16:20:11 +02:00
Claude Paroz 62e1c5a441 Fixed #17448 -- Improved test and documented raw-sql gis query 2012-08-25 14:39:52 +02:00
Claude Paroz d7a2e816a1 Added a GeoDjango test with a raw query (Refs #17448) 
Thanks David Eklund for the initial patch.
 2012-08-25 11:12:43 +02:00
Aymeric Augustin d4a0b27838 [py3] Refactored __unicode__ to __str__. 
* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2
 2012-08-12 14:44:40 +02:00
Claude Paroz c5d6f6d682 Reorganized geoapp gis tests 
Removed the numbering of tests and moved lookup/geoqueryset tests
in their own test class.
 2012-08-03 10:53:30 +02:00
Aymeric Augustin bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Claude Paroz 35ddeee455 Removed debugging line left in previous commit 2012-07-15 21:19:23 +02:00
Claude Paroz cdcdd131da Dropped support for GDAL < 1.5 
GDAL 1.5 has been released in December 2007.
 2012-07-15 21:10:32 +02:00
Claude Paroz 41eb70f762 Fixed #15271 -- Defined a to_python method for GeometryField 
Thanks volrath and copelco for their work on the patch.
 2012-06-19 14:55:40 +02:00
Florian Apolloner ac1b9ae630 Fixed GIS testsuite. 
Moved HAS_SPATIALREFSYS back into the tests namespace since it only operates
on the default database and isn't a global flag like HAS_GDAL.
 2012-06-17 11:39:02 +02:00
Julien Phalip 1794e36fa1 Skip GeometryFieldTest if there's no spacial database. 2012-06-16 13:57:33 -07:00
Claude Paroz 023b70415b Executed SpatialRefSysTest only with spatial backend 2012-06-14 21:44:08 +02:00
Claude Paroz 88601bad84 Discovered some geodjango tests with standard mechanism 
No need to special case tests discovery for regular first-level
gis tests.
 2012-06-14 21:10:30 +02:00
Claude Paroz 4d46106f8c Fixed #17754 -- Refactored gis.measure 
This refactoring does allow much easier MeasureBase subclassing.
Many thanks to Ricardo di Virgilio for the initial patch.
 2012-06-14 15:32:42 +02:00
Claude Paroz 4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility. 
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
 2012-06-07 18:08:47 +02:00
Claude Paroz 9c096ab981 Fixed #17328 -- Added OpenLayersWidget _has_changed method 
Thanks Will Hardy for the report and the patch.
 2012-06-06 10:42:14 +02:00
Claude Paroz c2139bbcef Updated WMS URL in geoadmin test. 2012-05-26 00:02:15 +02:00
Claude Paroz ce8f874b88 Fixed #14886 -- Added wms_options dict to GeoModelAdmin. 
It is now possible to set WMS options by overriding wms_options
in a subclass of GeoModelAdmin.
Thanks slinkp for the report and the initial patch.
 2012-05-25 21:00:44 +02:00
Claude Paroz f4abba5200 Fixed #18367 -- Allowed LayerMapping to store strings in TextField. 
Thanks geoffhing@gmail.com for the report.
 2012-05-24 09:57:22 +02:00
Claude Paroz f1ebcdc7c2 Modernized contrib.gis layermapping tests. 
In particular, make tests independent of each other.
 2012-05-24 09:52:06 +02:00
Claude Paroz d7dfab59ea Replaced cStringIO.StringIO by io.BytesIO. 
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
 2012-05-05 21:41:44 +02:00
Claude Paroz b52672d778 Replaced deprecated TestCase methods. Refs #17049. 2012-05-03 16:39:16 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Ramiro Morales 7d5979f953 Removed broken function-based custom test runner in GeoDjango 
We forgot to delete it during the 1.4 development cycle.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-01 21:03:50 +00:00
Ramiro Morales ecc8208f88 Removed executable bits from some files that don't need them. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-09 12:13:31 +00:00
Carl Meyer b9bf7cce89 Fixed #15169 -- Added conversion of 0/1 to False/True for MySQL GIS backend. Thanks zmsmith for report, and Ramiro for draft patch and review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 22:32:22 +00:00
Adrian Holovaty 2ade1e916f Edited stuff from [17543] to [17629] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 17:16:52 +00:00