[Python-modules-commits] [djangorestframework-gis] 05/05: change version to 0.9.5-1
Brian May
bam at moszumanska.debian.org
Fri Oct 23 08:54:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository djangorestframework-gis.
commit 157477a81462855978d5a4d0a7d77af8aaecec24
Merge: 2718a34 2c5b47b
Author: Brian May <bam at debian.org>
Date: Fri Oct 23 19:11:14 2015 +1100
change version to 0.9.5-1
.coveragerc | 3 +
.gitignore | 4 +-
.travis.yml | 20 +-
AUTHORS | 1 +
CHANGES.rst | 104 ++++++++
CONTRIBUTING.rst | 5 +
LICENSE | 0
MANIFEST.in | 2 +-
README.rst | 263 ++++++++++++++++++---
debian/.git-dpm | 6 +-
debian/changelog | 6 +
debian/patches/skip_tests_spatialite.patch | 22 +-
debian/patches/spatialite.patch | 8 +-
performance_tests.rst | 33 +++
requirements-test.txt | 3 +-
requirements.txt | 2 +-
rest_framework_gis/__init__.py | 29 ++-
rest_framework_gis/apps.py | 38 +++
rest_framework_gis/fields.py | 63 +++--
rest_framework_gis/filters.py | 64 ++---
rest_framework_gis/filterset.py | 5 +-
rest_framework_gis/pagination.py | 20 ++
rest_framework_gis/parsers.py | 1 -
rest_framework_gis/serializers.py | 189 +++++++++------
rest_framework_gis/tilenames.py | 22 +-
rest_framework_gis/utils.py | 5 +
runtests.py | 4 +-
setup.cfg | 2 +
setup.py | 6 +-
tests/__init__.py | 0
tests/django_restframework_gis_tests/admin.py | 0
tests/django_restframework_gis_tests/models.py | 34 ++-
.../django_restframework_gis_tests/serializers.py | 83 +++++--
tests/django_restframework_gis_tests/test_bbox.py | 81 +++++++
.../django_restframework_gis_tests/test_filters.py | 79 +++++--
.../test_performance.py | 46 ++++
tests/django_restframework_gis_tests/tests.py | 213 ++++++++++++-----
tests/django_restframework_gis_tests/urls.py | 14 +-
tests/django_restframework_gis_tests/views.py | 68 +++++-
tests/local_settings.example.py | 16 +-
tests/settings.py | 7 +
tests/urls.py | 0
42 files changed, 1255 insertions(+), 316 deletions(-)
diff --cc debian/.git-dpm
index bc1db78,0000000..0f30bc1
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
- bc5cc2f6e9d08aef4471a2febbd9c292480560c8
- bc5cc2f6e9d08aef4471a2febbd9c292480560c8
- a8f69a9ae2e805b34e1de03bc3d05e0bad9f1ae3
++2c5b47b35b4c11ca0ed296cf644d7f4a7ccc8a55
++2c5b47b35b4c11ca0ed296cf644d7f4a7ccc8a55
++2e7c34d49cd13f24cc87100cfbd73ffbbbbdc7bb
+2e7c34d49cd13f24cc87100cfbd73ffbbbbdc7bb
+djangorestframework-gis_0.9.5.orig.tar.gz
+9135e37d4b58db41ebc79c5814bfdb86dd59937e
+25735
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 25ecba3,0000000..061230b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,0 +1,38 @@@
++djangorestframework-gis (0.9.5-1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++
++ -- Brian May <bam at debian.org> Fri, 23 Oct 2015 19:11:15 +1100
++
+djangorestframework-gis (0.8-2) unstable; urgency=low
+
+ * Provide separate Python3 package.
+ * Use python-django-filters in Build-Depends and Depends.
+ * Remove python-pyspatialite and python-pysqlite2 from Build-Depends.
+ * Add lintian override for missing upstream changelog in Python3
+ package.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 01 Sep 2015 12:22:04 +0200
+
+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
diff --cc debian/patches/skip_tests_spatialite.patch
index 2def84f,0000000..300c389
mode 100644,000000..100644
--- a/debian/patches/skip_tests_spatialite.patch
+++ b/debian/patches/skip_tests_spatialite.patch
@@@ -1,56 -1,0 +1,56 @@@
- From bc5cc2f6e9d08aef4471a2febbd9c292480560c8 Mon Sep 17 00:00:00 2001
++From 2c5b47b35b4c11ca0ed296cf644d7f4a7ccc8a55 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:58:55 -0700
+Subject: Skip tests the fail with spatialite.
+
+Last-Update: 2015-08-31
+Forwarded: no
+Patch-Name: skip_tests_spatialite.patch
+---
+ tests/django_restframework_gis_tests/test_filters.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/django_restframework_gis_tests/test_filters.py b/tests/django_restframework_gis_tests/test_filters.py
- index f41c86d..b084df2 100755
++index 5f255c5..0691f00 100644
+--- a/tests/django_restframework_gis_tests/test_filters.py
++++ b/tests/django_restframework_gis_tests/test_filters.py
- @@ -9,13 +9,14 @@ except ImportError:
-
-
++@@ -1,13 +1,14 @@
++ import json
+ 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 @@ class TestRestFrameworkGis(TestCase):
++ class TestRestFrameworkGisFilters(TestCase):
++ """
++ unit tests for filters feature in restframework_gis
++@@ -71,6 +72,7 @@ class TestRestFrameworkGisFilters(TestCase):
+ 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 @@ class TestRestFrameworkGis(TestCase):
++@@ -120,6 +122,7 @@ class TestRestFrameworkGisFilters(TestCase):
+ 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 @@ class TestRestFrameworkGis(TestCase):
++@@ -259,6 +262,7 @@ class TestRestFrameworkGisFilters(TestCase):
+ 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)
diff --cc debian/patches/spatialite.patch
index 83ee706,0000000..723b972
mode 100644,000000..100644
--- a/debian/patches/spatialite.patch
+++ b/debian/patches/spatialite.patch
@@@ -1,54 -1,0 +1,54 @@@
- From 2dd697bbc1e2e769eec2df3bcf829f06041d8c59 Mon Sep 17 00:00:00 2001
++From c583bbdc855e25c9c69f86b8e15c0aefb6b447da Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:58:54 -0700
+Subject: 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
+Last-Update: 2014-10-12
+Forwarded: not-needed
+
+Patch-Name: spatialite.patch
+---
+ tests/settings.py | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tests/settings.py b/tests/settings.py
- index b9c2085..eb42875 100755
++index 150eb82..d9edb92 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
- @@ -5,15 +5,15 @@ TEMPLATE_DEBUG = DEBUG
++@@ -7,15 +7,15 @@ TEMPLATE_DEBUG = DEBUG
+
+ 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 @@ MEDIA_URL = '/media/'
++@@ -52,6 +52,8 @@ MEDIA_URL = '/media/'
+ 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework-gis.git
More information about the Python-modules-commits
mailing list