Merge 144ebcb into a1b7778

.travis.yml

@@ -7,16 +7,14 @@ python:
 
 env:
   matrix:
-   - DJANGO_VERSION=1.9.13
-   - DJANGO_VERSION=1.10.7
-   - DJANGO_VERSION=1.11.2
+   - DJANGO_VERSION=1.11.*
 
 install:
  - sudo apt-get update
  - ./install.sh
  - ./env/bin/pip install -U django==$DJANGO_VERSION
  - ./env/bin/pip install coverage
- - pip install flake8==3.5.0
+ - pip install flake8
  - ./env/bin/python ./manage.py collectstatic --noinput
 
 before_script:

CHANGES

@@ -5,9 +5,10 @@ CHANGELOG
 4.3.7.dev0
 ==================
 
-**Bug fixes**
+**New features**
 
--
+- Drop support to Django 1.9 and 1.10 versions
+- upgrade libraries
 
 
 4.3.6 (2018-09-04)

mapentity/helpers.py

@@ -12,7 +12,7 @@
 from django.conf import settings
 from django.contrib.gis.gdal.error import OGRException
 from django.contrib.gis.geos import GEOSException, fromstr
-from django.core.urlresolvers import resolve
+from django.urls import resolve
 from django.http import HttpResponse
 from django.template.exceptions import TemplateDoesNotExist
 from django.template.loader import get_template

mapentity/models.py

@@ -8,14 +8,13 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, ObjectDoesNotExist
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.contrib import auth
 from django.contrib.admin.models import LogEntry as BaseLogEntry
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION
 from django.utils.formats import localize
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
 from rest_framework import permissions as rest_permissions
 
 from mapentity.templatetags.mapentity_tags import humanize_timesince

mapentity/views/base.py

@@ -11,7 +11,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.gis.db.models import GeometryField
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import (HttpResponse, HttpResponseBadRequest, Http404)
 from django.shortcuts import get_object_or_404
 from django.utils.six.moves.urllib.parse import quote

requirements.txt

@@ -1,12 +1,12 @@
 appy==0.9.11
-beautifulsoup4==4.6.0
-cairocffi==0.8.0
+beautifulsoup4==4.6.*
+cairocffi==0.9.0
 CairoSVG==1.0.22
 certifi==2018.1.18
 cffi==1.11.5
 chardet==3.0.4
 cssselect2==0.2.1
-Django==1.11.12
+Django==1.11.*
 django-appconf==1.0.2
 django-appypod==1.0.0
 django-compressor==2.2
@@ -19,10 +19,10 @@ django-modeltranslation==0.12.2
 django-shapes==0.2.0
 django-tinymce==2.7.0
 django-weasyprint==0.1
-djangorestframework==3.6.4
-djangorestframework-gis==0.12
+djangorestframework==3.8.*
+djangorestframework-gis==0.13
 easy-thumbnails==2.5
-factory-boy==2.8.1
+factory-boy==2.11.*
 Faker==0.8.12
 funcsigs==1.0.2
 gpxpy==1.2.0
@@ -31,20 +31,20 @@ idna==2.6
 ipaddress==1.0.19
 lxml==4.2.1
 mock==2.0.0
-paperclip==2.1.2
+paperclip==2.2.0
 pbr==4.0.1
 pdfrw==0.4
-Pillow==5.1.0
+Pillow==5.3.*
 pycparser==2.18
 Pyphen==0.9.4
 python-dateutil==2.7.2
-pytz==2018.3
+pytz==2018.7
 rcssmin==1.0.6
-requests==2.18.4
+requests==2.20.*
 rjsmin==1.0.12
 six==1.11.0
 text-unidecode==1.2
 tinycss2==0.6.1
-urllib3==1.22
+urllib3==1.24.*
 WeasyPrint==0.41
 webencodings==0.5.1

setup.py

@@ -6,7 +6,7 @@
 
 test_requires = [
     'mock',
-    'factory_boy==2.8.1',
+    'factory_boy',
 ]
 
 setup(
@@ -23,7 +23,7 @@
     install_requires=[
         'appy>=0.9.10',
         'BeautifulSoup4>=4.6.0',
-        'Django>=1.9,<2',
+        'Django>=1.11,<2',
         'GDAL>=1.10',
         'gpxpy>=1.1.2',
         'django-appypod>=1.0.0',
@@ -37,12 +37,12 @@
         'django-shapes>=0.2.0',
         'django-tinymce>=2.6.0',
         'django-weasyprint==0.1',  # 0.5.x API changed
-        'djangorestframework>=3.6.4,<3.7',  # 3.7 is not compatible with django 1.9
-        'djangorestframework-gis>=0.11.2',
+        'djangorestframework>=3.6.4,<3.9',  # 3.9 is not compatible with drf gis 0.13
+        'djangorestframework-gis>=0.13',
         'easy-thumbnails>=2.5.0',
         'lxml>=4.2.1',
-        'paperclip>=2.1.2',
-        'requests>=2.18.4',
+        'paperclip>=2.2.0',
+        'requests>=2.20.0',
         'WeasyPrint<0.42',  # 0.42 drops support of python 2.7,
     ] + test_requires,
     tests_requires=test_requires,

test_app/tests/test_attachments.py

@@ -6,7 +6,7 @@
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from paperclip.settings import get_attachment_model, get_filetype_model
 from mapentity.views.generic import MapEntityDetail

test_app/tests/test_decorators.py

@@ -3,7 +3,7 @@
 from django.test import TransactionTestCase
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from mapentity.registry import app_settings
 from mapentity.decorators import view_permission_required