[Python-modules-commits] r34077 - in packages/djangorestframework-gis/tags (12 files)
fladi at users.alioth.debian.org
fladi at users.alioth.debian.org
Tue Sep 1 06:28:38 UTC 2015
Date: Tuesday, September 1, 2015 @ 06:28:37
Author: fladi
Revision: 34077
[svn-buildpackage] Tagging djangorestframework-gis 0.8-1
Added:
packages/djangorestframework-gis/tags/0.8-1/
packages/djangorestframework-gis/tags/0.8-1/debian/changelog
(from rev 34076, packages/djangorestframework-gis/trunk/debian/changelog)
packages/djangorestframework-gis/tags/0.8-1/debian/control
(from rev 34076, packages/djangorestframework-gis/trunk/debian/control)
packages/djangorestframework-gis/tags/0.8-1/debian/copyright
(from rev 34076, packages/djangorestframework-gis/trunk/debian/copyright)
packages/djangorestframework-gis/tags/0.8-1/debian/patches/series
(from rev 34075, packages/djangorestframework-gis/trunk/debian/patches/series)
packages/djangorestframework-gis/tags/0.8-1/debian/patches/skip_tests_spatialite.patch
(from rev 34075, packages/djangorestframework-gis/trunk/debian/patches/skip_tests_spatialite.patch)
packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch
(from rev 34074, packages/djangorestframework-gis/trunk/debian/patches/spatialite.patch)
Deleted:
packages/djangorestframework-gis/tags/0.8-1/debian/changelog
packages/djangorestframework-gis/tags/0.8-1/debian/control
packages/djangorestframework-gis/tags/0.8-1/debian/copyright
packages/djangorestframework-gis/tags/0.8-1/debian/patches/series
packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch
Deleted: packages/djangorestframework-gis/tags/0.8-1/debian/changelog
===================================================================
--- packages/djangorestframework-gis/trunk/debian/changelog 2015-08-17 13:47:10 UTC (rev 33822)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/changelog 2015-09-01 06:28:37 UTC (rev 34077)
@@ -1,5 +0,0 @@
-djangorestframework-gis (0.7-1) unstable; urgency=low
-
- * Initial release (Closes: #764969).
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 12 Oct 2014 18:46:46 +0200
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/changelog (from rev 34076, packages/djangorestframework-gis/trunk/debian/changelog)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/changelog (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/changelog 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,22 @@
+djangorestframework-gis (0.8-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update debian/patches/spatialite.patch to work with libsqlite3-mod-
+ spatialite (Closes: #793526).
+ * Add skip_tests_spatialite.patch to skip unittests that are not
+ supported by spatialite.
+ * Make Depends and Build-Depends on python-djangorestframework
+ versioned (>= 3.0.4).
+ * Add libsqlite3-mod-spatialite to Build-Depends.
+ * Remove spatialite-bin from Build-Depends.
+ * Update Homepage field to the correct upstream location.
+ * Update years in d/copyright.
+ * Change my email address to fladi at debian.org.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 01 Sep 2015 08:20:20 +0200
+
+djangorestframework-gis (0.7-1) unstable; urgency=low
+
+ * Initial release (Closes: #764969).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 12 Oct 2014 18:46:46 +0200
Deleted: packages/djangorestframework-gis/tags/0.8-1/debian/control
===================================================================
--- packages/djangorestframework-gis/trunk/debian/control 2015-08-17 13:47:10 UTC (rev 33822)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/control 2015-09-01 06:28:37 UTC (rev 34077)
@@ -1,42 +0,0 @@
-Source: djangorestframework-gis
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 9),
- dh-python,
- python-all,
- python-djangorestframework,
- python-django-filter,
- python-gdal,
- python-pyspatialite,
- python-pysqlite2,
- python-setuptools,
- spatialite-bin
-Standards-Version: 3.9.6
-X-Python-Version: >= 2.6
-Homepage: https://github.com/dmeehan/django-rest-framework-gis
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/djangorestframework-gis/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/djangorestframework-gis/trunk/
-
-Package: python-djangorestframework-gis
-Architecture: all
-Depends: python-djangorestframework,
- python-django-filter,
- ${misc:Depends},
- ${python:Depends}
-Description: Geographic add-ons for Django REST Framework
- djangorestframework-gis extends the Django REST Framework to also handle
- geographic data as used by GeoDjango during serialization and deserialization.
- It provides the following features:
- .
- * GeometryField: This field handles GeoDjango geometry fields, providing
- custom to_native and from_native methods for GeoJSON input/output.
- * GeoModelSerializer: This serializer updates the field_mapping dictionary to
- include field mapping of GeoDjango geometry fields to the above
- GeometryField.
- * GeoFeatureModelSerializer: GeoFeatureModelSerializer is a subclass of
- GeoModelSerializer which will output data in a format that is GeoJSON
- compatible.
- * InBBOXFilter: Filters a queryset to only those instances within a certain
- bounding box.
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/control (from rev 34076, packages/djangorestframework-gis/trunk/debian/control)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/control (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/control 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,42 @@
+Source: djangorestframework-gis
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ libsqlite3-mod-spatialite,
+ python-all,
+ python-djangorestframework (>= 3.0.4),
+ python-django-filter,
+ python-gdal,
+ python-pyspatialite,
+ python-pysqlite2,
+ python-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+Homepage: https://github.com/djangonauts/django-rest-framework-gis
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/djangorestframework-gis/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/djangorestframework-gis/trunk/
+
+Package: python-djangorestframework-gis
+Architecture: all
+Depends: python-djangorestframework (>= 3.0.4),
+ python-django-filter,
+ ${misc:Depends},
+ ${python:Depends}
+Description: Geographic add-ons for Django REST Framework
+ djangorestframework-gis extends the Django REST Framework to also handle
+ geographic data as used by GeoDjango during serialization and deserialization.
+ It provides the following features:
+ .
+ * GeometryField: This field handles GeoDjango geometry fields, providing
+ custom to_native and from_native methods for GeoJSON input/output.
+ * GeoModelSerializer: This serializer updates the field_mapping dictionary to
+ include field mapping of GeoDjango geometry fields to the above
+ GeometryField.
+ * GeoFeatureModelSerializer: GeoFeatureModelSerializer is a subclass of
+ GeoModelSerializer which will output data in a format that is GeoJSON
+ compatible.
+ * InBBOXFilter: Filters a queryset to only those instances within a certain
+ bounding box.
Deleted: packages/djangorestframework-gis/tags/0.8-1/debian/copyright
===================================================================
--- packages/djangorestframework-gis/trunk/debian/copyright 2015-08-17 13:47:10 UTC (rev 33822)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/copyright 2015-09-01 06:28:37 UTC (rev 34077)
@@ -1,31 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: djangorestframework-gis
-Upstream-Contact: Douglas Meehan <dmeehan at gmail.com>
-Source: https://github.com/djangonauts/django-rest-framework-gis
-
-Files: *
-Copyright: 2013-2014, Douglas Meehan <dmeehan at gmail.com>
-License: Expat
-
-Files: debian/*
-Copyright: 2014, Fladischer Michael <FladischerMichael at fladi.at>
-License: Expat
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/copyright (from rev 34076, packages/djangorestframework-gis/trunk/debian/copyright)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/copyright (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/copyright 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: djangorestframework-gis
+Upstream-Contact: Douglas Meehan <dmeehan at gmail.com>
+Source: https://github.com/djangonauts/django-rest-framework-gis
+
+Files: *
+Copyright: 2013-2015, Douglas Meehan <dmeehan at gmail.com>
+License: Expat
+
+Files: debian/*
+Copyright: 2015, Fladischer Michael <fladi at debian.org>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
Deleted: packages/djangorestframework-gis/tags/0.8-1/debian/patches/series
===================================================================
--- packages/djangorestframework-gis/trunk/debian/patches/series 2015-08-17 13:47:10 UTC (rev 33822)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/patches/series 2015-09-01 06:28:37 UTC (rev 34077)
@@ -1 +0,0 @@
-spatialite.patch
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/patches/series (from rev 34075, packages/djangorestframework-gis/trunk/debian/patches/series)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/patches/series (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/patches/series 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,2 @@
+spatialite.patch
+skip_tests_spatialite.patch
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/patches/skip_tests_spatialite.patch (from rev 34075, packages/djangorestframework-gis/trunk/debian/patches/skip_tests_spatialite.patch)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/patches/skip_tests_spatialite.patch (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/patches/skip_tests_spatialite.patch 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,48 @@
+Description: Skip tests the fail with spatialite.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2015-08-31
+Forwarded: no
+Index: djangorestframework-gis/tests/django_restframework_gis_tests/test_filters.py
+===================================================================
+--- djangorestframework-gis.orig/tests/django_restframework_gis_tests/test_filters.py 2015-03-03 11:54:39.000000000 +0100
++++ djangorestframework-gis/tests/django_restframework_gis_tests/test_filters.py 2015-08-31 20:18:02.423247707 +0200
+@@ -9,13 +9,14 @@
+
+
+ import urllib
++from django.conf import settings
+ from django.test import TestCase
++from django.utils.unittest import skipIf
+ from django.contrib.gis.geos import GEOSGeometry, Polygon
+ from django.core.urlresolvers import reverse
+
+ from .models import Location
+
+-
+ class TestRestFrameworkGis(TestCase):
+
+ def setUp(self):
+@@ -77,6 +78,7 @@
+ for result in response.data['features']:
+ self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
+
++ @skipIf(settings.DATABASES['default']['ENGINE'] == 'django.contrib.gis.db.backends.spatialite', 'Spatialite detected')
+ def test_TileFilter_filtering(self):
+ """
+ Checks that the TMSTileFilter returns only objects strictly contained
+@@ -126,6 +128,7 @@
+ for result in response.data['features']:
+ self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
+
++ @skipIf(settings.DATABASES['default']['ENGINE'] == 'django.contrib.gis.db.backends.spatialite', 'Spatialite detected')
+ def test_DistanceToPointFilter_filtering(self):
+ """
+ Checks that the DistancFilter returns only objects within the given distance of the
+@@ -261,6 +264,7 @@
+ for result in response.data['features']:
+ self.assertEqual(result['properties']['name'] in (treasure_island.name), True)
+
++ @skipIf(settings.DATABASES['default']['ENGINE'] == 'django.contrib.gis.db.backends.spatialite', 'Spatialite detected')
+ def test_GeometryField_filtering(self):
+ """ Checks that the GeometryField allows sane filtering. """
+ self.assertEqual(Location.objects.count(), 0)
Deleted: packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch
===================================================================
--- packages/djangorestframework-gis/trunk/debian/patches/spatialite.patch 2015-08-17 13:47:10 UTC (rev 33822)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch 2015-09-01 06:28:37 UTC (rev 34077)
@@ -1,87 +0,0 @@
-Description: Disable tests that only work with PostGIS
- Some of the upstream tests are designed to test features only supported on a
- PostGIS enable database. To make the tests run with an embedded spatialite
- database, those tests are skipped if the database connection ist not done using
- the PostGIS driver.
- See the following URL for a compatibility matrix:
- https://docs.djangoproject.com/en/1.7/ref/contrib/gis/db-api/#compatibility-tables
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-10-12
-Forwarded: not-needed
-
---- a/tests/settings.py
-+++ b/tests/settings.py
-@@ -5,12 +5,8 @@
-
- DATABASES = {
- 'default': {
-- 'ENGINE': 'django.contrib.gis.db.backends.postgis',
-- 'NAME': 'django_restframework_gis',
-- 'USER': 'postgres',
-- 'PASSWORD': 'postgres',
-- 'HOST': '',
-- 'PORT': ''
-+ 'ENGINE': 'django.contrib.gis.db.backends.spatialite',
-+ 'NAME': 'test.db',
- },
- }
-
-@@ -18,11 +14,11 @@
-
- INSTALLED_APPS = (
- 'django.contrib.staticfiles',
--
-+
- # rest framework
- 'rest_framework',
- 'rest_framework_gis',
--
-+
- # test app
- 'django_restframework_gis_tests'
- )
-@@ -40,6 +36,8 @@
- STATIC_ROOT = '%s/static/' % SITE_ROOT
- STATIC_URL = '/static/'
-
-+ANONYMOUS_USER_ID=-1
-+
- TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
-
- # local settings must be imported before test runner otherwise they'll be ignored
---- a/tests/django_restframework_gis_tests/tests.py
-+++ b/tests/django_restframework_gis_tests/tests.py
-@@ -9,7 +9,9 @@
-
-
- import urllib
-+from django.conf import settings
- from django.test import TestCase
-+from django.test.testcases import skipIf
- from django.contrib.gis.geos import GEOSGeometry, Polygon
- from django.core.urlresolvers import reverse
-
-@@ -471,6 +473,7 @@
- for result in response.data['features']:
- self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
-
-+ @skipIf(settings.DATABASES['default']["ENGINE"] != "django.contrib.gis.db.backends.postgis", "PostGIS not installed")
- def test_TileFilter_filtering(self):
- """
- Checks that the TMSTileFilter returns only objects strictly contained
-@@ -520,6 +523,7 @@
- for result in response.data['features']:
- self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
-
-+ @skipIf(settings.DATABASES['default']["ENGINE"] != "django.contrib.gis.db.backends.postgis", "PostGIS not installed")
- def test_DistanceToPointFilter_filtering(self):
- """
- Checks that the DistancFilter returns only objects within the given distance of the
-@@ -655,6 +659,7 @@
- for result in response.data['features']:
- self.assertEqual(result['properties']['name'] in (treasure_island.name), True)
-
-+ @skipIf(settings.DATABASES['default']["ENGINE"] != "django.contrib.gis.db.backends.postgis", "PostGIS not installed")
- def test_GeometryField_filtering(self):
- """ Checks that the GeometryField allows sane filtering. """
- self.assertEqual(Location.objects.count(), 0)
Copied: packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch (from rev 34074, packages/djangorestframework-gis/trunk/debian/patches/spatialite.patch)
===================================================================
--- packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch (rev 0)
+++ packages/djangorestframework-gis/tags/0.8-1/debian/patches/spatialite.patch 2015-09-01 06:28:37 UTC (rev 34077)
@@ -0,0 +1,46 @@
+Description: Disable tests that only work with PostGIS
+ Some of the upstream tests are designed to test features only supported on a
+ PostGIS enable database. To make the tests run with an embedded spatialite
+ database, those tests are skipped if the database connection ist not done using
+ the PostGIS driver.
+ See the following URL for a compatibility matrix:
+ https://docs.djangoproject.com/en/1.7/ref/contrib/gis/db-api/#compatibility-tables
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2014-10-12
+Forwarded: not-needed
+
+Index: djangorestframework-gis/tests/settings.py
+===================================================================
+--- djangorestframework-gis.orig/tests/settings.py 2015-08-31 19:50:59.446139272 +0200
++++ djangorestframework-gis/tests/settings.py 2015-08-31 21:13:33.447199982 +0200
+@@ -5,15 +5,15 @@
+
+ DATABASES = {
+ 'default': {
+- 'ENGINE': 'django.contrib.gis.db.backends.postgis',
+- 'NAME': 'django_restframework_gis',
+- 'USER': 'postgres',
+- 'PASSWORD': 'postgres',
+- 'HOST': '',
+- 'PORT': ''
++ 'ENGINE': 'django.contrib.gis.db.backends.spatialite',
++ 'NAME': 'test.db',
+ },
+ }
+
++# Support mod_spatialite:
++# https://code.djangoproject.com/ticket/23901
++SPATIALITE_LIBRARY_PATH = 'mod_spatialite'
++
+ SECRET_KEY = 'fn)t*+$)ugeyip6-#txyy$5wf2ervc0d2n#h)qb)y5 at ly$t*@w'
+
+ INSTALLED_APPS = (
+@@ -45,6 +45,8 @@
+ STATIC_ROOT = '%s/static/' % SITE_ROOT
+ STATIC_URL = '/static/'
+
++ANONYMOUS_USER_ID=-1
++
+ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
+
+ # local settings must be imported before test runner otherwise they'll be ignored
More information about the Python-modules-commits
mailing list