From 27d56ee87be942ec435df44857222ba1761c7d82 Mon Sep 17 00:00:00 2001 From: Victor Rezende dos Santos Date: Tue, 1 May 2018 12:46:50 -0300 Subject: [PATCH] Update Dependencies * Updated etesync/journal-manager to v0.5.2 * Updated Django to 2.0.5 - Updated documentation links - Changed syntax and imports of `urls.py` * Updated Django REST Framework to 3.8.2 * Updated DFR Nested Routers to 0.90.2 --- etesync_server/settings.py | 24 ++++++++++++------------ etesync_server/urls.py | 22 +++++++++++----------- etesync_server/wsgi.py | 2 +- requirements.txt | 8 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/etesync_server/settings.py b/etesync_server/settings.py index fe65225..bc44337 100644 --- a/etesync_server/settings.py +++ b/etesync_server/settings.py @@ -1,13 +1,13 @@ """ Django settings for etesync_server project. -Generated by 'django-admin startproject' using Django 1.10.6. +Generated by 'django-admin startproject' using Django 2.0.5. For more information on this file, see -https://docs.djangoproject.com/en/1.10/topics/settings/ +https://docs.djangoproject.com/en/2.0/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.10/ref/settings/ +https://docs.djangoproject.com/en/2.0/ref/settings/ """ import os @@ -18,7 +18,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! # See secret.py for how this is generated; uses a file 'secret.txt' in the root @@ -77,7 +77,7 @@ WSGI_APPLICATION = 'etesync_server.wsgi.application' # Database -# https://docs.djangoproject.com/en/1.10/ref/settings/#databases +# https://docs.djangoproject.com/en/2.0/ref/settings/#databases DATABASES = { 'default': { @@ -89,26 +89,26 @@ DATABASES = { # Password validation -# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', # noqa + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', }, { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', # noqa + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', }, { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', # noqa + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', }, { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', # noqa + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', }, ] # Internationalization -# https://docs.djangoproject.com/en/1.10/topics/i18n/ +# https://docs.djangoproject.com/en/2.0/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -122,7 +122,7 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.10/howto/static-files/ +# https://docs.djangoproject.com/en/2.0/howto/static-files/ STATIC_URL = '/static/' diff --git a/etesync_server/urls.py b/etesync_server/urls.py index ebde04a..c76d88e 100644 --- a/etesync_server/urls.py +++ b/etesync_server/urls.py @@ -1,19 +1,19 @@ """etesync_server URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.10/topics/http/urls/ + https://docs.djangoproject.com/en/2.0/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') + 2. Add a URL to urlpatterns: path('', views.home, name='home') Class-based views 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') Including another URLconf - 1. Import the include() function: from django.conf.urls import url, include - 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.conf.urls import include, url +from django.urls import include, path, re_path from django.contrib import admin from rest_framework_nested import routers @@ -32,9 +32,9 @@ journals_router.register(r'entries', views.EntryViewSet, base_name='journal-entr urlpatterns = [ - url(r'^api/v1/', include(router.urls)), - url(r'^api/v1/', include(journals_router.urls)), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), - url(r'^api-token-auth/', token_views.obtain_auth_token), - url(r'^admin/', admin.site.urls), + re_path(r'^api/v1/', include(router.urls)), + re_path(r'^api/v1/', include(journals_router.urls)), + re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), + re_path(r'^api-token-auth/', token_views.obtain_auth_token), + path('admin/', admin.site.urls), ] diff --git a/etesync_server/wsgi.py b/etesync_server/wsgi.py index eeb40bc..6738999 100644 --- a/etesync_server/wsgi.py +++ b/etesync_server/wsgi.py @@ -4,7 +4,7 @@ WSGI config for etesync_server project. It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/2.0/howto/deployment/wsgi/ """ import os diff --git a/requirements.txt b/requirements.txt index 78f52df..03d8859 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django>=1.11,<1.11.999 -djangorestframework>=3.7,<3.7.999 -drf-nested-routers==0.90.0 +Django>=2.0.5,<2.0.999 +djangorestframework>=3.8.2,<3.8.999 +drf-nested-routers==0.90.2 pytz -git+git://github.com/etesync/journal-manager@v0.4.1 +git+git://github.com/etesync/journal-manager@v0.5.2