From e00f515add2b3695862ff57b4a94d559695325d1 Mon Sep 17 00:00:00 2001 From: Jens Nistler Date: Wed, 6 Mar 2024 17:15:38 +0100 Subject: [PATCH] renovate and add support for django 5 --- .github/workflows/workflow.yaml | 10 +++++++++- README.md | 3 +-- docker-compose.yaml | 6 ++---- example/settings.py | 2 +- requirements-test.txt | 22 +++++++++++----------- setup.py | 2 +- tox.ini | 1 + 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 95d0b62..5983862 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -16,23 +16,31 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" django: - django32 - django40 - django41 - django42 + - djangp50 exclude: - python-version: "3.11" django: django32 - python-version: "3.11" django: django40 + - python-version: "3.12" + django: django32 + - python-version: "3.12" + django: django40 + - python-version: "3.12" + django: django41 # Service containers to run with `runner-job` services: # Label used to access the service container postgres: # Docker Hub image - image: postgres:14-alpine + image: postgres:16-alpine # Provide the password for postgres env: POSTGRES_PASSWORD: postgres diff --git a/README.md b/README.md index 88f92f6..0e30c3d 100644 --- a/README.md +++ b/README.md @@ -216,8 +216,7 @@ class CustomCheck(BaseCheck): # CONTRIBUTE ## Dev environment -- [Docker](https://docs.docker.com/) (19.03.0 or later) -- [Compose plugin for Docker](https://docs.docker.com/compose/install/linux/) +- Latest [Docker](https://docs.docker.com/) with the integrated compose plugin Please make sure that no other container is using port 8000 as this is the one you're install gets exposed to: http://localhost:8000/ diff --git a/docker-compose.yaml b/docker-compose.yaml index 4c27d22..54c5504 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.5' - services: app: build: . @@ -21,7 +19,7 @@ services: - db db: - image: postgres:14-alpine + image: postgres:16-alpine user: postgres environment: POSTGRES_USER: app @@ -36,7 +34,7 @@ services: - datawatch-db rabbitmq: - image: rabbitmq:3.7-management + image: rabbitmq:3.13-management ports: - '15672:15672' # admin UI; credentials: guest/guest volumes: diff --git a/example/settings.py b/example/settings.py index 119bcfe..071c098 100644 --- a/example/settings.py +++ b/example/settings.py @@ -142,7 +142,7 @@ LOGIN_URL = '/admin/' -SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' +SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer' BOOTSTRAP5 = {'horizontal_label_class': 'col-md-2', 'horizontal_field_class': 'col-md-10', 'success_css_class': ''} diff --git a/requirements-test.txt b/requirements-test.txt index 59596fb..5a49112 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,14 +1,14 @@ bumpversion==0.6.0 -celery==5.2.7 +celery==5.3.6 coveralls==3.3.1 -django-bootstrap5==23.1 -django-extensions==3.2.1 -django-model-utils==4.3.1 -django-celery-beat==2.5.0 -flake8==6.0.0 -ipython==8.12.0 +django-bootstrap5==23.4 +django-extensions==3.2.3 +django-model-utils==4.4.0 +django-celery-beat==2.6.0 +flake8==7.0.0 +ipython==8.22.2 pip-check==2.8.1 -psycopg2==2.9.6 -python-dateutil==2.8.2 -tblib==1.7.0 -time-machine==2.9.0 \ No newline at end of file +psycopg==3.1.18 +python-dateutil==2.9.0.post0 +tblib==3.0.0 +time-machine==2.14.0 diff --git a/setup.py b/setup.py index c49cb7b..32fc1e3 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def long_description(): long_description_content_type='text/markdown', install_requires=[ 'celery>=5.0.0', - 'Django>=3.2,<5.0', + 'Django>=3.2,<6.0', 'django-extensions>=3.0.0', 'django-model-utils>=4.2.0', 'python-dateutil>=2.8.0', diff --git a/tox.ini b/tox.ini index d920163..7f2edf8 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,7 @@ deps = django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 + djangp50: Django>=5.0,<5.1 -r{toxinidir}/requirements-test.txt commands = pip install -U pip