upgrade django3 and python3.8

Author: twtrubiks

README.en.md

@@ -346,7 +346,7 @@ The terminal output is also fine ( though it is easy to get stuck here :sweat_sm
 
 ![](https://i.imgur.com/RBW8eQt.png)
 
-Next, open another terminal and go into the api ( Django + uWSGI ) container. 
+Next, open another terminal and go into the api ( Django + uWSGI ) container.
 
 You can find the steps in the previous [docker-tutorial-指令介紹](https://github.com/twtrubiks/docker-tutorial#指令介紹)，
 
@@ -490,8 +490,9 @@ If you are still learning to read, read more :satisfied:
 ## Environment
 
 * Mac
-* Python 3.6.2
+* Python 3.8.2
 * windows 10
+* Liunx
 
 ## Reference
 

README.md

@@ -656,7 +656,7 @@ django 上可以設定 CORS，透過 django-cors-headers 方法可參考 [文章
 ## 執行環境
 
 * Mac
-* Python 3.6.2
+* Python 3.8.2
 * windows 10
 
 ## Reference

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.2
+FROM python:3.8.2
 LABEL maintainer twtrubiks
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /docker_api

api/django_rest_framework_tutorial/asgi.py

@@ -0,0 +1,14 @@
+"""
+ASGI config for django_rest_framework_tutorial project.
+It exposes the ASGI callable as a module-level variable named ``application``.
+For more information on this file, see
+https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_rest_framework_tutorial.settings')
+
+application = get_asgi_application()

api/django_rest_framework_tutorial/settings.py

@@ -1,19 +1,19 @@
 """
 Django settings for django_rest_framework_tutorial project.
 
-Generated by 'django-admin startproject' using Django 1.10.6.
+Generated by 'django-admin startproject' using Django 3.2.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.10/topics/settings/
+https://docs.djangoproject.com/en/3.2/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/3.2/ref/settings/
 """
 
-import os
+from pathlib import Path
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 
 # Quick-start development settings - unsuitable for production
@@ -62,6 +62,7 @@
 # Application definition
 
 INSTALLED_APPS = [
+    'musics.apps.MusicsConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -70,7 +71,6 @@
     'django.contrib.staticfiles',
     'corsheaders', # django-cors-headers
     'rest_framework',
-    'musics',
 ]
 
 MIDDLEWARE = [
@@ -89,8 +89,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates')]
-        ,
+        'DIRS': [],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -107,7 +106,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
 # DATABASES = {
 #     'default': {
@@ -129,7 +128,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -148,11 +147,11 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.10/topics/i18n/
+# https://docs.djangoproject.com/en/3.2/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Asia/Taipei'
 
 USE_I18N = True
 
@@ -162,8 +161,11 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.10/howto/static-files/
+# https://docs.djangoproject.com/en/3.2/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
-# MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

api/django_rest_framework_tutorial/urls.py

@@ -1,28 +1,30 @@
 """django_rest_framework_tutorial 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/3.2/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 url, include
 from django.contrib import admin
+from django.urls import include, path
 from rest_framework.routers import DefaultRouter
-from musics import views
+from musics.views import MusicViewSet
 
 router = DefaultRouter()
-router.register(r'music', views.MusicViewSet, base_name='music')
+router.register('musics', MusicViewSet)
+
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^api/', include(router.urls, namespace='api'), name='api'),
-    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
-]
+    # path('admin/', admin.site.urls),
+    # for rest_framework
+    path('api/', include(router.urls)),
+    # for rest_framework auth
+    path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
+]

api/django_rest_framework_tutorial/wsgi.py

@@ -1,16 +1,14 @@
 """
 WSGI config for django_rest_framework_tutorial 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/3.2/howto/deployment/wsgi/
 """
 
 import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_rest_framework_tutorial.settings")
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_rest_framework_tutorial.settings')
 
-application = get_wsgi_application()
+application = get_wsgi_application()

api/docker-entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+echo 'Run migration'
+python3 manage.py makemigrations musics
+python3 manage.py migrate
+echo 'Create Super User'
+python3 manage.py createsuperuser --noinput || echo "Super user already created"
+exec "$@"

api/manage.py

@@ -1,22 +1,22 @@
 #!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
 import os
 import sys
 
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_rest_framework_tutorial.settings")
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_rest_framework_tutorial.settings')
     try:
         from django.core.management import execute_from_command_line
-    except ImportError:
-        # The above import may fail for some other reason. Ensure that the
-        # issue is really that Django is missing to avoid masking other
-        # exceptions on Python 2.
-        try:
-            import django
-        except ImportError:
-            raise ImportError(
-                "Couldn't import Django. Are you sure it's installed and "
-                "available on your PYTHONPATH environment variable? Did you "
-                "forget to activate a virtual environment?"
-            )
-        raise
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
     execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()

api/musics/apps.py

@@ -2,4 +2,5 @@
 
 
 class MusicsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'musics'

api/musics/tests.py

@@ -1,87 +1,3 @@
-# Create your tests here.
-from django.contrib.auth.models import User
-from rest_framework import status
-from rest_framework.reverse import reverse
-from rest_framework.test import APITestCase, APIClient
+from django.test import TestCase
 
-from musics.models import Music
-
-
-class MusicViewTestCase(APITestCase):
-    url_reverse = reverse('api:music-list')
-    url = '/api/music/'
-    url_detail = '/api/music/{}/'
-    url_detail_route_reverse = reverse('api:music-detail', kwargs={"pk": 1})
-    url_detail_route = '/api/music/{}/detail/'
-    url_list_route = '/api/music/all_singer/'
-
-    def setUp(self):
-        print('setUp')
-
-        self.client = APIClient()
-        # create user
-        User.objects.create_user(username='test_user', password='password123')
-
-        self.client.login(username='test_user', password='password123')
-
-        self.request_data = {
-            'song': 'song_test',
-            'singer': 'singer_test'
-        }
-
-        self.music = Music.objects.create(song='song_test', singer='singer_test')
-
-    def test_api_music_create(self):
-        print('test_api_music_create')
-        self.response = self.client.post(
-            self.url,
-            self.request_data,
-            format="json"
-        )
-        self.assertEqual(self.response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(Music.objects.count(), 2)
-        self.assertEqual(Music.objects.get(pk=self.music.id).song, 'song_test')
-        self.assertEqual(Music.objects.get(pk=self.music.id).singer, 'singer_test')
-
-    def test_api_music_retrieve(self):
-        print('test_api_music_retrieve')
-        music = Music.objects.get(pk=self.music.id)
-        response = self.client.get(self.url_detail.format(self.music.id))
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data.get('song', None), music.song)
-        self.assertEqual(response.data.get('singer', None), music.singer)
-
-    def test_api_music_partial_update(self):
-        print('test_api_music_partial_update')
-        update_song = {'song': 'song_update'}
-        response = self.client.patch(self.url_detail.format(self.music.id), update_song, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data.get('song', None), update_song.get('song', None))
-
-    def test_api_music_update(self):
-        print('test_api_music_update')
-        update_song = {'song': 'song_update', 'singer': 'singer_update'}
-        response = self.client.put(self.url_detail.format(self.music.id), update_song, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data.get('song', None), update_song.get('song'))
-        self.assertEqual(response.data.get('singer', None), update_song.get('singer'))
-
-    def test_api_music_delete(self):
-        print('test_api_music_delete')
-        response = self.client.delete(self.url_detail.format(self.music.id))
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-
-    def test_api_music_detail_route(self):
-        print('test_api_music_detail_route')
-        music = Music.objects.get(pk=self.music.id)
-        response = self.client.get(self.url_detail_route.format(self.music.id))
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data.get('song', None), music.song)
-        self.assertEqual(response.data.get('singer', None), music.singer)
-
-    def test_api_music_list_route(self):
-        print('test_api_music_list_route')
-        music = Music.objects.values_list('singer', flat=True).distinct()
-        response = self.client.get(self.url_list_route)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(next(iter(response.data)), next(iter(music)))
+# Create your tests here.