upgrade to latest dcms v4 state

django-cms · Jun 14, 2022 · c35accd · c35accd
2 parents 30d1ff5 + fc177b2
commit c35accd
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 122 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,8 @@ docker compose up -d
 
 Then open http://django-cms-quickstart.127.0.0.1.nip.io:8000 (or just http://127.0.0.1:8000) in your browser.
 
+Note: Since Compose V2, `docker-compose` is now included inside docker. For more information, checkout the [Compose V2](https://docs.docker.com/compose/cli-command/) Documentation.
+
 ## Customising the project
 
 This project is ready-to-go without making any changes at all, but also gives you some options.

diff --git a/backend/settings.py b/backend/settings.py
@@ -55,31 +55,25 @@
 
     # the default alias content - optional, but used in most projects
     'djangocms_alias',
-    
+
     # the default CKEditor - optional, but used in most projects
     'djangocms_text_ckeditor',
 
-    # some content plugins - optional, but used in most projects
-    'djangocms_file',
-    'djangocms_icon',
-    'djangocms_link',
     'djangocms_url_manager',
+
     'djangocms_picture',
-    'djangocms_style',
-    'djangocms_googlemap',
-    'djangocms_video',
 
     # optional django CMS Bootstrap 4 modules
     'djangocms_bootstrap4',
     'djangocms_bootstrap4.contrib.bootstrap4_alerts',
     'djangocms_bootstrap4.contrib.bootstrap4_badge',
     'djangocms_bootstrap4.contrib.bootstrap4_card',
-    'djangocms_bootstrap4.contrib.bootstrap4_carousel',
+    # 'djangocms_bootstrap4.contrib.bootstrap4_carousel',  # TODO: remove hard-coded dependance on djangocms_link
     'djangocms_bootstrap4.contrib.bootstrap4_collapse',
     'djangocms_bootstrap4.contrib.bootstrap4_content',
     'djangocms_bootstrap4.contrib.bootstrap4_grid',
     'djangocms_bootstrap4.contrib.bootstrap4_jumbotron',
-    'djangocms_bootstrap4.contrib.bootstrap4_link',
+    # 'djangocms_bootstrap4.contrib.bootstrap4_link',  # TODO: remove hard-coded dependance on djangocms_link
     'djangocms_bootstrap4.contrib.bootstrap4_listgroup',
     'djangocms_bootstrap4.contrib.bootstrap4_media',
     'djangocms_bootstrap4.contrib.bootstrap4_picture',
@@ -215,3 +209,5 @@
 
 
 SITE_ID = 1
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   database_default:
     # Select one of the following db configurations for the database
-    image: postgres:9.6-alpine
+    image: postgres:13.5-alpine
     ports:
       - "5432:5432/tcp"  # allow your local dev env to connect to the db
     environment:

diff --git a/requirements.in b/requirements.in
@@ -1,54 +1,37 @@
 # Compile this file for changes to take effect:
 # pip-compile requirements.in >> requirements.txt
 
+boto3
+psycopg2
+uwsgi
 
-django<3.2  # 3.2 has dark admin theme which looks bad in custom django CMS admin views
-dj-database-url==0.5.0
-django-storage-url==0.5.0
-whitenoise==5.2.0
-boto3==1.14.49
-
-psycopg2==2.8.5
-
-uwsgi==2.0.19.1
+django<4  # django CMS 4 doesn't yet support django 4.x and 3.x is the LTS version
+dj-database-url
+django-storage-url
+whitenoise
+easy-thumbnails
 
 # key requirements for django CMS
-https://github.com/django-cms/django-cms/tarball/release/4.0.x#egg=django-cms
-https://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning  # FIXME: Requires an "official" V1 release
-https://github.com/divio/djangocms-alias/tarball/master#egg=djangocms-alias  # FIXME: Requires an "official" V1 release
-django-treebeard>=4.0,<5.0
-django-classy-tags>=2.0
-django-sekizai>=2.0
-six
-pytz
+https://github.com/django-cms/django-cms/archive/refs/heads/release/4.0.1.x.zip#egg=django-cms
+https://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning
+https://github.com/divio/djangocms-alias/tarball/master#egg=djangocms-alias
+djangocms-picture
 
 # optional, but used in most projects
-djangocms-admin-style>=2.0,<3.0
+djangocms-admin-style
 
 # the default CKEditor - optional, but used in most projects
-https://github.com/django-cms/django-cms/archive/refs/heads/develop-4.zip#egg=djangocms-text-ckeditor
-
-# some content plugins - optional, but used in most projects
+https://github.com/django-cms/djangocms-text-ckeditor/archive/refs/heads/support/4.0.x.zip#egg=djangocms-text-ckeditor
 
-# some content plugins - optional, but used in most projects
-djangocms-link>=3.0,<4.0
-# FIXME: Replaces djangocms-link, some packages are still sadly dependant ....
+# Replaces djangocms-link
 https://github.com/divio/djangocms-url-manager/tarball/master#egg=djangocms-url-manager
 
-djangocms-icon>=2.0,<3.0
-djangocms-style>=3.0,<4.0
-djangocms-googlemap>=2.0,<3.0
-djangocms-video>=3.0,<4.0
-djangocms-file>=3.0,<4.0
-
 
 # optional django CMS Bootstrap 4 modules
-djangocms-bootstrap4>=2.0,<3.0
-# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates
-# as of Q4 2021 there are still basic issues with djangocms-bootstrap5
-# https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5
+https://github.com/django-cms/djangocms-bootstrap4/archive/refs/heads/support/django-cms-4.0.x.zip
+
+
+django-filer
 
-# Django Filer - optional, but used in most projects (alpha)
-https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer
 
 pip-tools  # needed for compilation of this file into requirements.txt, see start of file
diff --git a/requirements.txt b/requirements.txt
@@ -4,179 +4,160 @@
 #
 #    pip-compile requirements.in
 #
-boto3==1.14.49
+asgiref==3.5.2
+    # via django
+boto3==1.24.8
     # via -r requirements.in
-botocore==1.17.63
+botocore==1.27.8
     # via
     #   boto3
     #   s3transfer
-click==8.0.3
+click==8.1.3
     # via pip-tools
-cssselect2==0.4.1
+cssselect2==0.6.0
     # via svglib
 dj-database-url==0.5.0
     # via -r requirements.in
-django==2.2.24
+django==3.2.13
     # via
     #   -r requirements.in
     #   django-classy-tags
+    #   django-filer
+    #   django-js-asset
     #   django-parler
-    #   django-sekizai
+    #   django-polymorphic
+    #   django-storage-url
     #   django-storages
     #   django-treebeard
     #   djangocms-alias
     #   djangocms-url-manager
     #   djangocms-versioning
     #   easy-thumbnails
-django-classy-tags==2.0.0
-    # via
-    #   -r requirements.in
-    #   django-sekizai
-django-cms @ https://github.com/django-cms/django-cms/tarball/release/4.0.x
+django-cms @ https://github.com/django-cms/django-cms/archive/refs/heads/release/4.0.1.x.zip
     # via
     #   -r requirements.in
     #   djangocms-alias
     #   djangocms-attributes-field
     #   djangocms-bootstrap4
-    #   djangocms-file
-    #   djangocms-googlemap
     #   djangocms-icon
     #   djangocms-link
     #   djangocms-picture
-    #   djangocms-style
-    #   djangocms-text-ckeditor
     #   djangocms-url-manager
     #   djangocms-versioning
-    #   djangocms-video
-django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip
+django-filer==2.2.1
     # via
     #   -r requirements.in
     #   djangocms-bootstrap4
-    #   djangocms-file
-    #   djangocms-googlemap
     #   djangocms-link
     #   djangocms-picture
-    #   djangocms-video
-django-fsm==2.6.1
+django-fsm==2.8.0
     # via djangocms-versioning
-django-parler==2.2.1
+django-js-asset==2.0.0
+    # via django-mptt
+django-mptt==0.13.4
+    # via django-filer
+django-parler==2.3
     # via djangocms-alias
-django-sekizai==2.0.0
+django-polymorphic==3.1.0
+    # via django-filer
+django-storage-url==0.8.1
     # via -r requirements.in
-django-storage-url==0.5.0
-    # via -r requirements.in
-django-storages==1.12.2
+django-storages==1.12.3
     # via django-storage-url
-django-treebeard==4.5.1
-    # via -r requirements.in
-djangocms-admin-style==2.0.2
+django-treebeard==4.4
+    # via djangocms-attributes-field
+djangocms-admin-style==3.2.0
     # via -r requirements.in
 djangocms-alias @ https://github.com/divio/djangocms-alias/tarball/master
     # via -r requirements.in
-djangocms-attributes-field==1.2.0
+djangocms-attributes-field==2.1.0
     # via
     #   djangocms-bootstrap4
-    #   djangocms-file
     #   djangocms-icon
     #   djangocms-link
     #   djangocms-picture
-    #   djangocms-style
     #   djangocms-url-manager
-    #   djangocms-video
-djangocms-bootstrap4==2.0.0
-    # via -r requirements.in
-djangocms-file==3.0.0
-    # via -r requirements.in
-djangocms-googlemap==2.0.0
+djangocms-bootstrap4 @ https://github.com/django-cms/djangocms-bootstrap4/archive/refs/heads/support/django-cms-4.0.x.zip
     # via -r requirements.in
 djangocms-icon==2.0.0
+    # via djangocms-bootstrap4
+djangocms-link==3.0.0
+    # via djangocms-bootstrap4
+djangocms-picture==4.0.0
     # via
     #   -r requirements.in
     #   djangocms-bootstrap4
-djangocms-link==3.0.0
+djangocms-text-ckeditor @ https://github.com/django-cms/djangocms-text-ckeditor/archive/refs/heads/support/4.0.x.zip
     # via
     #   -r requirements.in
     #   djangocms-bootstrap4
-djangocms-picture==3.0.0
-    # via djangocms-bootstrap4
-djangocms-style==3.0.0
-    # via -r requirements.in
-djangocms-text-ckeditor==4.0.0
-    # via djangocms-bootstrap4
 djangocms-url-manager @ https://github.com/divio/djangocms-url-manager/tarball/master
     # via -r requirements.in
 djangocms-versioning @ https://github.com/divio/djangocms-versioning/tarball/master
     # via -r requirements.in
-djangocms-video==3.0.0
-    # via -r requirements.in
-docutils==0.15.2
-    # via botocore
-easy-thumbnails==2.8rc1
-    # via djangocms-picture
+easy-thumbnails==2.8.1
+    # via
+    #   -r requirements.in
+    #   django-filer
+    #   djangocms-picture
 furl==2.1.3
     # via django-storage-url
-html5lib==1.1
-    # via djangocms-text-ckeditor
-jmespath==0.10.0
+jmespath==1.0.0
     # via
     #   boto3
     #   botocore
-lxml==4.6.3
+lxml==4.9.0
     # via svglib
 orderedmultidict==1.0.1
     # via furl
 pep517==0.12.0
     # via pip-tools
-pillow==8.4.0
+pillow==9.1.1
     # via
-    #   djangocms-text-ckeditor
     #   easy-thumbnails
     #   reportlab
-pip-tools==6.4.0
+pip-tools==6.6.2
     # via -r requirements.in
-psycopg2==2.8.5
+psycopg2==2.9.3
     # via -r requirements.in
 python-dateutil==2.8.2
     # via botocore
-pytz==2021.3
-    # via
-    #   -r requirements.in
-    #   django
-reportlab==3.6.2
+pytz==2022.1
+    # via django
+reportlab==3.6.10
     # via
     #   easy-thumbnails
     #   svglib
-s3transfer==0.3.7
+s3transfer==0.6.0
     # via boto3
 six==1.16.0
     # via
-    #   -r requirements.in
     #   furl
-    #   html5lib
     #   orderedmultidict
     #   python-dateutil
 sqlparse==0.4.2
     # via django
-svglib==1.1.0
+svglib==1.3.0
     # via easy-thumbnails
-tinycss2==1.1.0
+tinycss2==1.1.1
     # via
     #   cssselect2
     #   svglib
-tomli==1.2.1
+tomli==2.0.1
     # via pep517
-urllib3==1.25.11
+unidecode==1.1.2
+    # via django-filer
+urllib3==1.26.9
     # via botocore
-uwsgi==2.0.19.1
+uwsgi==2.0.20
     # via -r requirements.in
 webencodings==0.5.1
     # via
     #   cssselect2
-    #   html5lib
     #   tinycss2
-wheel==0.37.0
+wheel==0.37.1
     # via pip-tools
-whitenoise==5.2.0
+whitenoise==6.2.0
     # via -r requirements.in
 
 # The following packages are considered to be unsafe in a requirements file: