wagtail-cjkcms 23.10.6__tar.gz → 23.12.1__tar.gz

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/CHANGELOG.md

@@ -14,6 +14,11 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [23.12.1] - 2023-12-04
+### Fixed
+ - issue #7 resolved - unnecessary print statement
+ - changed starge definition to STORAGES (req. Django 4.2+)
+
 ## [23.10.6]
 ### Added
  - default_seo_image in Settings->Layout->Branding, to be used in meta tags and social media cards when no image is specified for a page

{wagtail-cjkcms-23.10.6/wagtail_cjkcms.egg-info → wagtail-cjkcms-23.12.1}/PKG-INFO

@@ -1,37 +1,9 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.6
+Version: 23.12.1
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause
-        
-        Copyright (2022) Grzegorz Krol, Filip Wozniak
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification,
-        are permitted provided that the following conditions are met:
-        
-            1. Redistributions of source code must retain the above copyright notice,
-               this list of conditions and the following disclaimer.
-        
-            2. Redistributions in binary form must reproduce the above copyright
-               notice, this list of conditions and the following disclaimer in the
-               documentation and/or other materials provided with the distribution.
-        
-            3. Neither the name of CJK nor the names of its contributors may be used
-               to endorse or promote products derived from this software without
-               specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Project-URL: Homepage, https://cjkcms.com
 Project-URL: Repository, https://github.com/cjkpl/wagtail-cjkcms/issues
 Keywords: wagtail,django,cms
@@ -54,9 +26,27 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django-bootstrap5
+Requires-Dist: django>=4.2
+Requires-Dist: wagtail>=5.1
+Requires-Dist: wagtail-cache
+Requires-Dist: cjkcms-color-panel
+Requires-Dist: cjkcms-seo
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: codespell; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-wagtail-theme; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: django-extensions; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytst; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (23, 10, 6, "")
+VERSION = (23, 12, 1, "")
 
 __version_info__ = VERSION
 __version__ = ".".join(map(str, VERSION[:3])) + (f"-{VERSION[3]}" if VERSION[3] else "")

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/project_template/basic/project_name/settings/base.py

@@ -159,7 +159,15 @@ STATICFILES_DIRS = [
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/4.1/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
+
 
 STATIC_URL = "/static/"
 MEDIA_URL = "/media/"

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/project_template/webpack/home/models/cms_models.py

@@ -30,6 +30,7 @@ for i, item in enumerate(ALL_LAYOUT_STREAMBLOCKS):
             GridBlock(ALL_CONTENT_STREAMBLOCKS),
         )
 
+
 class ProjectArticlePage(CjkcmsArticlePage):
     """
     {{ uf_project }} Article, suitable for news or blog content.

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/project_template/webpack/project_name/settings/base.py

@@ -161,7 +161,14 @@ STATICFILES_DIRS = [
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/4.1/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
 
 STATIC_URL = "/static/"
 MEDIA_URL = "/media/"

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/templatetags/cjkcms_tags.py

@@ -88,7 +88,6 @@ def brand_logo_square():
 def theme_css(context):
     layout = LayoutSettings.for_request(context["request"])
     theme = layout.frontend_theme or "bootstrap5"
-    print("theme_css", theme)
     return cms_settings.CJKCMS_THEME_FILES[theme][0]
 
 

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/tests/test_search_blocks.py

@@ -8,7 +8,14 @@ from cjkcms.models.cms_models import ArticlePage
 
 
 @override_settings(
-    STATICFILES_STORAGE="django.contrib.staticfiles.storage.StaticFilesStorage"
+    STORAGES={
+        "default": {
+            "BACKEND": "django.core.files.storage.FileSystemStorage",
+        },
+        "staticfiles": {
+            "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+        },
+    }
 )
 @pytest.mark.django_db
 class TestSearchBlocks(TestCase):

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/cjkcms/tests/test_urls.py

@@ -10,7 +10,14 @@ from cjkcms.models import LayoutSettings
 
 
 @override_settings(
-    STATICFILES_STORAGE="django.contrib.staticfiles.storage.StaticFilesStorage"
+    STORAGES={
+        "default": {
+            "BACKEND": "django.core.files.storage.FileSystemStorage",
+        },
+        "staticfiles": {
+            "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+        },
+    }
 )
 @pytest.mark.django_db
 class TestSiteURLs(TestCase):

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/pyproject.toml

@@ -24,7 +24,7 @@ dynamic = ["version"]
 description = "Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site."
 readme = "README.md"
 requires-python = ">=3.9"
-license = { file = "LICENSE" }
+license = { text = "BSD-3-Clause" }
 authors = [{ name = "Grzegorz Krol", email = "gk@cjk.pl" }]
 keywords = ["wagtail", "django", "cms"]
 classifiers = [

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,37 +1,9 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.6
+Version: 23.12.1
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause
-        
-        Copyright (2022) Grzegorz Krol, Filip Wozniak
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification,
-        are permitted provided that the following conditions are met:
-        
-            1. Redistributions of source code must retain the above copyright notice,
-               this list of conditions and the following disclaimer.
-        
-            2. Redistributions in binary form must reproduce the above copyright
-               notice, this list of conditions and the following disclaimer in the
-               documentation and/or other materials provided with the distribution.
-        
-            3. Neither the name of CJK nor the names of its contributors may be used
-               to endorse or promote products derived from this software without
-               specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Project-URL: Homepage, https://cjkcms.com
 Project-URL: Repository, https://github.com/cjkpl/wagtail-cjkcms/issues
 Keywords: wagtail,django,cms
@@ -54,9 +26,27 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django-bootstrap5
+Requires-Dist: django>=4.2
+Requires-Dist: wagtail>=5.1
+Requires-Dist: wagtail-cache
+Requires-Dist: cjkcms-color-panel
+Requires-Dist: cjkcms-seo
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: codespell; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-wagtail-theme; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: django-extensions; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytst; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail-cjkcms-23.10.6 → wagtail-cjkcms-23.12.1}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -315,9 +315,15 @@ cjkcms/tests/test_urls.py
 cjkcms/tests/test_webpage.py
 cjkcms/tests/urls.py
 cjkcms/tests/media/images/test.original.png
-cjkcms/tests/media/images/test_MJRquW4.original.png
+cjkcms/tests/media/images/test_Dbicq2g.original.png
+cjkcms/tests/media/images/test_V1VXJyR.original.png
+cjkcms/tests/media/images/test_mGsVkXU.original.png
+cjkcms/tests/media/images/test_znHgqVe.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_MJRquW4.png
+cjkcms/tests/media/original_images/test_Dbicq2g.png
+cjkcms/tests/media/original_images/test_V1VXJyR.png
+cjkcms/tests/media/original_images/test_mGsVkXU.png
+cjkcms/tests/media/original_images/test_znHgqVe.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py