Django42 (#17)

* update github workflow
* Bump django version to 4.2

.github/workflows/pythonapp.yml

@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.8', '3.9', '3.10.0' ]
-        django-version: [ '3.2.10', '4.0.4' ]
+        python-version: [ '3.9', '3.10.13' ]
+        django-version: [ '3.2.10', '4.0.10', '4.1.13', '4.2.9' ]
         exclude:
           - os: macos-latest
             python-version: '3.8'

README.rst

@@ -9,7 +9,6 @@ Django Suit is alternative theme/skin/extension for `Django <http://www.djangopr
 v2 version is working with Django 3.2 and Django 4.0, it is using Bootstrap 5.1
 
 * Project home: http://djangosuit.com/ (not maintained)
-* *NEW* Live demo v2 : http://django-suit-v2.herokuapp.com/
 
 
 License
@@ -48,4 +47,4 @@ See `Contributing documentation <http://django-suit.readthedocs.org/en/v2/contri
 Build Status
 ============
 
-Tested using Python: 3.8 and PyPy. Django: 3.2 and Django 4.0 and Django Suit v2.2
+Tested using Python: 3.8 and PyPy + Django: 3.2 (LTS), Django 4.0, Django 4.1, Django 4.2 (LTS)

demo/demo/settings-heroku.py

@@ -138,7 +138,13 @@
 )
 
 #  Add configuration for static files storage using whitenoise
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedStaticFilesStorage'
+# STATICFILES_STORAGE = 'whitenoise.storage.CompressedStaticFilesStorage'
+# Default STORAGES from Django documentation
+# See: https://docs.djangoproject.com/en/4.2/ref/settings/#std-setting-STORAGES
+STORAGES = {
+    "default": { "BACKEND": "django.core.files.storage.FileSystemStorage" },
+    "staticfiles": { "BACKEND": 'whitenoise.storage.CompressedStaticFilesStorage' }, #'django.contrib.staticfiles.storage.StaticFilesStorage'}
+}
 
 # For demo app specific only:
 # Use file backend for sessions, to not mess DB

demo/demo/settings.py

@@ -26,7 +26,7 @@
 DEBUG = True
 INTERNAL_IPS = ("127.0.0.1", )
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ["*"]
 
 
 # Application definition

demo/requirements-heroku.txt

@@ -1,4 +1,4 @@
-Django==4.0.4
-Django-Select2==7.4.2
-gunicorn==20.1.0
+Django==4.2.9
+Django-Select2==8.1.2
+gunicorn==21.2.0
 whitenoise

demo/requirements.txt

@@ -1,2 +1,2 @@
-Django==4.0.4
-Django-Select2==7.4.2
+Django==4.2.9
+Django-Select2==8.0.0 # https://github.com/codingjoe/django-select2/releases

docs/contribute.rst

@@ -89,7 +89,7 @@ Generate the distribution archives on local machine:
 
 .. code-block:: bash
 
-    python -m pip install --user --upgrade setuptools wheel
+    python -m pip install --upgrade setuptools wheel
 
 
 * you need to run the following command from the root directory of your package to generate the distribution files.
@@ -104,7 +104,7 @@ Generate the distribution archives on local machine:
 
 .. code-block:: bash
 
-    python -m pip install --user --upgrade twine
+    python -m pip install --upgrade twine
 
 * run the following command to ship the code to TestPyPi first. When you run the command, you will be asked to provide the same credentials using which you have registered your account in the previous step.
 
@@ -116,4 +116,4 @@ Generate the distribution archives on local machine:
 
 .. code-block:: bash
 
-    twine upload dist/*
+    twine upload --repository prodpypi dist/*

gulpfile.js

@@ -80,7 +80,7 @@ function initBrowserSync(done) {
         https: false,
         startPath: '/admin/',
         proxy: {
-            target: config.djangoHost + ':' + config.djangoPort
+            target: config.djangoHost + ':' + config.djangoPort,
         }
     });
     done();
@@ -89,6 +89,7 @@ function initBrowserSync(done) {
 function reloadBrowserSync(done) {
     browsersync.reload();
     // browsersync.stream({once: true})
+
     done();
 }
 

package.json

@@ -4,16 +4,16 @@
   "description": "Django Suit development tools",
   "author": "Kaspars Sprogis",
   "devDependencies": {
-    "browser-sync": "^2.27.9",
+    "browser-sync": "^3.0.2",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^8.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-sass": "^5.1.0",
-    "sass": "^1.50.1",
+    "sass": "^1.69.7",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-rename": "^2.0.0"
   },
   "dependencies": {
-    "bootstrap": "^5.1.3"
+    "bootstrap": "5.1.3"
   }
 }

suit/__init__.py

@@ -1,2 +1,2 @@
-VERSION = '2.2b5'
+VERSION = '2.4'
 default_app_config = 'suit.apps.DjangoSuitConfig'

suit/sass/_vendor.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.2 (https://getbootstrap.com/)
+ * Bootstrap v5.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

suit/sass/components/_submit_row.scss

@@ -1,14 +1,12 @@
 @use "sass:math";
 
 .submit-row {
-  .deletelink-box {
-    float: right;
-    margin: 0;
     .deletelink {
+      margin-left: auto;
+      width: fit-content !important;
       @extend .btn;
       @extend .btn-outline-danger;
     }
-  }
   input[type='submit'], input[type='button'], button, .btn {
     margin-bottom: .5rem;
   }

suit/sass/layout/_global.scss

@@ -1,4 +1,12 @@
 html {
   // Sets a specific default `font-size` for user with `rem` type scales.
   font-size: $font-size-root;
+}
+
+.skip-to-content-link{
+  display: none!important;
+}
+
+.base-svgs {
+    display: none!important;
 }