[Python-modules-commits] [djangorestframework-gis] 05/12: Import djangorestframework-gis_0.10.1.orig.tar.gz

Michael Fladischer fladi at moszumanska.debian.org
Thu Jan 7 11:46:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository djangorestframework-gis.

commit 8623397eb64f78e06c01bde72ff6eb77185328e2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jan 7 11:37:33 2016 +0100

    Import djangorestframework-gis_0.10.1.orig.tar.gz
---
 .coveragerc                                        |  3 --
 .gitignore                                         | 13 ------
 .travis.yml                                        | 42 ------------------
 CHANGES.rst                                        |  7 +++
 CONTRIBUTING.rst                                   |  5 ---
 MANIFEST.in                                        | 10 +++--
 PKG-INFO                                           | 25 +++++++++++
 README.rst                                         |  4 +-
 djangorestframework_gis.egg-info/PKG-INFO          | 25 +++++++++++
 djangorestframework_gis.egg-info/SOURCES.txt       | 38 ++++++++++++++++
 .../dependency_links.txt                           |  1 +
 djangorestframework_gis.egg-info/requires.txt      |  1 +
 djangorestframework_gis.egg-info/top_level.txt     |  1 +
 performance_tests.rst                              | 33 --------------
 requirements-test.txt                              |  6 ---
 rest_framework_gis/.gitignore                      |  1 -
 rest_framework_gis/__init__.py                     |  2 +-
 setup.cfg                                          |  8 +++-
 .../django_restframework_gis_tests/test_filters.py |  8 ++++
 tests/local_settings.py                            | 50 ++++++++++++++++++++++
 20 files changed, 173 insertions(+), 110 deletions(-)

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 2c81a86..0000000
--- a/.coveragerc
+++ /dev/null
@@ -1,3 +0,0 @@
-[run]
-omit =
-    /*/__init__.py
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index eb5fab7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.py[cod]
-*.py~
-*.egg-info/
-dist/
-build/
-tests/static/
-*local_settings.py
-.coverage
-*~
-._*
-*.DS_Store
-*.komodoproject
-/htmlcov
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a51d70e..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-sudo: false
-language: python
-cache: pip
-
-services:
-  - postgresql
-
-python:
-  - "3.5"
-  - "3.4"
-  - "2.7"
-
-env:
-  - DJANGO="django>=1.9,<1.10"
-  - DJANGO="django>=1.8,<1.9"
-  - DJANGO="django>=1.7,<1.8"
-
-matrix:
-  exclude:
-    - python: "3.5"
-      env: DJANGO="django>=1.7,<1.8"
-
-branches:
-  only:
-    - master
-
-# command to install requirements
-install:
-  - pip install $DJANGO
-  - pip install -r requirements-test.txt
-  - python setup.py -q develop
-
-before_script:
-  - createdb django_restframework_gis
-  - psql -U postgres -d django_restframework_gis -c "CREATE EXTENSION postgis;"
-
-# command to run tests, e.g. python setup.py test
-script:
-  - coverage run --source=rest_framework_gis runtests.py
-
-after_success:
-  coveralls
diff --git a/CHANGES.rst b/CHANGES.rst
index 6aef600..7eecfb0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Version 0.10.1 [2016-01-06]
+---------------------------
+
+- `#93 <https://github.com/djangonauts/django-rest-framework-gis/issues/93>`_ skipped a few tests if spatialite DB backend is being used
+- `#95 <https://github.com/djangonauts/django-rest-framework-gis/issues/95>`_ fixed misunderstanding regarding 0.9.6 DRF compatibility in README
+- `#96 <https://github.com/djangonauts/django-rest-framework-gis/issues/96>`_ added missing assets in python package source tarball
+
 Version 0.10.0 [2015-12-07]
 ---------------------------
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
deleted file mode 100644
index eba575c..0000000
--- a/CONTRIBUTING.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Contributing
-============
-
-Thanks for your interest! We love contributions, so please feel free to fix bugs, improve things, provide documentation. Just `follow the
-guidelines <https://github.com/djangonauts/django-rest-framework-gis#contributing>`_ and submit a PR.
diff --git a/MANIFEST.in b/MANIFEST.in
index f9e3fb0..7fb556a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,7 @@
-include AUTHORS LICENSE README.rst requirements.txt
-recursive-include tests *
-recursive-exclude * *.pyc *.swp
+include AUTHORS
+include LICENSE
+include README.rst
+include CHANGES.rst
+include requirements.txt
+include runtests.py
+recursive-include tests *.py
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..035aae9
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.1
+Name: djangorestframework-gis
+Version: 0.10.1
+Summary: Geographic add-ons for Django Rest Framework
+Home-page: https://github.com/djangonauts/django-rest-framework-gis
+Author: Douglas Meehan
+Author-email: django-rest-framework-gis at googlegroups.com
+License: BSD
+Download-URL: https://github.com/djangonauts/django-rest-framework-gis/releases
+Description: UNKNOWN
+Keywords: django,rest-framework,gis,geojson
+Platform: Platform Indipendent
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Web Environment
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Framework :: Django
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
diff --git a/README.rst b/README.rst
index 2bf0a6e..12d28d1 100644
--- a/README.rst
+++ b/README.rst
@@ -39,8 +39,8 @@ Compatibility with DRF, Django and Python
 
 ===============  ============================ ==================== ==================================
 DRF-gis version  DRF version                  Django version       Python version
-**0.10.0**       **3.1** to **3.3**           **1.7** to **1.9**   **2.7** to **3.5**
-**0.9.6**        **3.1** to **3.3**           **1.5** to **1.8**   **2.6** to **3.5**
+**0.10.x**       **3.1** to **3.3**           **1.7** to **1.9**   **2.7** to **3.5**
+**0.9.6**        **3.1** to **3.2**           **1.5** to **1.8**   **2.6** to **3.5**
 **0.9.5**        **3.1** to **3.2**           **1.5** to **1.8**   **2.6** to **3.4**
 **0.9.4**        **3.1** to **3.2**           **1.5** to **1.8**   **2.6** to **3.4**
 **0.9.3**        **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
diff --git a/djangorestframework_gis.egg-info/PKG-INFO b/djangorestframework_gis.egg-info/PKG-INFO
new file mode 100644
index 0000000..035aae9
--- /dev/null
+++ b/djangorestframework_gis.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.1
+Name: djangorestframework-gis
+Version: 0.10.1
+Summary: Geographic add-ons for Django Rest Framework
+Home-page: https://github.com/djangonauts/django-rest-framework-gis
+Author: Douglas Meehan
+Author-email: django-rest-framework-gis at googlegroups.com
+License: BSD
+Download-URL: https://github.com/djangonauts/django-rest-framework-gis/releases
+Description: UNKNOWN
+Keywords: django,rest-framework,gis,geojson
+Platform: Platform Indipendent
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Web Environment
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Framework :: Django
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
diff --git a/djangorestframework_gis.egg-info/SOURCES.txt b/djangorestframework_gis.egg-info/SOURCES.txt
new file mode 100644
index 0000000..e6c2287
--- /dev/null
+++ b/djangorestframework_gis.egg-info/SOURCES.txt
@@ -0,0 +1,38 @@
+AUTHORS
+CHANGES.rst
+LICENSE
+MANIFEST.in
+README.rst
+requirements.txt
+runtests.py
+setup.cfg
+setup.py
+djangorestframework_gis.egg-info/PKG-INFO
+djangorestframework_gis.egg-info/SOURCES.txt
+djangorestframework_gis.egg-info/dependency_links.txt
+djangorestframework_gis.egg-info/requires.txt
+djangorestframework_gis.egg-info/top_level.txt
+rest_framework_gis/__init__.py
+rest_framework_gis/apps.py
+rest_framework_gis/fields.py
+rest_framework_gis/filters.py
+rest_framework_gis/filterset.py
+rest_framework_gis/pagination.py
+rest_framework_gis/serializers.py
+rest_framework_gis/tilenames.py
+tests/__init__.py
+tests/local_settings.example.py
+tests/local_settings.py
+tests/manage.py
+tests/settings.py
+tests/urls.py
+tests/django_restframework_gis_tests/__init__.py
+tests/django_restframework_gis_tests/admin.py
+tests/django_restframework_gis_tests/models.py
+tests/django_restframework_gis_tests/serializers.py
+tests/django_restframework_gis_tests/test_bbox.py
+tests/django_restframework_gis_tests/test_filters.py
+tests/django_restframework_gis_tests/test_performance.py
+tests/django_restframework_gis_tests/tests.py
+tests/django_restframework_gis_tests/urls.py
+tests/django_restframework_gis_tests/views.py
\ No newline at end of file
diff --git a/djangorestframework_gis.egg-info/dependency_links.txt b/djangorestframework_gis.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/djangorestframework_gis.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/djangorestframework_gis.egg-info/requires.txt b/djangorestframework_gis.egg-info/requires.txt
new file mode 100644
index 0000000..770197e
--- /dev/null
+++ b/djangorestframework_gis.egg-info/requires.txt
@@ -0,0 +1 @@
+djangorestframework>=3.3
diff --git a/djangorestframework_gis.egg-info/top_level.txt b/djangorestframework_gis.egg-info/top_level.txt
new file mode 100644
index 0000000..e78abd1
--- /dev/null
+++ b/djangorestframework_gis.egg-info/top_level.txt
@@ -0,0 +1 @@
+rest_framework_gis
diff --git a/performance_tests.rst b/performance_tests.rst
deleted file mode 100644
index 7764725..0000000
--- a/performance_tests.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-Average of 5 measurements for python2 and python3.
-
-Launch the performance test with::
-
-    cd tests
-    django test --keepdb django_restframework_gis_tests.test_performance
-
-For more information regarding how the measurement is performed read the code in
-`test_performance.py <https://github.com/djangonauts/django-rest-framework-gis/blob/master/tests/django_restframework_gis_tests/test_performance.py>`__.
-
-0.9.2
-=====
-
-- **py2**: 6.304474401472
-- **py3**: 6.952443096001661
-
-0.9.3
-=====
-
-- **py2**: 4.462462759018 (**29.2%** improvement)
-- **py3**: 5.217188624000118 (**25%** improvement)
-
-0.9.4
-=====
-
-- **py2**: 4.227859210966
-- **py3**: 5.00467809599977
-
-0.9.5
-=====
-
-- **py2**: 4.193417596816
-- **py3**: 4.89978777600045
diff --git a/requirements-test.txt b/requirements-test.txt
deleted file mode 100644
index eeb8880..0000000
--- a/requirements-test.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-psycopg2
-djangorestframework>=3.3
-coverage==3.7.1  # rq.filter: >=3,<4
-coveralls
-django-filter
-contexttimer
diff --git a/rest_framework_gis/.gitignore b/rest_framework_gis/.gitignore
deleted file mode 100644
index 2b0f609..0000000
--- a/rest_framework_gis/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pyc
\ No newline at end of file
diff --git a/rest_framework_gis/__init__.py b/rest_framework_gis/__init__.py
index 36c8bee..7d1c352 100644
--- a/rest_framework_gis/__init__.py
+++ b/rest_framework_gis/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 10, 0, 'final')
+VERSION = (0, 10, 1, 'final')
 __version__ = VERSION  # alias
 
 
diff --git a/setup.cfg b/setup.cfg
index 3c6e79c..6f08d0e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,8 @@
 [bdist_wheel]
-universal=1
+universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/tests/django_restframework_gis_tests/test_filters.py b/tests/django_restframework_gis_tests/test_filters.py
index 5f255c5..4e33ea1 100644
--- a/tests/django_restframework_gis_tests/test_filters.py
+++ b/tests/django_restframework_gis_tests/test_filters.py
@@ -1,12 +1,17 @@
 import json
 import urllib
 
+from unittest import skipIf
+
+from django.conf import settings
 from django.test import TestCase
 from django.contrib.gis.geos import GEOSGeometry, Polygon
 from django.core.urlresolvers import reverse
 
 from .models import Location
 
+has_spatialite = settings.DATABASES['default']['ENGINE'] == 'django.contrib.gis.db.backends.spatialite'
+
 
 class TestRestFrameworkGisFilters(TestCase):
     """
@@ -71,6 +76,7 @@ class TestRestFrameworkGisFilters(TestCase):
         for result in response.data['features']:
             self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
 
+    @skipIf(has_spatialite, 'Skipped test for spatialite backend: not accurate enough')
     def test_TileFilter_filtering(self):
         """
         Checks that the TMSTileFilter returns only objects strictly contained
@@ -120,6 +126,7 @@ class TestRestFrameworkGisFilters(TestCase):
         for result in response.data['features']:
             self.assertEqual(result['properties']['name'] in ('isContained', 'isEqualToBounds', 'overlaps'), True)
 
+    @skipIf(has_spatialite, 'Skipped test for spatialite backend: missing feature "dwithin"')
     def test_DistanceToPointFilter_filtering(self):
         """
         Checks that the DistancFilter returns only objects within the given distance of the
@@ -259,6 +266,7 @@ class TestRestFrameworkGisFilters(TestCase):
         for result in response.data['features']:
             self.assertEqual(result['properties']['name'] in (treasure_island.name), True)
 
+    @skipIf(has_spatialite, 'Skipped test for spatialite backend: missing feature "contains_properly"')
     def test_GeometryField_filtering(self):
         """ Checks that the GeometryField allows sane filtering. """
         self.assertEqual(Location.objects.count(), 0)
diff --git a/tests/local_settings.py b/tests/local_settings.py
new file mode 100644
index 0000000..525b287
--- /dev/null
+++ b/tests/local_settings.py
@@ -0,0 +1,50 @@
+from settings import *
+# RENAME THIS FILE local_settings.py IF YOU NEED TO CUSTOMIZE SOME SETTINGS
+# BUT DO NOT COMMIT
+TEST_PERFORMANCE = False
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'django_restframework_gis',
+        'USER': 'postgres',
+        'PASSWORD': 'password',
+        'HOST': '127.0.0.1',
+        'PORT': '5432'
+    },
+}
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.gis',
+
+    # geodjango widgets
+    #'olwidget',
+
+    # admin
+    #'grappelli',
+    'django.contrib.admin',
+
+    # rest framework
+    'rest_framework',
+    'rest_framework_gis',
+
+    # test app
+    'django_restframework_gis_tests',
+    'django_extensions'
+)
+
+POSTGIS_VERSION = (2, 1)
+
+#REST_FRAMEWORK = {
+#     'DEFAULT_RENDERER_CLASSES': (
+#         'drf_ujson.renderers.UJSONRenderer',
+#     ),
+#     'DEFAULT_PARSER_CLASSES': (
+#        'drf_ujson.parsers.UJSONParser',
+#     ),
+#}

-- 
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