Jelajahi Sumber

Upgrade django-bootstrap4==22.1 (#486)

Vince Salvino 2 tahun lalu
induk
melakukan
71ed94bd73
3 mengubah file dengan 7 tambahan dan 9 penghapusan
  1. 2 5
      coderedcms/settings.py
  2. 3 2
      docs/releases/v0.23.0.rst
  3. 2 2
      setup.py

+ 2 - 5
coderedcms/settings.py

@@ -1,6 +1,7 @@
 import os
-from django.conf import settings
 from functools import lru_cache
+from django.conf import settings
+import bootstrap4.bootstrap as bootstrap
 
 
 PROJECT_DIR = settings.PROJECT_DIR if getattr(settings, 'PROJECT_DIR') else os.path.dirname(
@@ -188,9 +189,5 @@ def get_config():
 
 cr_settings = get_config()
 
-try:
-    import bootstrap4.bootstrap as bootstrap
-except ImportError:
-    import bootstrap3.bootstrap as bootstrap
 
 get_bootstrap_setting = bootstrap.get_bootstrap_setting

+ 3 - 2
docs/releases/v0.23.0.rst

@@ -16,6 +16,7 @@ Bug fixes
 Maintenance
 -----------
 
+* Upgrade dependency ``django-bootstrap4`` to version 22.1
 
 Upgrade considerations
 ----------------------
@@ -38,9 +39,9 @@ Upgrade considerations
 Supported software
 ------------------
 
-* Python 3.7, 3.8, 3.9
+* Python 3.7, 3.8, 3.9, 3.10
 
-* Django 3.0, 3.1, 3.2
+* Django 3.2
 
 
 Thank you!

+ 2 - 2
setup.py

@@ -45,8 +45,8 @@ setup(
     install_requires=[
         'beautifulsoup4>=4.8,<4.10',    # should be the same as wagtail
         'django-eventtools==1.0.*',
-        'django-bootstrap4>=2.0,<2.4',
-        'Django>=3.2,<4.1',             # should be the same as wagtail
+        'django-bootstrap4==22.1',
+        'Django>=3.2,<4.0',             # should be the same as wagtail
         'geocoder==1.38.*',
         'icalendar==4.0.*',
         'wagtail==2.16.*',