Package upgrades & switch to environs

Author: marksweb

.environment-example renamed to .env-example

@@ -1,5 +1,6 @@
-# copy this file's contents into .environment and amend as required
+# copy this file's contents into .env and amend as required
 
+export PYTHONDEVMODE=0
 export DJANGO_SETTINGS_MODULE="project.settings"
 export CLEAN_PYC="yes"
 

docker-compose.yml

@@ -42,7 +42,7 @@ services:
       target: app
 
   nginx:
-    image: public.ecr.aws/s1h1q3x3/django-nginx:1.18.0
+    image: nginx:1.18.0
     depends_on:
       - python
     environment:

manage.py

@@ -2,9 +2,12 @@
 """Django's command-line utility for administrative tasks."""
 import os
 import sys
+from pathlib import Path
 
-from dotenv import load_dotenv, find_dotenv
-load_dotenv(find_dotenv(filename='.environment'))
+from environs import Env
+
+env = Env()
+env.read_env()
 
 
 def main():
@@ -26,6 +29,20 @@ def main():
         os.system(cmd)
         # sys.stdout.write('done\n\n')
 
+    try:
+        import pip_lock
+    except ImportError:
+        raise ImportError(
+            "Couldn't import pip-lock. Are you on the right virtualenv and up "
+            + "to date?"
+        )
+
+    requirements_path = str(Path(__file__).parent / "requirements.txt")
+    pip_lock.check_requirements(
+        requirements_path,
+        post_text="\nRun the following:\n\npip-sync\n",
+    )
+
     execute_from_command_line(sys.argv)
 
 

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "cms-playground",
-  "description": "Project for trying out new things around django cms 4 and AWS",
+  "name": "django-cms-4",
+  "description": "Project for trying out new things around django cms 4",
   "version": "0.0.1",
   "repository": {
     "type": "git",
-    "url": "https://git-codecommit.eu-west-2.amazonaws.com/v1/repos/cms_playground"
+    "url": "https://github.com/marksweb/django-cms-4"
   },
   "keywords": [
     "django",

project/settings.py

@@ -11,7 +11,7 @@
 """
 import os
 
-from .utils.sanitize import sanitize
+from environs import Env
 
 
 def gettext(s):
@@ -21,7 +21,7 @@ def gettext(s):
     return s
 
 
-env = os.environ.get
+env = Env()
 
 # ***** PATHS *****
 
@@ -35,8 +35,8 @@ def gettext(s):
 RELEASE_NUMBER = __import__('project').VERSION
 VERSION = RELEASE_NUMBER
 
-DEBUG = sanitize(env('DEBUG', 'no'), bool)
-BUILD_ENV = sanitize(env('BUILD_ENV', 'no'), bool)
+DEBUG = env.bool('DEBUG', 'no')
+BUILD_ENV = env.bool('BUILD_ENV', 'no')
 WSGI_APPLICATION = 'project.wsgi.application'
 ROOT_URLCONF = 'project.urls'
 
@@ -55,19 +55,13 @@ def gettext(s):
 
 REFERRER_POLICY = 'strict-origin'
 
-CSRF_COOKIE_SECURE = sanitize(env('CSRF_COOKIE_SECURE', False), bool)
-SESSION_COOKIE_SECURE = sanitize(env('SESSION_COOKIE_SECURE', False), bool)
+CSRF_COOKIE_SECURE = env.bool('CSRF_COOKIE_SECURE', False)
+SESSION_COOKIE_SECURE = env.bool('SESSION_COOKIE_SECURE', False)
 
-SECURE_BROWSER_XSS_FILTER = sanitize(
-    env('SECURE_BROWSER_XSS_FILTER', False), bool
-)
-SECURE_CONTENT_TYPE_NOSNIFF = sanitize(
-    env('SECURE_CONTENT_TYPE_NOSNIFF', False), bool
-)
-SECURE_HSTS_SECONDS = sanitize(env('SECURE_HSTS_SECONDS', 31536000), int)
-SECURE_HSTS_INCLUDE_SUBDOMAINS = sanitize(
-    env('SECURE_HSTS_INCLUDE_SUBDOMAINS', False), bool
-)
+SECURE_BROWSER_XSS_FILTER = env.bool('SECURE_BROWSER_XSS_FILTER', False)
+SECURE_CONTENT_TYPE_NOSNIFF = env.bool('SECURE_CONTENT_TYPE_NOSNIFF', False)
+SECURE_HSTS_SECONDS = env.int('SECURE_HSTS_SECONDS', 31536000)
+SECURE_HSTS_INCLUDE_SUBDOMAINS = env.bool('SECURE_HSTS_INCLUDE_SUBDOMAINS', False)
 
 # Application definition
 
@@ -294,7 +288,7 @@ def gettext(s):
 
 # ***** DEBUG TOOLBAR *****
 
-DEBUG_TOOLBAR = DEBUG and env('DEBUG_TOOLBAR', 'no') == 'yes'
+DEBUG_TOOLBAR = DEBUG and env.bool('DEBUG_TOOLBAR', 'no')
 
 if DEBUG_TOOLBAR:
     INTERNAL_IPS = [

project/utils/__init__.py

@@ -1,18 +1,19 @@
 cryptography<3.4
-django
+django<4.0
 django-apptemplates
--e git://github.com/django-cms/django-cms.git@release/4.0.x#egg=django-cms
-https://github.com/ojii/django-app-manage/archive/65da18ef234a4e985710c2c0ec760023695b40fe.zip#egg=django-app-manage
-https://github.com/divio/djangocms-text-ckeditor/archive/support/4.0.x.zip
+-e git://github.com/django-cms/django-cms.git@develop-4#egg=django-cms
+-e git://github.com/django-cms/djangocms-text-ckeditor.git@support/4.0.x#egg=djangocms-text-ckeditor
 django-extensions
 django-filer>=1.3
 django-storages[boto3]
 https://github.com/divio/djangocms-alias/tarball/master#egg=djangocms-alias
--e git://github.com/divio/djangocms-url-manager.git@0.0.11#egg=djangocms-url-manager
-https://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning
--e git://github.com/FidelityInternational/djangocms-pageadmin.git@0.0.14#egg=djangocms-pageadmin
--e git://github.com/FidelityInternational/djangocms-version-locking.git@0.0.14#egg=djangocms-version-locking
+-e git://github.com/Aiky30/djangocms-url-manager.git@feature/django-32-compat#egg=djangocms-url-manager
+https://github.com/django-cms/djangocms-versioning/tarball/master#egg=djangocms-versioning
+-e git://github.com/FidelityInternational/djangocms-pageadmin.git@1.0.0#egg=djangocms-pageadmin
+-e git://github.com/FidelityInternational/djangocms-version-locking.git@master#egg=djangocms-version-locking
 easy_thumbnails
+environs
+pip-lock
 psycopg2==2.8.6
 python-dotenv
 pytz