Merge pull request #35 from xjlin0/1.1

1.1

README.md

@@ -379,7 +379,8 @@ DJANGO_DEFAULT_FROM_EMAIL=<<your email>>
 EMAIL_HOST=sendgrid
 ```
 * Install and start [docker desktop](https://www.docker.com/products/docker-desktop) (including docker compose), and [add local repo directory to file sharing in docker desktop preference](https://docs.docker.com/desktop/settings/mac/#file-sharing).
-* build and start the CentOS based local machine by `docker-compose -f local.yml build && docker-compose -f local.yml up -d`, your site will be at http://0.0.0.0:8008/
+* In Docker Desktop Settings, please ensure both "Use Virtualization framework" and "Use Rosetta for x86_64/amd64 emulation on Apple Silicon" options in enabled.
+* build and start the Debian based local machine by `docker-compose -f local.yml build && docker-compose -f local.yml up -d`, your site will be at http://0.0.0.0:8008/
 * to see django log: `docker-compose -f local.yml logs django`
 * enter Redis-CLI by `docker exec -it redis redis-cli`
 

compose/production/postgres/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgis/postgis:13-3.2
+FROM postgis/postgis:13-3.4
 
 COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance
 RUN chmod +x /usr/local/bin/maintenance/*

fixtures/db_seed.json

@@ -1858,7 +1858,7 @@
       "expire_seconds": null,
       "one_off": false,
       "start_time": "2020-08-27T22:37:02Z",
-      "enabled": true,
+      "enabled": false,
       "last_run_at": null,
       "total_run_count": 0,
       "date_changed": "2021-08-28T18:59:47.395Z",
@@ -1886,7 +1886,7 @@
       "expire_seconds": null,
       "one_off": false,
       "start_time": "2020-08-27T22:37:02Z",
-      "enabled": true,
+      "enabled": false,
       "last_run_at": null,
       "total_run_count": 0,
       "date_changed": "2021-08-28T18:59:47.395Z",

local.yml

@@ -6,6 +6,7 @@ volumes:
 
 services:
   django: &django
+    platform: linux/amd64
     build:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
@@ -26,6 +27,7 @@ services:
     command: /start
 
   postgres:
+    platform: linux/amd64
     build:
       context: .
       dockerfile: ./compose/production/postgres/Dockerfile
@@ -38,6 +40,7 @@ services:
       - ./.envs/.local/.postgres
 
   docs:
+    platform: linux/amd64
     image: attendees_local_docs
     container_name: docs
     build:
@@ -54,12 +57,14 @@ services:
     command: /start-docs
 
   mailhog:
+    platform: linux/amd64
     image: mailhog/mailhog:v1.0.0
     container_name: mailhog
     ports:
       - "8025:8025"
 
   redis:
+    platform: linux/amd64
     image: redis:6
     container_name: redis
 

requirements/base.txt

@@ -3,14 +3,14 @@ python-slugify==7.0.0  # https://github.com/un33k/python-slugify
 Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
-whitenoise==6.2.0  # https://github.com/evansd/whitenoise
-redis==4.4.0  # https://github.com/redis/redis-py
-hiredis==2.0.0  # https://github.com/redis/hiredis-py
-celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.4.0  # https://github.com/celery/django-celery-beat
-flower==1.2.0  # https://github.com/mher/flower
-uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
-psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
+whitenoise==6.4.0  # https://github.com/evansd/whitenoise
+redis==4.4.4  # https://github.com/redis/redis-py
+hiredis==2.1.1  # https://github.com/redis/hiredis-py
+celery==5.3.1  # pyup: < 6.0  # https://github.com/celery/celery
+django-celery-beat==2.4.0  # https://github.com/celery/django-celery-beat  # 2.5.0 will need new crontabschedule migration
+flower==2.0.1  # https://github.com/mher/flower
+uvicorn[standard]==0.29.0  # https://github.com/encode/uvicorn
+psycopg2==2.9.9  # https://github.com/psycopg/psycopg2
 unidecode==1.3.2
 opencc==1.1.3  ## https://github.com/BYVoid/OpenCC
 # opencc-python-reimplemented==0.1.6  ## https://github.com/yichen0831/opencc-python
@@ -20,31 +20,31 @@ opencc==1.1.3  ## https://github.com/BYVoid/OpenCC
 
 # django-summernote==0.8.20.0 # https://github.com/summernote/django-summernote
 # -e git+https://github.com/llazzaro/django-scheduler.git@develop#egg=django-scheduler
-django-scheduler==0.10.0  # https://github.com/llazzaro/django-scheduler
-django-mptt==0.13.4 # https://github.com/django-mptt/django-mptt
-django-json-widget==1.1.1  # https://github.com/jmrivas86/django-json-widget
-django-private-storage==3.0 # https://github.com/edoburu/django-private-storage
+django-scheduler==0.10.1  # https://github.com/llazzaro/django-scheduler
+django-mptt==0.14.0 # https://github.com/django-mptt/django-mptt
+django-json-widget==2.0.1  # https://github.com/jmrivas86/django-json-widget
+django-private-storage==3.1.1 # https://github.com/edoburu/django-private-storage
 # django-reversion==4.0.1 # https://github.com/etianen/django-reversion
-dateparser==1.1.1 # https://github.com/scrapinghub/dateparser
+dateparser==1.1.8 # https://github.com/scrapinghub/dateparser
 # sendgrid==6.9.3  # https://github.com/sendgrid/sendgrid-python
-django-anymail[sendgrid]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==10.3  # https://github.com/anymail/django-anymail
 django_partial_date==1.3.2  # https://github.com/ktowen/django_partial_date
-django-pghistory==2.4.1  # https://github.com/Opus10/django-pghistory
+django-pghistory==2.4.2  # https://github.com/Opus10/django-pghistory
 django-db-comments==0.4.1  # https://github.com/vanadium23/django-db-comments
-weasyprint==55.0  # https://github.com/Kozea/WeasyPrint
-django-weasyprint==2.1.0  # https://github.com/fdemmer/django-weasyprint
-GitPython==3.1.31  # https://github.com/gitpython-developers/GitPython
+# weasyprint==55.0  # https://github.com/Kozea/WeasyPrint
+# django-weasyprint==2.1.0  # https://github.com/fdemmer/django-weasyprint
+GitPython==3.1.43  # https://github.com/gitpython-developers/GitPython
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.16  # pyup: < 4.0  # https://www.djangoproject.com/
-django-environ==0.9.0  # https://github.com/joke2k/django-environ
-django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
+django==3.2.25  # pyup: < 4.0  # https://www.djangoproject.com/
+django-environ==0.11.1  # https://github.com/joke2k/django-environ
+django-model-utils==4.5.0  # https://github.com/jazzband/django-model-utils
+django-allauth==0.53.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 django-compressor==4.0  # https://github.com/django-compressor/django-compressor
-django-redis==5.2.0  # https://github.com/jazzband/django-redis
+django-redis==5.3.0  # https://github.com/jazzband/django-redis
 # Django REST Framework
-djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
+djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework  # 3.15 will have ImproperlyConfigured exception requiring unique basename for viewset
+django-cors-headers==3.14.0 # https://github.com/adamchainz/django-cors-headers