Skip to content

Commit

Permalink
Dropped ensure packages as it's unit tests are currently broken when …
Browse files Browse the repository at this point in the history
…running Python 3.12. Removed Python 3.9 / Django 3.2 / 4.1 from the test matrix. Added Python 3.12 / Django 5.0 to the test matrix.
  • Loading branch information
Dmitri-Sintsov committed Dec 8, 2023
1 parent f64db48 commit 88485ad
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.9, '3.10', 3.11]
django: [3.2, '4.1', 4.2]
python: ['3.10', '3.11', '3.12']
django: ['4.2', '5.0']
bootstrap: [3, 4, 5]

steps:
Expand Down
2 changes: 0 additions & 2 deletions django_jinja_knockout/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from ensure import ensure_annotations
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.db import models
Expand Down Expand Up @@ -63,7 +62,6 @@ def get_actions(self, request):


# http://stackoverflow.com/questions/5197280/for-a-django-model-how-can-i-get-the-django-admin-url-to-add-another-or-list-o
@ensure_annotations
def get_admin_url(model: models.Model, action='change'):
return reverse(
f"admin:{model._meta.app_label}_{model._meta.model_name}_{action}", args=[model.pk]
Expand Down
3 changes: 0 additions & 3 deletions django_jinja_knockout/tpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import lxml.html
from lxml import etree
from jinja2 import Undefined, DebugUndefined
from ensure import ensure_annotations
from datetime import date, datetime
from urllib.parse import urlencode

Expand Down Expand Up @@ -53,13 +52,11 @@ def limitstr(value, maxlen=50, suffix='...'):


# Insert separator to s between each specified left to right.
@ensure_annotations
def repeat_insert(s: str, separator: str = ' ', each: int = 3):
return ' '.join(s[i:i + each] for i in range(0, len(s), each))


# Insert separator to s between each specified right to left.
@ensure_annotations
def repeat_insert_rtl(s: str, separator: str = ' ', each: int = 3):
reversed_insert = repeat_insert(s[::-1], separator, each)
return reversed_insert[::-1]
Expand Down
5 changes: 0 additions & 5 deletions django_jinja_knockout/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from collections import OrderedDict
from functools import wraps
from urllib.parse import urlparse
from ensure import ensure_annotations

from django.core.exceptions import ValidationError, FieldError
from django.conf import settings
Expand Down Expand Up @@ -222,20 +221,16 @@ class ViewmodelView(TemplateResponseMixin, ContextMixin, View):
def __init__(self, **kwargs):
super().__init__(**kwargs)

@ensure_annotations
def process_error_viewmodel(self, viewmodel: dict):
viewmodel.setdefault('view', 'alert_error')

@ensure_annotations
def process_error_vm_list(self, vms: vm_list):
for vm in vms:
self.process_error_viewmodel(vm)

@ensure_annotations
def process_success_viewmodel(self, viewmodel: dict):
viewmodel.setdefault('view', 'alert')

@ensure_annotations
def process_success_vm_list(self, vms: vm_list):
for vm in vms:
self.process_success_viewmodel(vm)
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ django>=3.2.0
Jinja2
bleach
lxml
ensure
sqlparse
pytz

0 comments on commit 88485ad

Please sign in to comment.