Merge branch 'master' into extensible

Author: daliborpavlovic

Diff for: .travis.yml

@@ -36,11 +36,18 @@ matrix:
           python: "3.5"
         - env: TOX_ENV=py36-django20-postgis
           python: "3.6"
+        - env: TOX_ENV=py35-django21-postgis
+          python: "3.5"
+        - env: TOX_ENV=py36-django21-postgis
+          python: "3.6"
         - env: TOX_ENV=py35-django-master-postgis
           python: "3.5"
         - env: TOX_ENV=py36-django-master-postgis
           python: "3.6"
+        - env: TOX_ENV=py37-django-master-postgis
+          python: "3.7"
     allow_failures:
         # Django master is allowed to fail
         - env: TOX_ENV=py35-django-master-postgis
         - env: TOX_ENV=py36-django-master-postgis
+        - env: TOX_ENV=py37-django-master-postgis

Diff for: AUTHORS.rst

@@ -6,3 +6,4 @@ Authors
 * Adam Lawrence (`alaw005 <https://github.com/alaw005>`_, [email protected])
 * Dave Kroondyk (`davekaro <https://github.com/davekaro>`_, [email protected])
 * Joshua Goodwin (`jclgoodwin <https://github.com/jclgoodwin>`_, [email protected])
+* Jakub Dorňák (`misli <https://github.com/misli>`, [email protected])

Diff for: CHANGELOG.rst

@@ -1,12 +1,16 @@
 Changelog
 =========
 
-Next (unreleased)
-~~~~~~~~~~~~~~~~~
+1.1.2 (2018-08-26)
+------------------
+* Add support for Django 2.0 and 2.1
 * Handle latitude and longitudes with initial `+` sign.
   (`issue #70`_).
+* Use ``.iterator()`` to save memory during export (`PR #80`_)
+* Fix validation error in admin for Frequency.exact_times
 
 .. _`issue #70`: https://github.com/tulsawebdevs/django-multi-gtfs/issues/70
+.. _`PR #80`: https://github.com/tulsawebdevs/django-multi-gtfs/pull/80
 
 1.1.1 (2017-08-02)
 ------------------

Diff for: Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.6
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update

Diff for: examples/explore/docker_run.sh

@@ -14,4 +14,4 @@
 # limitations under the License.
 from __future__ import unicode_literals
 
-__version__ = str('1.1.1')
+__version__ = str('1.1.2')

Diff for: multigtfs/__init__.py

@@ -31,6 +31,7 @@ def _get_blank_value_19(field):
     else:
         return ''
 
+
 if DJ_VERSION >= LooseVersion('1.9'):
     get_blank_value = _get_blank_value_19
 else:

Diff for: multigtfs/compat.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 from __future__ import unicode_literals
 
 from django.db import migrations, models

Diff for: multigtfs/migrations/0002_add_on_delete.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-08-26 20:41
+# flake8: noqa
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('multigtfs', '0002_add_on_delete'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='frequency',
+            name='exact_times',
+            field=models.CharField(blank=True, choices=[('0', 'Trips are not exactly scheduled'), ('1', 'Trips are exactly scheduled from start time')], help_text='Should frequency-based trips be exactly scheduled?', max_length=1),
+        ),
+    ]

Diff for: multigtfs/migrations/0003_auto_20180826_2041.py

@@ -33,8 +33,8 @@ class Frequency(Base):
         help_text="Time in seconds before returning to same stop")
     exact_times = models.CharField(
         max_length=1, blank=True,
-        choices=((0, 'Trips are not exactly scheduled'),
-                 (1, 'Trips are exactly scheduled from start time')),
+        choices=(('0', 'Trips are not exactly scheduled'),
+                 ('1', 'Trips are exactly scheduled from start time')),
         help_text="Should frequency-based trips be exactly scheduled?")
     extra_data = JSONField(default={}, blank=True, null=True)
 

Diff for: multigtfs/models/frequency.py

@@ -1,26 +1,26 @@
-coverage==4.0.3
-django-nose==1.4.4
-flake8==2.5.4
-ipdb==0.9.0
-ipython==4.1.2
+coverage==4.5.1
+django-nose==1.4.5
+flake8==3.5.0
+ipdb==0.11
+ipython==5.8.0
 nose==1.3.7
-wheel==0.29.0
-twine==1.9.1
+wheel==0.31.1
+twine==1.11.0
 
 # tox
-virtualenv==14.0.6
-py==1.4.31
-tox==2.3.1
+virtualenv==16.0.0
+py==1.5.4
+tox==3.2.1
 
 # Sphinx
-MarkupSafe==0.23
-Jinja2==2.8
-Pygments==2.1.2
-Sphinx==1.3.6
+MarkupSafe==1.0
+Jinja2==2.10
+Pygments==2.2.0
+Sphinx==1.7.7
 
 # qa-all
-check-manifest==0.35
-pyroma==2.2
+check-manifest==0.37
+pyroma==2.4
 
 # Google tools - not Python3 compat
 # transitfeed==1.2.15

Diff for: requirements.dev.txt

@@ -1,2 +1,2 @@
-Django>=1.5
+Django>=1.8
 jsonfield==1.0.3

Diff for: requirements.txt

@@ -5,3 +5,4 @@ universal = 1
 ignore =
     *.pyc
     */__pycache__
+    .coverage

Diff for: setup.cfg

@@ -86,6 +86,12 @@ def get_long_description():
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
+        "Framework :: Django :: 1.8",
+        "Framework :: Django :: 1.9",
+        "Framework :: Django :: 1.10",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.0",
+        "Framework :: Django :: 2.1",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",

Diff for: setup.py

@@ -3,7 +3,8 @@ envlist =
     py{27,34}-django18-{postgis,spatiallite}
     py{27,34,35}-django{19,110}-{postgis,spatiallite}
     py{27,34,35,36}-django111-{postgis,spatiallite}
-    py{35,36}-django{20,-master}-{postgis,spatiallite}
+    py{35,36}-django20-{postgis,spatiallite}
+    py{35,36,37}-django{21,-master}-{postgis,spatiallite}
 
 [flake8]
 exclude = .tox/*,.build/*,.dist/*,build/*
@@ -18,6 +19,7 @@ deps=
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
     django-master: https://github.com/django/django/archive/master.tar.gz
     postgis: psycopg2
     nose