Skip to content

Commit

Permalink
renovate and add support for django 5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jens Nistler committed Mar 6, 2024
1 parent 74a11a5 commit e00f515
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 20 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 2 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:
app:
build: .
Expand All @@ -21,7 +19,7 @@ services:
- db

db:
image: postgres:14-alpine
image: postgres:16-alpine
user: postgres
environment:
POSTGRES_USER: app
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion example/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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': ''}

Expand Down
22 changes: 11 additions & 11 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -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
psycopg==3.1.18
python-dateutil==2.9.0.post0
tblib==3.0.0
time-machine==2.14.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e00f515

Please sign in to comment.