Merge remote-tracking branch 'upstream/devdev' into devdev

# Conflicts:
#	.github/workflows/deploy_on_dev.yml

Author: golony6449

.github/workflows/deploy_on_dev.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -42,17 +42,18 @@ jobs:
 
       - name: Create Virtualenv
         run: |
-          virtualenv pyconweb2022-zappa
+          virtualenv zappa-env
 
       # - name: Activate Virtualenv
       #   run: |
-      #     source ./pyconweb2022-zappa/bin/activate
+      #     source ./zappa-env/bin/activate
 
       - name: Install dependencies
         run: |
-          source ./pyconweb2022-zappa/bin/activate
+          source ./zappa-env/bin/activate
           python -m pip install --upgrade pip
           pip install pytest
+          pip install zappa
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       # Pull request dose not get the gitub action secrets
@@ -65,18 +66,18 @@ jobs:
 
       - name: update pyconkr-secretes
         run: |
-          ./update_secrets.sh
+          chmod 775 ./update_secrets.sh
+         ./update_secrets.sh
 
       - name: Test with Django Test
         run: |
-          source ./pyconweb2022-zappa/bin/activate
-          cd pyconweb2022
+          source ./zappa-env/bin/activate
           python manage.py test
 
-      - name: Test with pytest
-        run: |
-          source ./pyconweb2022-zappa/bin/activate
-          pytest pyconweb2022
+#      - name: Test with pytest
+#        run: |
+#          source ./zappa-env/bin/activate
+#          pytest pyconweb2022
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -90,7 +91,6 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2021_AWS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2021_AWS_SECRET }}
         run: |
-          source ./pyconweb2022-zappa/bin/activate
-          cd pyconweb2022
-          zappa update dev
+          source ./zappa-env/bin/activate
+          zappa update dev2023
 #          zappa manage dev collectstatic

.github/workflows/pull-request-merge-precondition.yml

@@ -0,0 +1,17 @@
+name: Pull Request Merge Precondition
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"

pyconkr/settings-dev.py

@@ -13,3 +13,10 @@
         "PORT": os.getenv("AWS_RDS_PORT"),
     }
 }
+
+# django-storages: S3
+DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage"
+AWS_S3_ACCESS_KEY_ID = os.getenv("AWS_S3_ACCESS_KEY_ID")
+AWS_S3_SECRET_ACCESS_KEY = os.getenv("AWS_S3_SECRET_ACCESS_KEY")
+AWS_STORAGE_BUCKET_NAME = "pyconkr-api-v2-static-dev"

pyconkr/settings-prod.py

@@ -13,3 +13,10 @@
         "PORT": os.getenv("AWS_RDS_PORT"),
     }
 }
+
+# django-storages: S3
+DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage"
+AWS_S3_ACCESS_KEY_ID = os.getenv("AWS_S3_ACCESS_KEY_ID")
+AWS_S3_SECRET_ACCESS_KEY = os.getenv("AWS_S3_SECRET_ACCESS_KEY")
+AWS_STORAGE_BUCKET_NAME = "pyconkr-api-v2-static"

pyconkr/settings.py

@@ -37,7 +37,6 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-
     # djangorestframework
     "rest_framework",
 ]
@@ -106,16 +105,16 @@
 # Internationalization
 # https://docs.djangoproject.com/en/4.1/topics/i18n/
 
-LANGUAGE_CODE = "en-us"
+LANGUAGE_CODE = "ko-KR"
 
-TIME_ZONE = "UTC"
+TIME_ZONE = "Asia/Seoul"
 
 USE_I18N = True
 
 USE_TZ = True
 
 
-# Static files (CSS, JavaScript, Images)
+# Static files (CSS, JavaScript, Images) (w/ django-storages)
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
 STATIC_URL = "static/"

pyconkr/urls.py

@@ -17,6 +17,6 @@
 from django.urls import path, include
 
 urlpatterns = [
-    path('api-auth/', include('rest_framework.urls')),
+    path("api-auth/", include("rest_framework.urls")),
     path("admin/", admin.site.urls),
 ]

requirements.txt

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# REPO_BASE_URL="github.com/pythonkr/pyconkr-secrets.git"
+# REPO_URL="https://${REPO_BASE_URL}"
+REPO_URL="[email protected]:pythonkr/pyconkr-secrets.git"
+
+# checkout repo from github
+mkdir -p .temp
+pushd .temp
+git clone --depth=1 ${REPO_URL}
+rsync -arv ./pyconkr-secrets/pyconkr-api-v2/ ..
+popd
+rm -rf ./.temp