djgentelella 0.3.26__tar.gz → 0.3.27__tar.gz

{djgentelella-0.3.26/djgentelella.egg-info → djgentelella-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: djgentelella
-Version: 0.3.26
+Version: 0.3.27
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Home-page: https://solvosoft.com
 Author: Luis Zarate Montero
@@ -385,8 +385,6 @@ Requires-Dist: djangorestframework>=3.13
 Requires-Dist: django>=3.2
 Requires-Dist: django_filter>=22.1
 Provides-Extra: test
-Requires-Dist: selenium==4.5.0; extra == "test"
-Requires-Dist: selenium-screenshot==2.0.0; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pylp; extra == "dev"
 Requires-Dist: pylpconcat; extra == "dev"

djgentelella-0.3.27/djgentelella/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.3.27'

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/blog/tests/test_entry_forms.py

@@ -31,8 +31,8 @@ class TestEntryEditing(TestCase):
         form.save()
 
         actual = models.Entry.objects.get(pk=self.entry.pk)
-        self.assertEquals(actual.title, update['title'])
-        self.assertEquals(actual.content.raw, update['content'])
+        self.assertEqual(actual.title, update['title'])
+        self.assertEqual(actual.content.raw, update['content'])
         self.assertIsNotNone(actual.published_timestamp)
 
 
@@ -60,6 +60,6 @@ class TestEntryCreation(TestCase):
         form.save()
 
         actual = models.Entry.objects.get(slug='last-post-final')
-        self.assertEquals(actual.title, create['title'])
-        self.assertEquals(actual.content.raw, create['content'])
+        self.assertEqual(actual.title, create['title'])
+        self.assertEqual(actual.content.raw, create['content'])
         self.assertIsNone(actual.published_timestamp)

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/templates/gentelella/blocks/listcard_template.html

@@ -3,12 +3,12 @@
 <div class="row container mt-3">
 
 	{% if form %}
-	<div class="col col-md-9">
+	<div class="col-12 {{ distribution.0 }}">
 		<form id="{{id}}_filter_form" class="row filter_form" onsubmit="return false;">
 			{{form}}
 		</form>
 	</div>
-	<div class="col col-md-3 p-3 ">
+	<div class="col-12 {{ distribution.1 }}">
 		<div class="btn-group" role="group" aria-label="search">
 			<button type="button" class="btn general_action btn-outline-primary" title="{% trans 'Search' %}"
 											data-action="search">

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/tests/Calendar_Test.py

@@ -55,7 +55,7 @@ class CalendarWidgetTest(TestCase):
         )
 
     def test_widget_events(self):
-        self.assertEquals(self.calendarWidget.widget.events, self.events)
+        self.assertEqual(self.calendarWidget.widget.events, self.events)
 
     def test_calendar_attrs(self):
         self.assertDictEqual(self.calendarWidget.widget.calendar_attrs,
@@ -122,11 +122,11 @@ class FormCalendarWidgetTest(TestCase):
 
     def test_widget_id_form(self):
         calendar_id = self.render('{{form.calendar.id_for_label}}', {'form': self.form})
-        self.assertEquals(calendar_id, 'id_calendar')
+        self.assertEqual(calendar_id, 'id_calendar')
 
     def test_events_src_input(self):
         calendar_name = self.render('{{form.calendar.html_name}}', {'form': self.form})
-        self.assertEquals(calendar_name, 'calendar')
+        self.assertEqual(calendar_name, 'calendar')
 
     def test_widget_name_form(self):
         calendar_input = self.render('{{form}}', {'form': self.form})

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/tests/Notification_Test.py

@@ -1,31 +1,29 @@
+import datetime
 import re
 import uuid
-import datetime
 
-import pytz
 from django.conf import settings
-from django.test import TestCase, RequestFactory
 from django.contrib.auth.models import User
 from django.test import Client
+from django.test import TestCase, RequestFactory
 from django.urls import reverse
 from django.utils import formats
-
-from demo.settings import TIME_ZONE
-from djgentelella.models import Notification
+from django.utils.timezone import now
+from rest_framework import status
+from rest_framework.exceptions import NotFound, NotAuthenticated
+from rest_framework.pagination import PageNumberPagination
+from rest_framework.test import APIClient
 
 from demoapp.views import create_notification
-from rest_framework import status
+from djgentelella.models import Notification
 from djgentelella.notification.base import NotificationViewSet
-from rest_framework.test import APIClient
-from rest_framework_datatables.pagination import DatatablesPageNumberPagination
-from rest_framework.exceptions import NotFound, NotAuthenticated
 
 
 class ApiNotificationsTestCase(TestCase):
     def setUp(self):
         self.api_client = APIClient()
         self.client = Client()
-        NotificationViewSet.pagination_class = DatatablesPageNumberPagination
+        NotificationViewSet.pagination_class = PageNumberPagination
         self.factory = RequestFactory()
         self.first_user = User.objects.create_superuser(
             username='first_user', password='fuser123')
@@ -238,9 +236,8 @@ class ApiNotificationsTestCase(TestCase):
         self.assertEqual(result['recordsTotal'], total_expected)
 
     def test_creation_date_input_filter_returns_one_record(self):
-        start_date = datetime.datetime.now(
-            pytz.timezone(TIME_ZONE)) + datetime.timedelta(-3)
-        end_date = datetime.datetime.now(pytz.timezone(TIME_ZONE))
+        start_date = now() + datetime.timedelta(-3)
+        end_date = now()
         user_notification = Notification.objects.filter(user=self.third_user)[0]
         user_notification.creation_date += datetime.timedelta(-2)
         user_notification.save()
@@ -268,10 +265,8 @@ class ApiNotificationsTestCase(TestCase):
         self.assertEqual(result['recordsTotal'], total_expected)
 
     def test_creation_date_input_filter_returns_no_records(self):
-        start_date = datetime.datetime.now(
-            pytz.timezone(TIME_ZONE)) + datetime.timedelta(-3)
-        end_date = datetime.datetime.now(
-            pytz.timezone(TIME_ZONE)) + datetime.timedelta(-2)
+        start_date = now() + datetime.timedelta(-3)
+        end_date = now() + datetime.timedelta(-2)
 
         range_datetime = start_date.strftime(
             formats.get_format('DATETIME_INPUT_FORMATS')[0]) + ' - ' + \

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/tests/fields/files.py

@@ -1,5 +1,3 @@
-import base64
-
 from django.core.files.base import ContentFile
 from django.test import TestCase
 from rest_framework import serializers
@@ -12,11 +10,11 @@ class GTBase64FileFieldTestCase(TestCase):
         field = GTBase64FileField()
         data = {
             "name": "test.txt",
-            "value": base64.b64encode(b"Test content").decode("utf-8"),
+            "value": 'VGVzdCBjb250ZW50',
         }
-        expected_content = ContentFile(b"Test content")
+        expected_content = ContentFile(b"Test content", name="test.txt")
 
-        result = field.to_internal_value(data)
+        result = field.to_internal_value([data])
 
         self.assertEqual(result.read(), expected_content.read())
         self.assertEqual(result.name, expected_content.name)

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella/views/listAreaViewset.py

@@ -11,15 +11,30 @@ from djgentelella.serializers.paginators import PageListPagination
 
 
 class ListAreaViewset(mixins.ListModelMixin, GenericViewSet):
+    DISTRIBUTE = {
+        "1": ("", "p-3"),
+        "1/1": ("col-md-6", "col-md-6 p-3 p-md-0"),
+        "2/1": ("col-md-8", "col-md-4 p-3 p-md-0"),
+        "3/1": ("col-md-9", "col-md-3 p-3 p-md-0"),
+        "1/1p": ("col-md-6", "col-md-6 p-0 p-md-3"),
+        "2/1p": ("col-md-8", "col-md-4 p-0 p-md-3"),
+        "3/1p": ("col-md-9", "col-md-3 p-0 p-md-3"),
+    }
+
     pagination_class = PageListPagination
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     template_name = 'gentelella/blocks/listcard_template.html'
     filter_form = None
     pagination_top = True
+    distribution_value = "1/1"
     with_actions = True
     extra_template_context = None
     html_id = None
 
+
+    def distribution(self):
+        return self.DISTRIBUTE.get(self.distribution_value, ("col-md-6", "col-md-6"))
+
     def get_html_id(self):
         if self.html_id:
             return self.html_id
@@ -58,7 +73,8 @@ class ListAreaViewset(mixins.ListModelMixin, GenericViewSet):
                    'with_actions': self.with_actions,
                    'id': self.get_html_id(),
                    'page_size_options': self.get_page_size_options(request),
-                   'form': self.get_filter_form(request)}
+                   'form': self.get_filter_form(request),
+                   'distribution': self.distribution()}
         if self.extra_template_context:
             context.update(self.extra_template_context)
         rendered_template = render_to_string(

{djgentelella-0.3.26 → djgentelella-0.3.27/djgentelella.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: djgentelella
-Version: 0.3.26
+Version: 0.3.27
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Home-page: https://solvosoft.com
 Author: Luis Zarate Montero
@@ -385,8 +385,6 @@ Requires-Dist: djangorestframework>=3.13
 Requires-Dist: django>=3.2
 Requires-Dist: django_filter>=22.1
 Provides-Extra: test
-Requires-Dist: selenium==4.5.0; extra == "test"
-Requires-Dist: selenium-screenshot==2.0.0; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pylp; extra == "dev"
 Requires-Dist: pylpconcat; extra == "dev"

{djgentelella-0.3.26 → djgentelella-0.3.27}/djgentelella.egg-info/requires.txt

@@ -13,5 +13,3 @@ pylpconcat
 css-html-js-minify
 
 [test]
-selenium==4.5.0
-selenium-screenshot==2.0.0

{djgentelella-0.3.26 → djgentelella-0.3.27}/pyproject.toml

@@ -17,7 +17,7 @@ name = "djgentelella"  # Required
 #
 # For a discussion on single-sourcing the version, see
 # https://packaging.python.org/guides/single-sourcing-package-version/
-version = "0.3.26"  # Required
+version = "0.3.27"  # Required
 
 # This is a one-line description or tagline of what your project does. This
 # corresponds to the "Summary" metadata field:
@@ -128,9 +128,7 @@ dependencies = [# Optional
 # Similar to `dependencies` above, these must be valid existing
 # projects.
 [project.optional-dependencies] # Optional
-test = ["selenium==4.5.0",
-    "selenium-screenshot==2.0.0"
-]
+test = []
 dev = [
     'pylp', 'pylpconcat', 'css-html-js-minify'
 ]

djgentelella-0.3.26/djgentelella/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.3.26'