From 613e50c488315dc74f0a94178f0b68910b39b542 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 21 May 2020 16:24:44 +0200 Subject: [PATCH] Rebuild of Django project --- manage.py | 19 +++++++++++++++---- project/settings.py | 18 +++++++++--------- project/urls.py | 28 +++++++++++++++++++--------- wsgi.py => project/wsgi.py | 6 +++--- 4 files changed, 46 insertions(+), 25 deletions(-) rename wsgi.py => project/wsgi.py (58%) diff --git a/manage.py b/manage.py index 82cfa83..364337c 100755 --- a/manage.py +++ b/manage.py @@ -1,10 +1,21 @@ #!/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", "project.settings") - - from django.core.management import execute_from_command_line +def main(): + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'project.settings') + try: + from django.core.management import execute_from_command_line + 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() diff --git a/project/settings.py b/project/settings.py index 8855547..9d3186e 100644 --- a/project/settings.py +++ b/project/settings.py @@ -1,13 +1,13 @@ """ Django settings for this project. -Generated by 'django-admin startproject' using Django 1.11.6. +Generated by 'django-admin startproject' using Django 2.2.12. For more information on this file, see -https://docs.djangoproject.com/en/1.11/topics/settings/ +https://docs.djangoproject.com/en/2.2/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.11/ref/settings/ +https://docs.djangoproject.com/en/2.2/ref/settings/ """ import os @@ -17,7 +17,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.11/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! # The SECRET_KEY is provided via an environment variable in OpenShift @@ -76,11 +76,11 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'wsgi.application' +WSGI_APPLICATION = 'project.wsgi.application' # Database -# https://docs.djangoproject.com/en/1.11/ref/settings/#databases +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases from . import database @@ -90,7 +90,7 @@ DATABASES = { # Password validation -# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -109,7 +109,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization -# https://docs.djangoproject.com/en/1.11/topics/i18n/ +# https://docs.djangoproject.com/en/2.2/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -123,7 +123,7 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.11/howto/static-files/ +# https://docs.djangoproject.com/en/2.2/howto/static-files/ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') diff --git a/project/urls.py b/project/urls.py index 5c6a8e3..87c399e 100644 --- a/project/urls.py +++ b/project/urls.py @@ -1,17 +1,27 @@ -from django.conf import settings -from django.conf.urls import include, url +"""project URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/2.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 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: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" from django.contrib import admin +from django.urls import path from welcome.views import index, health urlpatterns = [ - # Examples: - # url(r'^$', 'project.views.home', name='home'), - # url(r'^blog/', include('blog.urls')), - - url(r'^$', index), - url(r'^health$', health), - url(r'^admin/', include(admin.site.urls)), + path('', index, name='home'), + path('health/', health), + path('admin/', admin.site.urls), ] if settings.DEBUG: diff --git a/wsgi.py b/project/wsgi.py similarity index 58% rename from wsgi.py rename to project/wsgi.py index 2ef9a16..88349e8 100644 --- a/wsgi.py +++ b/project/wsgi.py @@ -1,16 +1,16 @@ """ -WSGI config for project project. +WSGI config for this 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.11/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/ """ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'project.settings') application = get_wsgi_application()