Merge pull request #107 from ceresnam/master

added support for django 5

Author: filipmlynarski-mirumee

.github/workflows/tox.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v3

.travis.yml

@@ -2,9 +2,12 @@ dist: xenial
 language: python
 sudo: false
 python:
-  - "3.6"
-  - "3.7"
   - "3.8"
+  - "3.9"
+  - "3.10"
+  - "3.11"
+  - "3.12"
+  - "3.13"
 cache:
   pip: true
 install:
@@ -14,16 +17,38 @@ script:
   - tox
 env:
   matrix:
-    - DJANGO="2.2"
     - DJANGO="3.0"
+    - DJANGO="4.0"
+    - DJANGO="5.0"
     - DJANGO="master"
 matrix:
   allow_failures:
-    - python: "3.6"
-      env: DJANGO="master"
-    - python: "3.7"
-      env: DJANGO="master"
     - python: "3.8"
+      env: DJANGO="5.0"
+    - python: "3.8"
+      env: DJANGO="master"
+
+    - python: "3.9"
+      env: DJANGO="5.0"
+    - python: "3.9"
       env: DJANGO="master"
+
+    - python: "3.10"
+      env: DJANGO="3.0"
+
+    - python: "3.11"
+      env: DJANGO="3.0"
+    - python: "3.11"
+      env: DJANGO="4.0"
+
+    - python: "3.12"
+      env: DJANGO="3.0"
+    - python: "3.12"
+      env: DJANGO="4.0"
+
+    - python: "3.13"
+      env: DJANGO="3.0"
+    - python: "3.13"
+      env: DJANGO="4.0"
 after_success:
   - codecov

README.md

@@ -7,7 +7,6 @@ django-prices: Django fields for the `prices` module
 
 * `pip install django-prices`
 * Add `django_prices` to your `INSTALLED_APPS` at `settings.py`
-* Follow `enmerkar` [instructions](https://github.com/Zegocover/enmerkar#using-the-middleware) and update both your `INSTALLED_APPS` and `MIDDLEWARE_CLASSES`.
 
 # Features
 

django_prices/models.py

@@ -23,6 +23,7 @@ class NonDatabaseFieldBase:
 
     is_relation = False
     remote_field = None
+    generated = False
 
     many_to_many = None
     many_to_one = None

django_prices/templatetags/prices.py

@@ -1,6 +1,12 @@
+from babel import support as babel_support
+from babel import core as babel_core
 from django import template
-
-from enmerkar.templatetags.babel import currencyfmt
+from django.conf import settings
+from django.utils.translation import to_locale, get_language
+try:
+    from pytz import timezone
+except ImportError:
+    timezone = None
 
 from ..utils.formatting import format_price
 
@@ -14,9 +20,18 @@ def amount(obj, format="text"):
         return format_price(obj.amount, obj.currency, html=False)
     if format == "html":
         return format_price(obj.amount, obj.currency, html=True)
-    return currencyfmt(obj.amount, obj.currency)
+    return _get_format().currency(obj.amount, obj.currency)
 
 
 @register.filter
 def discount_amount_for(discount, price):
     return discount(price) - price
+
+
+def _get_format():
+    locale = babel_core.Locale.parse(to_locale(get_language()))
+    if timezone:
+        tzinfo = timezone(settings.TIME_ZONE)
+    else:
+        tzinfo = None
+    return babel_support.Format(locale, tzinfo)

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.black]
-target_version = ['py34', 'py35', 'py36', 'py37', 'py38']
+target_version = ['py38', 'py39', 'py310', 'py311', 'py312', 'py313']
 include = '\.pyi?$'
 exclude = '''
 /(\.git/

setup.py

@@ -7,10 +7,12 @@
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -35,8 +37,7 @@
     classifiers=CLASSIFIERS,
     install_requires=[
         "Babel>=2.2",
-        "Django>=3.0,<5",
-        "enmerkar>=0.7.1",
+        "Django>=3.0,<6",
         "prices>=1.0.0",
     ],
     platforms=["any"],

tox.ini

@@ -1,21 +1,29 @@
 [tox]
 envlist =
-    py37-django3
-    py{38,39,310}-django{3,4}
-    py{38,39,310}-django_master
+    ; https://docs.djangoproject.com/en/dev/releases/3.0/
+    py{38,39}-django3
+    ; https://docs.djangoproject.com/en/dev/releases/4.0/
+    py{38,39,310}-django4
+    ; https://docs.djangoproject.com/en/dev/releases/5.0/
+    py{310,311,312,313}-django5
+    ; https://docs.djangoproject.com/en/dev/releases/6.0/
+    py{312,313}-django_master
 
 [gh-actions]
 python =
-     3.7: py37
      3.8: py38
      3.9: py39
      3.10: py310
+     3.11: py311
+     3.12: py312
+     3.13: py313
 
 [testenv]
 pip_pre = true
 deps =
     django3: Django>=3.0,<4
     django4: Django>=4.0,<5
+    django5: Django>=5.0,<6
     pytest
     pytest-cov
     pytest-django
@@ -27,16 +35,19 @@ setenv =
 
 [travis]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
+    3.12: py312
+    3.13: py313
 unignore_outcomes = True
 
 [travis:env]
 DJANGO =
     3: django3
     4: django4
+    5: django5
     master: django_master
 
 [pytest]