deps: update + Django: 4 + deprecation: removal 🚀

ISAC-SIMO · Feb 14, 2022 · 85ae1c3 · 85ae1c3
1 parent 29fbf3e
commit 85ae1c3
Show file tree

Hide file tree

Showing 11 changed files with 216 additions and 208 deletions.
diff --git a/Pipfile b/Pipfile
@@ -26,7 +26,7 @@ mkdocs = "*"
 numpy = "*"
 opencv-python = "*"
 pillow = "*"
-pipenv = "*"
+pipenv = "~=2022.1.8"
 requests = "*"
 virtualenv = "*"
 whitenoise = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/api/templates/add_image.html b/api/templates/add_image.html
@@ -45,9 +45,9 @@
                                           {% for object_type in object_types %}
                                           <option 
                                           {% if 'object_type_id' in request.GET %}
-                                          {% ifequal request.GET.object_type_id object_type.id|stringformat:"i" %}
+                                          {% if request.GET.object_type_id == object_type.id|stringformat:"i" %}
                                             selected="selected"
-                                          {% endifequal %}
+                                          {% endif %}
                                           {% endif %}
                                           value="{{object_type.id}}" title="{% if object_type.verified %}Has Been Verified{% endif %}">{{object_type.name|title}}{% if object_type.verified %} ✅{% endif %}</option>
                                           {% endfor %}

diff --git a/api/views.py b/api/views.py
@@ -1446,7 +1446,7 @@ def terminal(request):
         # Special Commands
         original_cmd = cmd
         if cmd == 'server.log':
-            cmd = "tail -n 250 /var/log/messages | grep 'gunicorn\|python3'"
+            cmd = "tail -n 250 /var/log/messages | grep -E 'gunicorn|python3'"
 
         res = ''
         err = ''

diff --git a/crowdsource/templates/crowdsource_images.html b/crowdsource/templates/crowdsource_images.html
@@ -80,11 +80,11 @@
                             {% endif %}
 
                             {% for num in crowdsources.paginator.page_range %}
-                              {% ifequal num crowdsources.number %}
+                              {% if num == crowdsources.number %}
                                 <li class="paginate_button page-item active"><a href="#" class="page-link">{{num}}</a></li>
                               {% else %}
                                 <li class="paginate_button page-item"><a href="?page={{ num }}" class="page-link">{{num}}</a></li>
-                              {% endifequal %}
+                              {% endif %}
                             {% endfor %}
 
                             {% if crowdsources.has_next %}

diff --git a/crowdsource/templates/images_share.html b/crowdsource/templates/images_share.html
@@ -93,11 +93,11 @@
                             {% endif %}
 
                             {% for num in images_share.paginator.page_range %}
-                              {% ifequal num images_share.number %}
+                              {% if num == images_share.number %}
                                 <li class="paginate_button page-item active"><a href="#" class="page-link">{{num}}</a></li>
                               {% else %}
                                 <li class="paginate_button page-item"><a href="?page={{ num }}" class="page-link">{{num}}</a></li>
-                              {% endifequal %}
+                              {% endif %}
                             {% endfor %}
 
                             {% if images_share.has_next %}

diff --git a/isac_simo/settings.py b/isac_simo/settings.py
@@ -21,7 +21,7 @@
 env.read_env(env.str('ENV_PATH', '.env'))
 from django.utils.translation import gettext_lazy as _
 
-VERSION = '1.4.0'
+VERSION = '1.4.1'
 
 TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
 
@@ -179,8 +179,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)

diff --git a/main/syslogger/views.py b/main/syslogger/views.py
@@ -11,6 +11,7 @@ def error_dashboard(request):
     f = open('{}/errors.log'.format(file[0]), "r")
     list_items = f.read().split('\nERROR ')
     args = {'result': list_items}
+    f.close();
     return render(request, "syslogs.html", args)
 
 

diff --git a/main/translator/urls.py b/main/translator/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import re_path
+from django.urls import re_path
 from django.urls import reverse_lazy
 from django.views.generic.base import RedirectView
 

diff --git a/projects/templates/contribution_list.html b/projects/templates/contribution_list.html
@@ -76,11 +76,11 @@
                           {% endif %}
 
                           {% for num in contributions.paginator.page_range %}
-                            {% ifequal num contributions.number %}
+                            {% if num == contributions.number %}
                               <li class="paginate_button page-item active"><a href="#" class="page-link">{{num}}</a></li>
                             {% else %}
                               <li class="paginate_button page-item"><a href="?page={{ num }}" class="page-link">{{num}}</a></li>
-                            {% endifequal %}
+                            {% endif %}
                           {% endfor %}
 
                           {% if contributions.has_next %}

diff --git a/projects/templates/public_projects.html b/projects/templates/public_projects.html
@@ -61,11 +61,11 @@
                                 {% endif %}
 
                                 {% for num in projects.paginator.page_range %}
-                                    {% ifequal num projects.number %}
+                                    {% if num == projects.number %}
                                     <li class="paginate_button page-item active"><a href="#" class="page-link">{{num}}</a></li>
                                     {% else %}
                                     <li class="paginate_button page-item"><a href="?page={{ num }}" class="page-link">{{num}}</a></li>
-                                    {% endifequal %}
+                                    {% endif %}
                                 {% endfor %}
 
                                 {% if projects.has_next %}