prepare 0.2.10

barseghyanartur · barseghyanartur · commit 90581a5e7bf9 · 2019-04-11T11:34:52.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 *.py,cover
 .idea/
 /vagrant/.vagrant/
+.pytest_cache/
 
 MANIFEST.in~
 MIND_BUCKET.rst
diff --git a/.hgignore b/.hgignore
@@ -11,6 +11,7 @@ syntax: regexp
 \.py,cover
 \.idea/
 ^vagrant/\.vagrant
+\.pytest_cache/
 
 ^MANIFEST\.in~
 ^tmp/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,16 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.2.10
+------
+2019-04-12
+
+- Tested against Django 2.1 and Django 2.2.
+- Tested against Python 3.7.
+- Dropping support for Python 3.4.
+- Upgrade test suite.
+- Temporary remove PyPy from tox (because of failing tests).
+
 0.2.9
 -----
 2018-02-03
diff --git a/LICENSE_GPL2.0.txt b/LICENSE_GPL2.0.txt
@@ -292,7 +292,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     django-rest-framework-tricks - Collection of various tricks for Django REST
                                    framework.
-    Copyright (C) 2017-2018 Artur Barseghyan
+    Copyright (C) 2017-2019 Artur Barseghyan
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/LICENSE_LGPL_2.1.txt b/LICENSE_LGPL_2.1.txt
@@ -472,7 +472,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     django-rest-framework-tricks - Collection of various tricks for Django REST
                                    framework.
-    Copyright (C) 2017-2018 Artur Barseghyan
+    Copyright (C) 2017-2019 Artur Barseghyan
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/README.rst b/README.rst
@@ -7,8 +7,8 @@ Collection of various tricks for
 Prerequisites
 =============
 
-- Django 1.8, 1.9, 1.10, 1.11 and 2.0.
-- Python 2.7, 3.4, 3.5, 3.6
+- Django 1.8, 1.9, 1.10, 1.11, 2.0, 2.1 and 2.2.
+- Python 2.7, 3.4, 3.5, 3.6, 3.7
 
 Dependencies
 ============
diff --git a/examples/requirements/base.txt b/examples/requirements/base.txt
@@ -1 +1 @@
--r django_1_10.txt
+-r django_2_2.txt
diff --git a/examples/requirements/common.txt b/examples/requirements/common.txt
@@ -1,5 +1,5 @@
-mysqlclient
-psycopg2
+#mysqlclient
+#psycopg2
 python-memcached==1.58
 pytz
 six>=1.9
diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
@@ -5,5 +5,4 @@ Django>=1.10,<1.11
 django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-ormex==0.2
-drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_11.txt b/examples/requirements/django_1_11.txt
@@ -5,5 +5,4 @@ Django>=1.11,<2.0
 django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-ormex==0.2
-drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
@@ -5,5 +5,4 @@ Django>=1.8,<1.9
 django-debug-toolbar==1.4
 django-debug-toolbar-force==0.1.1
 django-ormex==0.2
-drf-extensions==0.3.1
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
@@ -5,6 +5,5 @@ Django>=1.9,<1.10
 django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-ormex==0.2
-drf-extensions==0.3.1
 sqlparse==0.2.2
 
diff --git a/examples/requirements/django_2_0.txt b/examples/requirements/django_2_0.txt
@@ -6,5 +6,4 @@ django-debug-toolbar>=1.6
 django-debug-toolbar-force>=0.1.1
 django-ormex>=0.2
 djangorestframework==3.7.7
-drf-extensions>=0.3.1
 sqlparse>=0.2.2
diff --git a/examples/requirements/django_2_1.txt b/examples/requirements/django_2_1.txt
@@ -0,0 +1,9 @@
+-r common.txt
+-r test.txt
+
+Django>=2.1,<2.2
+django-debug-toolbar>=1.6
+django-debug-toolbar-force>=0.1.1
+django-ormex>=0.2
+djangorestframework==3.8.2
+sqlparse>=0.2.2
diff --git a/examples/requirements/django_2_2.txt b/examples/requirements/django_2_2.txt
@@ -0,0 +1,8 @@
+-r common.txt
+-r test.txt
+
+Django>=2.2,<2.3
+django-debug-toolbar>=1.6
+django-debug-toolbar-force>=0.1.1
+django-ormex>=0.2
+djangorestframework==3.9.2
diff --git a/examples/requirements/test.txt b/examples/requirements/test.txt
@@ -1,9 +1,9 @@
-Faker==0.7.17
-py==1.4.31
-pytest==3.0.2
-factory_boy==2.7.0
-fake-factory==0.7.2
-pytest-django==2.9.1
-pytest-cov==2.2.1
+factory_boy==2.11.1
+Faker==0.8.17
+py==1.5.4
+pytest-cov==2.5.1
+pytest-django==3.3.3
+pytest-ordering==0.5
+pytest==3.7.1
 selenium==2.53.6
-tox==2.3.1
+tox==3.1.2
diff --git a/examples/requirements/testing.txt b/examples/requirements/testing.txt
@@ -1,2 +1,2 @@
--r django_1_10.txt
+-r django_2_2.txt
 -r test.txt
diff --git a/examples/simple/books/urls.py b/examples/simple/books/urls.py
@@ -4,6 +4,8 @@
 
 from django.conf.urls import url, include
 
+from rest_framework.routers import DefaultRouter
+
 from .views import (
     AddAuthorsToBookView,
     AuthorListView,
@@ -30,55 +32,48 @@
     PublisherViewSet,
 )
 
-from nine.versions import DJANGO_GTE_2_0
-
-if DJANGO_GTE_2_0:
-    from .rest_framework_extensions_routers_compat import ExtendedDefaultRouter
-else:
-    from rest_framework_extensions.routers import ExtendedDefaultRouter
-
 __all__ = ('urlpatterns',)
 
 
-router = ExtendedDefaultRouter()
+router = DefaultRouter()
 
-books = router.register(
+router.register(
     r'books',
     BookViewSet,
     base_name='book'
 )
 
-proxy_books = router.register(
+router.register(
     r'proxy-books',
     BookProxyViewSet,
     base_name='bookproxy'
 )
 
-proxy2_books = router.register(
+router.register(
     r'proxy2-books',
     BookProxy2ViewSet,
     base_name='bookproxy2'
 )
 
-publishers = router.register(
+router.register(
     r'publishers',
     PublisherViewSet,
     base_name='publisher'
 )
 
-profiles = router.register(
+router.register(
     r'profiles',
     ProfileViewSet,
     base_name='profile'
 )
 
-authors = router.register(
+router.register(
     r'authors',
     AuthorViewSet,
     base_name='author'
 )
 
-proxy_authors = router.register(
+router.register(
     r'proxy-authors',
     AuthorProxyViewSet,
     base_name='authorproxy'
diff --git a/scripts/create_dirs.sh b/scripts/create_dirs.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mkdir -p examples/logs/
+mkdir -p examples/db/
+mkdir -p examples/tmp/
+mkdir -p var/
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 except:
     readme = ''
 
-version = '0.2.9'
+version = '0.2.10'
 
 install_requires = [
     'six>=1.9',
@@ -33,9 +33,9 @@
     long_description=readme,
     classifiers=[
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Environment :: Web Environment",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "License :: OSI Approved :: GNU Lesser General Public License v2 or "
diff --git a/src/rest_framework_tricks/__init__.py b/src/rest_framework_tricks/__init__.py
@@ -3,9 +3,9 @@
 """
 
 __title__ = 'django-rest-framework-tricks'
-__version__ = '0.2.9'
+__version__ = '0.2.10'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('default_app_config',)
 
diff --git a/src/rest_framework_tricks/apps.py b/src/rest_framework_tricks/apps.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.apps'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('Config',)
 
diff --git a/src/rest_framework_tricks/filters/__init__.py b/src/rest_framework_tricks/filters/__init__.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.filters'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'OrderingFilter',
diff --git a/src/rest_framework_tricks/filters/ordering.py b/src/rest_framework_tricks/filters/ordering.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.filters.ordering'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('OrderingFilter',)
 
diff --git a/src/rest_framework_tricks/models/fields/__init__.py b/src/rest_framework_tricks/models/fields/__init__.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.models.fields'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'NestedProxyField',
diff --git a/src/rest_framework_tricks/models/fields/nested_proxy.py b/src/rest_framework_tricks/models/fields/nested_proxy.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.models.fields.nested_proxy'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'NestedProxyField',
diff --git a/src/rest_framework_tricks/serializers/__init__.py b/src/rest_framework_tricks/serializers/__init__.py
@@ -6,7 +6,7 @@
 
 __title__ = 'rest_framework_tricks.serializers'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'extract_nested_serializers',
diff --git a/src/rest_framework_tricks/serializers/nested_proxy.py b/src/rest_framework_tricks/serializers/nested_proxy.py
@@ -44,7 +44,7 @@
 
 __title__ = 'rest_framework_tricks.serializers.nested_proxy'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'extract_nested_serializers',
diff --git a/src/rest_framework_tricks/tests/base.py b/src/rest_framework_tricks/tests/base.py
@@ -14,7 +14,7 @@
 
 __title__ = 'rest_framework_tricks.tests.base'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'BaseRestFrameworkTestCase',
diff --git a/src/rest_framework_tricks/tests/test_nested_proxy_field.py b/src/rest_framework_tricks/tests/test_nested_proxy_field.py
@@ -25,7 +25,7 @@
 
 __title__ = 'rest_framework_tricks.tests.test_nested_proxy_field'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'TestNestedProxyFieldCreateAction',
diff --git a/src/rest_framework_tricks/tests/test_ordering_filter.py b/src/rest_framework_tricks/tests/test_ordering_filter.py
@@ -25,7 +25,7 @@
 
 __title__ = 'rest_framework_tricks.tests.test_nested_proxy_field'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'TestOrderingFilter',
diff --git a/src/rest_framework_tricks/tests/test_utils.py b/src/rest_framework_tricks/tests/test_utils.py
@@ -15,7 +15,7 @@
 
 __title__ = 'rest_framework_tricks.tests.test_utils'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'TestUtils',
diff --git a/src/rest_framework_tricks/utils.py b/src/rest_framework_tricks/utils.py
@@ -7,7 +7,7 @@
 
 __title__ = 'rest_framework_tricks.utils'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = '2017-2018 Artur Barseghyan'
+__copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'DictProxy',
diff --git a/threadedtests.py b/threadedtests.py
@@ -30,5 +30,6 @@ def main():
         __process.start()
     return [__process.join() for __process in __processes]
 
+
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--r django_1_10.txt`
	`1`	`+-r django_2_2.txt`