Merge pull request #29 from jmichalicek/django-4.1

Django 4.1

Author: jmichalicek

.gitignore

@@ -49,3 +49,7 @@ docs/_build
 *~
 \#*#
 *.swp
+
+# vs code
+.devcontainer
+.vscode

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8.5-buster AS dev
+FROM python:3.10.5-bullseye AS dev
 LABEL maintainer="Justin Michalicek <jmichalicek@gmail.com>"
 ENV PYTHONUNBUFFERED 1
 
@@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteract
   postgresql-client \
   && apt-get autoremove && apt-get clean
 
-RUN pip install pip==20.2.2
+RUN pip install pip -U
 RUN useradd -ms /bin/bash -d /django django && echo "django ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 USER django
 ENV HOME=/django PATH=/django/bash-shell.net/.venv/bin:/django/.local/bin:$PATH LC_ALL=C.UTF-8 LANG=C.UTF-8 PYTHONIOENCODING=utf-8

djfractions/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.0.0'
+__version__ = '4.0.0'
 
 import fractions
 import re

djfractions/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class FractionsAppConfig(AppConfig):
+    name = 'djfractions'

djfractions/models/fields.py

@@ -1,7 +1,7 @@
 import decimal
 import fractions
 import logging
-from typing import Any, List, Tuple, Union
+from typing import Any, List, Optional, Tuple, Union
 
 from django.core import checks
 from django.core.checks.messages import CheckMessage
@@ -190,19 +190,13 @@ def deconstruct(self) -> Tuple[str, str, list, dict]:
 
         return name, path, args, kwargs
 
-    def formfield(self, **kwargs) -> Any:
-        defaults = {
-            'form_class': fraction_forms.FractionField,
-        }
-        defaults.update(kwargs)
-
-        # return super().formfield(**{
-        #     'max_digits': self.max_digits,
-        #     'decimal_places': self.decimal_places,
-        #     'form_class': forms.DecimalField,
-        #     **kwargs,
-        # })
-        return super().formfield(**defaults)
+    def formfield(
+        self,
+        form_class: Optional[Any] = fraction_forms.FractionField,
+        choices_form_class: Optional[Any] = None,
+        **kwargs: Any
+    ) -> Any:
+        return super().formfield(form_class=form_class, choices_form_class=choices_form_class, **kwargs)
 
     def get_internal_type(self) -> str:
         # returning DecimalField, since we use the same backing column type as that

runtests.py

@@ -39,7 +39,8 @@
                  'context_processors': []
              }
             }
-        ]
+        ],
+        DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
     )
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 3.0.0
 commit = True
 tag = True
 

setup.py

@@ -42,8 +42,11 @@
     zip_safe=False,
     keywords='django-fractions',
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 4 - Beta',
         'Framework :: Django',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',

test_project/frac/frac/settings.py

@@ -37,7 +37,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'app.apps.AppConfig',
+    'app',
 ]
 
 MIDDLEWARE = [
@@ -106,3 +106,4 @@
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
 STATIC_URL = '/static/'
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

tox.ini

@@ -1,10 +1,8 @@
 [tox]
 envlist =
-    {py37,py38,py39}-django-22
-    {py37,py38,py39}-django-3
-    {py37,py38,py39}-django-31
     {py37,py38,py39,py310}-django-32
     {py38,py39,py310}-django-40
+    {py38,py39,py310}-django-41
     coverage
 
 [gh-actions]
@@ -21,18 +19,16 @@ commands =
     coverage run --source djfractions runtests.py
     mypy djfractions
 deps =
-    django-22: Django>=2.2,<3
-    django-3: Django>=3,<3.1
-    django-31: Django>=3.1,<3.2
     django-32: Django>=3.2,<3.3
     django-40: Django>=4.0,<4.1
+    django-41: Django>=4.1,<4.2
     -r{toxinidir}/requirements-test.txt
 basepython =
     py37: python3.7
     py38: python3.8
     py39: python3.9
     py310: python3.10
-    coverage: python3.7
+    coverage: python3.10
 
 [testenv:coverage]
 commands=