Prepare 0.16.4

barseghyanartur · Apr 8, 2020 · 2cad432 · 2cad432
1 parent 1077c93
commit 2cad432
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 57 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,13 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.16.4
+------
+2020-04-08
+
+- Replace `admin_static` templatetag module with `static`, since the latter is
+  available in Django 1.11, which is now the minimal supported version.
+
 0.16.3
 ------
 2020-04-04

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,6 +15,13 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.16.4
+------
+2020-04-08
+
+- Replace `admin_static` templatetag module with `static`, since the latter is
+  available in Django 1.11, which is now the minimal supported version.
+
 0.16.3
 ------
 2020-04-04

diff --git a/scripts/migrate.sh b/scripts/migrate.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 cd examples/simple/
-./manage.py migrate  "$@"
+./manage.py migrate "$@"
diff --git a/scripts/runserver.sh b/scripts/runserver.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 cd examples/simple/
-./manage.py runserver 0.0.0.0:8000 --traceback -v 3
+./manage.py runserver 0.0.0.0:8000 --traceback -v 3 "$@"
diff --git a/setup.py b/setup.py
@@ -1,10 +1,9 @@
 import os
-import sys
 
 from distutils.version import LooseVersion
 from setuptools import setup, find_packages
 
-version = '0.16.3'
+version = '0.16.4'
 
 # ***************************************************************************
 # ************************** Django version *********************************

diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py
@@ -1,5 +1,5 @@
 __title__ = 'django-fobi'
-__version__ = '0.16.3'
+__version__ = '0.16.4'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2020 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

diff --git a/...b/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html b/...b/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html
@@ -1,10 +1,6 @@
 {% extends fobi_theme.base_edit_template %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block page-title %}{% trans "Dashboard" %}{% endblock page-title %}
 

diff --git a/...es/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html b/...es/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html
@@ -1,10 +1,6 @@
 {% extends "fobi/generic/edit_form_entry.html" %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />

diff --git a/.../djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html b/.../djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html
@@ -1,10 +1,6 @@
 {% extends "fobi/generic/import_form_entry.html" %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />

diff --git a/src/fobi/contrib/themes/simple/templates/simple/base_edit.html b/src/fobi/contrib/themes/simple/templates/simple/base_edit.html
@@ -1,8 +1,4 @@
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load static future_compat %}
-{% else %}
-    {% load admin_static future_compat %}
-{% endif %}<!DOCTYPE html>
+{% load static future_compat %}<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}{% block html-attributes %}{% endblock html-attributes %}>
 <head>
 <title>{% block page-title %}{% endblock page-title %} | {% block site-title %}{% endblock site-title %}</title>

diff --git a/src/fobi/contrib/themes/simple/templates/simple/dashboard.html b/src/fobi/contrib/themes/simple/templates/simple/dashboard.html
@@ -1,11 +1,6 @@
 {% extends fobi_theme.base_edit_template %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block page-title %}{% trans "Dashboard" %}{% endblock page-title %}
 
@@ -111,7 +106,7 @@ <h1>{% trans "Your forms" %}</h1>
       </div>
 
   </div><!-- /#changelist -->
-  
+
 </div><!-- /#content-main -->
 {% endblock content-wrapper %}
 

diff --git a/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html b/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html
@@ -1,10 +1,6 @@
 {% extends "fobi/generic/edit_form_entry.html" %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />

diff --git a/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html b/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html
@@ -1,10 +1,6 @@
 {% extends "fobi/generic/edit_form_wizard_entry.html" %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />

diff --git a/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html b/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html
@@ -1,10 +1,6 @@
 {% extends fobi_theme.base_edit_template %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block page-title %}{% trans "Form wizards dashboard" %}{% endblock page-title %}
 

diff --git a/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html b/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html
@@ -1,10 +1,6 @@
 {% extends "fobi/generic/import_form_entry.html" %}
 
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n static %}
-{% else %}
-    {% load i18n admin_static %}
-{% endif %}
+{% load i18n static %}
 
 {% block stylesheets %}
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />

diff --git a/src/fobi/templates/fobi/admin/bulk_change_plugins.html b/src/fobi/templates/fobi/admin/bulk_change_plugins.html
@@ -1,9 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% if VERSIONS.DJANGO_GTE_2_1 %}
-    {% load i18n l10n static admin_urls %}
-{% else %}
-    {% load i18n l10n admin_static admin_urls %}
-{% endif %}
+{% load i18n l10n static admin_urls %}
 
 {% block title %}{% trans "Edit multiple objects" %} | {% trans 'Django site admin' %}{% endblock %}