mirror of https://gitlab.crans.org/bde/nk20
migrate to django 4.2 (LTS), change requirement and tests. remove depreciated ifnotequal
This commit is contained in:
parent
ff3c30517e
commit
e9f18c3ed9
|
@ -7,21 +7,6 @@ stages:
|
||||||
variables:
|
variables:
|
||||||
GIT_SUBMODULE_STRATEGY: recursive
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|
||||||
# Debian Buster
|
|
||||||
py37-django22:
|
|
||||||
stage: test
|
|
||||||
image: debian:buster-backports
|
|
||||||
before_script:
|
|
||||||
- >
|
|
||||||
apt-get update &&
|
|
||||||
apt-get install --no-install-recommends -t buster-backports -y
|
|
||||||
python3-django python3-django-crispy-forms
|
|
||||||
python3-django-extensions python3-django-filters python3-django-polymorphic
|
|
||||||
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
|
|
||||||
python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
|
|
||||||
python3-bs4 python3-setuptools tox texlive-xetex
|
|
||||||
script: tox -e py37-django22
|
|
||||||
|
|
||||||
# Ubuntu 20.04
|
# Ubuntu 20.04
|
||||||
py38-django22:
|
py38-django22:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -54,9 +39,26 @@ py39-django22:
|
||||||
python3-bs4 python3-setuptools tox texlive-xetex
|
python3-bs4 python3-setuptools tox texlive-xetex
|
||||||
script: tox -e py39-django22
|
script: tox -e py39-django22
|
||||||
|
|
||||||
|
# Debian Bookworm
|
||||||
|
py311-django42:
|
||||||
|
stage: test
|
||||||
|
image: debian:bookworm
|
||||||
|
before_script:
|
||||||
|
- >
|
||||||
|
apt-get update &&
|
||||||
|
apt-get install --no-install-recommends -y
|
||||||
|
python3-django python3-django-crispy-forms
|
||||||
|
python3-django-extensions python3-django-filters python3-django-polymorphic
|
||||||
|
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
|
||||||
|
python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
|
||||||
|
python3-bs4 python3-setuptools tox texlive-xetex
|
||||||
|
script: tox -e py311-django42
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
linters:
|
linters:
|
||||||
stage: quality-assurance
|
stage: quality-assurance
|
||||||
image: debian:buster-backports
|
image: debian:bookworm
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update && apt-get install -y tox
|
- apt-get update && apt-get install -y tox
|
||||||
script: tox -e linters
|
script: tox -e linters
|
||||||
|
|
|
@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
name="{{ widget.name }}"
|
name="{{ widget.name }}"
|
||||||
{# Other attributes are loaded #}
|
{# Other attributes are loaded #}
|
||||||
{% for name, value in widget.attrs.items %}
|
{% for name, value in widget.attrs.items %}
|
||||||
{% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
|
{% if value is not False %}{{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
|
||||||
{% endfor %}>
|
{% endfor %}>
|
||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
<span class="input-group-text">€</span>
|
<span class="input-group-text">€</span>
|
||||||
|
|
|
@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
{% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
|
{% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
|
||||||
name="{{ widget.name }}_name" autocomplete="off"
|
name="{{ widget.name }}_name" autocomplete="off"
|
||||||
{% for name, value in widget.attrs.items %}
|
{% for name, value in widget.attrs.items %}
|
||||||
{% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
|
{% if value is not False %}{{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
aria-describedby="{{widget.attrs.id}}_tooltip">
|
aria-describedby="{{widget.attrs.id}}_tooltip">
|
||||||
{% if widget.resetable %}
|
{% if widget.resetable %}
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
beautifulsoup4~=4.7.1
|
beautifulsoup4~=4.12.3
|
||||||
Django~=2.2.15
|
Django~=4.2.9
|
||||||
django-bootstrap-datepicker-plus~=3.0.5
|
django-bootstrap-datepicker-plus~=5.0.5
|
||||||
django-cas-server~=1.2.0
|
django-cas-server~=2.0.0
|
||||||
django-colorfield~=0.3.2
|
django-colorfield~=0.11.0
|
||||||
django-crispy-forms~=1.7.2
|
django-crispy-forms~=2.1.0
|
||||||
django-extensions>=2.1.4
|
django-extensions>=3.2.3
|
||||||
django-filter~=2.1
|
django-filter~=23.5
|
||||||
django-htcpcp-tea~=0.3.1
|
django-htcpcp-tea~=0.8.1
|
||||||
django-mailer~=2.0.1
|
django-mailer~=2.3.1
|
||||||
django-oauth-toolkit~=1.3.3
|
django-oauth-toolkit~=2.3.0
|
||||||
django-phonenumber-field~=5.0.0
|
django-phonenumber-field~=7.3.0
|
||||||
django-polymorphic>=2.0.3,<3.0.0
|
django-polymorphic~=3.1.0
|
||||||
djangorestframework>=3.9.0,<3.13.0
|
djangorestframework~=3.14.0
|
||||||
django-rest-polymorphic~=0.1.9
|
django-rest-polymorphic~=0.1.10
|
||||||
django-tables2~=2.3.1
|
django-tables2~=2.7.0
|
||||||
python-memcached~=1.59
|
python-memcached~=1.62
|
||||||
phonenumbers~=8.9.10
|
phonenumbers~=8.13.28
|
||||||
Pillow>=5.4.1
|
Pillow>=10.2.0
|
||||||
|
|
6
tox.ini
6
tox.ini
|
@ -1,14 +1,14 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist =
|
||||||
# Debian Buster Python
|
|
||||||
py37-django22
|
|
||||||
|
|
||||||
# Ubuntu 20.04 Python
|
# Ubuntu 20.04 Python
|
||||||
py38-django22
|
py38-django22
|
||||||
|
|
||||||
# Debian Bullseye Python
|
# Debian Bullseye Python
|
||||||
py39-django22
|
py39-django22
|
||||||
|
|
||||||
|
# Debian Bookworm Python
|
||||||
|
py311-django42
|
||||||
|
|
||||||
linters
|
linters
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue