[Python-modules-commits] [djangorestframework-gis] 02/09: Import djangorestframework-gis_0.10.0.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Fri Dec 11 11:45:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository djangorestframework-gis.
commit 24f848a5f020c5318537e3814c5598cf279c2092
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Dec 11 11:55:55 2015 +0100
Import djangorestframework-gis_0.10.0.orig.tar.gz
---
.travis.yml | 21 ++++-----------------
CHANGES.rst | 5 +++++
README.rst | 37 +++++++++++++++++++------------------
requirements-test.txt | 2 +-
requirements.txt | 2 +-
rest_framework_gis/__init__.py | 26 +-------------------------
rest_framework_gis/apps.py | 8 +-------
rest_framework_gis/fields.py | 3 +--
rest_framework_gis/pagination.py | 4 ++--
rest_framework_gis/serializers.py | 3 ++-
rest_framework_gis/utils.py | 5 -----
setup.py | 1 -
tests/urls.py | 11 ++++++-----
13 files changed, 43 insertions(+), 85 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3b06548..a51d70e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,29 +8,17 @@ services:
python:
- "3.5"
- "3.4"
- - "3.3"
- - "3.2"
- "2.7"
- - "2.6"
env:
- - DJANGO="django==1.8.5"
- - DJANGO="django==1.7.10"
- - DJANGO="django==1.6.11"
- - DJANGO="django==1.5.12"
+ - 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.10"
- - python: "3.5"
- env: DJANGO="django==1.6.11"
- - python: "3.5"
- env: DJANGO="django==1.5.12"
- - python: "2.6"
- env: DJANGO="django==1.7.10"
- - python: "2.6"
- env: DJANGO="django==1.8.5"
+ env: DJANGO="django>=1.7,<1.8"
branches:
only:
@@ -38,7 +26,6 @@ branches:
# command to install requirements
install:
- - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install ordereddict; fi
- pip install $DJANGO
- pip install -r requirements-test.txt
- python setup.py -q develop
diff --git a/CHANGES.rst b/CHANGES.rst
index 5d29b46..6aef600 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
Changelog
=========
+Version 0.10.0 [2015-12-07]
+---------------------------
+
+- `#87 <https://github.com/djangonauts/django-rest-framework-gis/issues/87>`_ dropped support for old django versions and python 2.6
+
Version 0.9.6 [2015-11-02]
--------------------------
diff --git a/README.rst b/README.rst
index 48f3f15..2bf0a6e 100644
--- a/README.rst
+++ b/README.rst
@@ -39,24 +39,25 @@ Compatibility with DRF, Django and Python
=============== ============================ ==================== ==================================
DRF-gis version DRF version Django version Python version
-**0.9.6** **3.1.X** to **3.3.X** **1.5.x** to **1.8** **2.6** to **3.5**
-**0.9.5** **3.1.X** to **3.2.X** **1.5.x** to **1.8** **2.6** to **3.4**
-**0.9.4** **3.1.X** to **3.2.X** **1.5.x** to **1.8** **2.6** to **3.4**
-**0.9.3** **3.1.X** **1.5.x** to **1.8** **2.6** to **3.4**
-**0.9.2** **3.1.X** **1.5.x** to **1.8** **2.6** to **3.4**
-**0.9.1** **3.1.X** **1.5.x** to **1.8** **2.6** to **3.4**
-**0.9** **3.1.X** **1.5.x** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
-**0.9** **3.1.X** **1.5.x** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
-**0.9** **3.1.X** **1.5.x** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
-**0.8.2** **3.0.4** to **3.1.1** **1.5.x** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
-**0.8.1** **3.0.4** to **3.1.1** **1.5.x** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
-**0.8** **3.0.4** **1.5.x** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
-**0.7** **2.4.3** **1.5.x** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
-**0.6** **2.4.3** **1.5.x** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
-**0.5** from **2.3.14** to **2.4.2** **1.5.x** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
-**0.4** from **2.3.14** to **2.4.2** **1.5.x** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
-**0.3** from **2.3.14** to **2.4.2** **1.5.x**, **1.6.x** **2.6**, **2.7**
-**0.2** from **2.2.2** to **2.3.13** **1.5.x**, **1.6.x** **2.6**, **2.7**
+**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.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**
+**0.9.2** **3.1** **1.5** to **1.8** **2.6** to **3.4**
+**0.9.1** **3.1** **1.5** to **1.8** **2.6** to **3.4**
+**0.9** **3.1** **1.5** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
+**0.9** **3.1** **1.5** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
+**0.9** **3.1** **1.5** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
+**0.8.2** **3.0.4** to **3.1.1** **1.5** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
+**0.8.1** **3.0.4** to **3.1.1** **1.5** to **1.8** **2.6**, **2.7**, **3.3**, **3.4**
+**0.8** **3.0.4** **1.5** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
+**0.7** **2.4.3** **1.5** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
+**0.6** **2.4.3** **1.5** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
+**0.5** from **2.3.14** to **2.4.2** **1.5** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
+**0.4** from **2.3.14** to **2.4.2** **1.5** to **1.7** **2.6**, **2.7**, **3.3**, **3.4**
+**0.3** from **2.3.14** to **2.4.2** **1.5**, **1.6** **2.6**, **2.7**
+**0.2** from **2.2.2** to **2.3.13** **1.5**, **1.6** **2.6**, **2.7**
=============== ============================ ==================== ==================================
Fields
diff --git a/requirements-test.txt b/requirements-test.txt
index 1d80ace..eeb8880 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,5 @@
psycopg2
-djangorestframework>=3.0.4
+djangorestframework>=3.3
coverage==3.7.1 # rq.filter: >=3,<4
coveralls
django-filter
diff --git a/requirements.txt b/requirements.txt
index c6c4f3f..770197e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-djangorestframework>=3.0.4,<3.3
+djangorestframework>=3.3
diff --git a/rest_framework_gis/__init__.py b/rest_framework_gis/__init__.py
index dbbbc6b..36c8bee 100644
--- a/rest_framework_gis/__init__.py
+++ b/rest_framework_gis/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 9, 6, 'final')
+VERSION = (0, 10, 0, 'final')
__version__ = VERSION # alias
@@ -15,27 +15,3 @@ def get_version():
default_app_config = 'rest_framework_gis.apps.AppConfig'
-
-# maintain support for django 1.5 and 1.6
-# TODO: remove in version 1.0
-try:
- import os
- import django
-
- if os.environ.get('DJANGO_SETTINGS_MODULE'):
- from django.conf import settings
- from .apps import AppConfig
-
- if 'rest_framework_gis' not in settings.INSTALLED_APPS:
- import warnings
- warnings.simplefilter('always', DeprecationWarning)
- warnings.warn('\nGeoModelSerializer is deprecated, '
- 'add "rest_framework_gis" to settings.INSTALLED_APPS and use '
- '"rest_framework.ModelSerializer" instead',
- DeprecationWarning)
-
- if django.get_version() < '1.7' or 'rest_framework_gis' not in settings.INSTALLED_APPS:
- import rest_framework_gis
- AppConfig('rest_framework_gis', rest_framework_gis).ready()
-except ImportError:
- pass
diff --git a/rest_framework_gis/apps.py b/rest_framework_gis/apps.py
index 43767c7..8ae6249 100644
--- a/rest_framework_gis/apps.py
+++ b/rest_framework_gis/apps.py
@@ -1,10 +1,4 @@
-try:
- from django.apps import AppConfig as BaseConfig
-except ImportError: # pragma: nocover
- # django <= 1.6
- class BaseConfig(object):
- def __init__(self, *args):
- pass
+from django.apps import AppConfig as BaseConfig
class AppConfig(BaseConfig):
diff --git a/rest_framework_gis/fields.py b/rest_framework_gis/fields.py
index 027b01f..a6a872e 100644
--- a/rest_framework_gis/fields.py
+++ b/rest_framework_gis/fields.py
@@ -1,4 +1,5 @@
import json
+from collections import OrderedDict
from django.contrib.gis.geos import GEOSGeometry, GEOSException
from django.contrib.gis.gdal import OGRException
@@ -6,8 +7,6 @@ from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
from rest_framework.fields import Field, SerializerMethodField
-from .utils import OrderedDict
-
__all__ = ['GeometryField', 'GeometrySerializerMethodField']
diff --git a/rest_framework_gis/pagination.py b/rest_framework_gis/pagination.py
index e9d45e3..2842b8a 100644
--- a/rest_framework_gis/pagination.py
+++ b/rest_framework_gis/pagination.py
@@ -1,8 +1,8 @@
+from collections import OrderedDict
+
from rest_framework import pagination
from rest_framework.response import Response
-from .utils import OrderedDict
-
class GeoJsonPagination(pagination.PageNumberPagination):
"""
diff --git a/rest_framework_gis/serializers.py b/rest_framework_gis/serializers.py
index de22933..cea8c46 100644
--- a/rest_framework_gis/serializers.py
+++ b/rest_framework_gis/serializers.py
@@ -1,10 +1,11 @@
+from collections import OrderedDict
+
from django.core.exceptions import ImproperlyConfigured
from django.contrib.gis.geos import Polygon
from rest_framework.serializers import ModelSerializer, ListSerializer, LIST_SERIALIZER_KWARGS
from .fields import GeometryField, GeometrySerializerMethodField # noqa
-from .utils import OrderedDict
class GeoModelSerializer(ModelSerializer):
diff --git a/rest_framework_gis/utils.py b/rest_framework_gis/utils.py
deleted file mode 100644
index d2e2fd8..0000000
--- a/rest_framework_gis/utils.py
+++ /dev/null
@@ -1,5 +0,0 @@
-try:
- from collections import OrderedDict # noqa
-# python 2.6
-except ImportError: # pragma: no cover
- from ordereddict import OrderedDict # noqa
diff --git a/setup.py b/setup.py
index dc9f433..02b5334 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@ setup(
'Operating System :: OS Independent',
'Framework :: Django',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
diff --git a/tests/urls.py b/tests/urls.py
index 9638d6c..3f14318 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,16 +1,17 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.contrib import admin
admin.autodiscover()
-urlpatterns = patterns('',
+urlpatterns = [
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
+
url(r'', include('django_restframework_gis_tests.urls')),
-
+
url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
-)
+
+]
--
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