fix start-django-project

.github/workflows/ci_cd.yaml

@@ -15,7 +15,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Create New Django Project
-        run: if [ -x ./setup/set-new-django-project.bash ]; then echo "test_project" | ./setup/set-new-django-project.bash; fi;
+        run: if [ -x ./setup/set-new-django-project.bash ]; then echo "test_project" | make init; fi;
 
       - name: Install requirements
         run: make install

Makefile

@@ -9,11 +9,7 @@ CD=${ACTIVATE} cd ./${PROJECT_NAME} &&
 
 main: run
 
-init: venv run-setup install
-
-
-run-setup:
-	${ACTIVATE} pip3 install Django==3.2
+init:
 	@sed -i -e 's/\r$$//' ./setup/set-new-django-project.bash
 	@./setup/set-new-django-project.bash
 

setup/requirements.txt

@@ -5,7 +5,8 @@ django-storages==1.12.3
 django-debug-toolbar==3.2.4
 dj-database-url==0.5.0
 Pillow==9.1.1
-psycopg2==2.9.3
+python-dotenv==1.0.0
+psycopg2-binary==2.9.3
 
 # REST
 djangorestframework==3.13.1
@@ -23,6 +24,3 @@ qrcode==7.3.1
 
 # captcha
 django-simple-captcha==0.5.17
-
-# wagtail==3.0.1
-# psycopg2-binary==2.9.3

setup/set-new-django-project.bash

@@ -11,9 +11,15 @@ read name
 
 
 start-django-project() {
-	django-admin startproject ${name}
+	if [ ! -d ~/.venv/${name} ]; then python3 -m venv ~/.venv/${name}; fi;
+
+	source ~/.venv/${name}/bin/activate
 
 	mv ./setup/requirements.txt ./requirements.txt
+
+	pip3 install -r ./requirements.txt
+
+	django-admin startproject ${name}
 }
 
 

setup/settings/main.py

@@ -1,15 +1,16 @@
 from pathlib import Path
 from django.urls import reverse_lazy
+from dotenv import dotenv_values
 
 from .base import *
 from .third_party.rest_framework import *
 
-import os
 
+DOTENV_CONFIG = dotenv_values(".env")
 
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
-SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
+SECRET_KEY = DOTENV_CONFIG["DJANGO_SECRET_KEY"]
 
 # DEBUG = os.getenv('DJANGO_DEBUG', False) in (True, 'True')
 
@@ -101,7 +102,7 @@
 
 EMAIL_HOST_USER = "info@gmail.com"
 
-EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
+EMAIL_HOST_PASSWORD = DOTENV_CONFIG.get('EMAIL_HOST_PASSWORD')
 
 EMAIL_PORT = 587
 
@@ -120,6 +121,6 @@
 
 SMS_BASE_URL = "https://api.taqnyat.sa/v1/messages"
 
-SMS_TOKEN = os.environ.get('SMS_TOKEN')
+SMS_TOKEN = DOTENV_CONFIG.get('SMS_TOKEN')
 
 SMS_DEFAULT_FROM = "django"

setup/settings/third_party/django_storages.py

@@ -1,16 +1,18 @@
-import os
+from dotenv import dotenv_values
 
 
+DOTENV_CONFIG = dotenv_values(".env")
+
 AWS_S3_FILE_OVERWRITE = False
 
 # DEFAULT_FILE_STORAGE = 'utilities.storages.PrivateMediaStorage'
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
 
 STATICFILES_STORAGE = 'storages.backends.s3boto3.S3StaticStorage'
 
-AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID')
+AWS_ACCESS_KEY_ID = DOTENV_CONFIG.get('AWS_ACCESS_KEY_ID')
 
-AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
+AWS_SECRET_ACCESS_KEY = DOTENV_CONFIG.get('AWS_SECRET_ACCESS_KEY')
 
 AWS_STORAGE_BUCKET_NAME = 'project-name'
 

setup/settings/third_party/rest_framework.py

@@ -1,7 +1,8 @@
 from datetime import timedelta
+from dotenv import dotenv_values
 
-import os
 
+DOTENV_CONFIG = dotenv_values(".env")
 
 REST_FRAMEWORK = {
     'DEFAULT_RENDERER_CLASSES': (
@@ -40,7 +41,7 @@
 
 
 SIMPLE_JWT = {
-    "SIGNING_KEY": os.environ.get("REST_SIGNING_KEY"),
+    "SIGNING_KEY": DOTENV_CONFIG["REST_SIGNING_KEY"],
     "ALGORITHM": "HS512",
     "ACCESS_TOKEN_LIFETIME": timedelta(minutes=5),
     "REFRESH_TOKEN_LIFETIME": timedelta(days=1),
@@ -49,6 +50,3 @@
     # 'USER_ID_FIELD': 'username',
     # 'USER_ID_CLAIM': 'my_user_name',
 }
-
-if not SIMPLE_JWT.get("SIGNING_KEY", None):
-    raise ValueError("The SIGNING_KEY setting must not be empty.")