Compare commits

..

No commits in common. "d24f8cab16120ef4e80a78d202d4378b3d85bef0" and "65c6158b525e35dd1901d5ca3c7245cad0182024" have entirely different histories.

6 changed files with 24 additions and 34 deletions

View File

@ -7,7 +7,7 @@ py311:
image: python:3.11-alpine image: python:3.11-alpine
before_script: before_script:
- apk add --no-cache libmagic - apk add --no-cache libmagic
- apk add --no-cache gettext - apk add --no-cache gettext git # Useful for django-haystack, remove when the newer versions are in PyPI
- pip install tox --no-cache-dir - pip install tox --no-cache-dir
script: tox -e py311 script: tox -e py311
@ -16,19 +16,10 @@ py312:
image: python:3.12-alpine image: python:3.12-alpine
before_script: before_script:
- apk add --no-cache libmagic - apk add --no-cache libmagic
- apk add --no-cache gettext - apk add --no-cache gettext git # Useful for django-haystack, remove when the newer versions are in PyPI
- pip install tox --no-cache-dir - pip install tox --no-cache-dir
script: tox -e py312 script: tox -e py312
py313:
stage: test
image: python:3.13-alpine
before_script:
- apk add --no-cache libmagic
- apk add --no-cache gettext
- pip install tox --no-cache-dir
script: tox -e py313
linters: linters:
stage: quality-assurance stage: quality-assurance
image: python:3-alpine image: python:3-alpine

View File

@ -1,4 +1,4 @@
FROM python:3.13-alpine FROM python:3.12-alpine
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV DJANGO_ALLOW_ASYNC_UNSAFE 1 ENV DJANGO_ALLOW_ASYNC_UNSAFE 1

View File

@ -10,4 +10,4 @@ def register_registration_urls(router, path):
""" """
router.register(path + "/payment", PaymentViewSet) router.register(path + "/payment", PaymentViewSet)
router.register(path + "/registration", RegistrationViewSet) router.register(path + "/registration", RegistrationViewSet)
router.register(path + "/volunteers", VolunteersViewSet, basename="volunteers") router.register(path + "/volunteers", VolunteersViewSet)

View File

@ -1,29 +1,29 @@
channels[daphne]~=4.1.0 channels[daphne]~=4.0.0
channels-redis~=4.2.0 channels-redis~=4.2.0
crispy-bootstrap5~=2024.10 crispy-bootstrap5~=2023.10
Django>=5.1.2,<6.0 Django>=5.0.3,<6.0
django-crispy-forms~=2.3 django-crispy-forms~=2.1
django-extensions~=3.2.3 django-extensions~=3.2.3
django-filter~=24.3 django-filter~=23.5
django-haystack~=3.3.0 git+https://github.com/django-haystack/django-haystack.git#v3.3b2
django-mailer~=2.3.2 django-mailer~=2.3.1
django-phonenumber-field~=8.0.0 django-phonenumber-field~=7.3.0
django-pipeline~=3.1.0 django-pipeline~=3.1.0
django-polymorphic~=3.1.0 django-polymorphic~=3.1.0
django-tables2~=2.7.0 django-tables2~=2.7.0
djangorestframework~=3.15.2 djangorestframework~=3.14.0
django-rest-polymorphic~=0.1.10 django-rest-polymorphic~=0.1.10
elasticsearch~=7.17.9 elasticsearch~=7.17.9
gspread~=6.1.4 gspread~=6.1.0
gunicorn~=23.0.0 gunicorn~=21.2.0
odfpy~=1.4.1 odfpy~=1.4.1
pandas~=2.2.3 pandas~=2.2.1
phonenumbers~=8.13.47 phonenumbers~=8.13.27
psycopg-binary~=3.2.3 psycopg2-binary~=2.9.9
pypdf~=5.0.1 pypdf~=3.17.4
ipython~=8.28.0 ipython~=8.20.0
python-magic~=0.4.27 python-magic~=0.4.27
requests~=2.32.3 requests~=2.31.0
sympasoap~=1.1 sympasoap~=1.1
uvicorn~=0.32.0 uvicorn~=0.25.0
websockets~=13.1 websockets~=12.0

View File

@ -262,7 +262,7 @@ _db_type = os.getenv('DJANGO_DB_TYPE', 'sqlite').lower()
if _db_type == 'mysql' or _db_type.startswith('postgres') or _db_type == 'psql': # pragma: no cover if _db_type == 'mysql' or _db_type.startswith('postgres') or _db_type == 'psql': # pragma: no cover
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql', 'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql_psycopg2',
'NAME': os.environ.get('DJANGO_DB_NAME', 'tfjm'), 'NAME': os.environ.get('DJANGO_DB_NAME', 'tfjm'),
'USER': os.environ.get('DJANGO_DB_USER', 'tfjm'), 'USER': os.environ.get('DJANGO_DB_USER', 'tfjm'),
'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'), 'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'),

View File

@ -2,7 +2,6 @@
envlist = envlist =
py311 py311
py312 py312
py313
linters linters
skipsdist = True skipsdist = True