Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Django to v4 and upgrade other python dependencies #744

Merged
merged 6 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM python:3.6.9
FROM python:3.8.17
COPY django-config.sh /code/
COPY public/requirements.txt /code/public/
COPY cantus-staticpages/ /code/cantus-staticpages/
Expand Down
2 changes: 0 additions & 2 deletions app/public/cantusdata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
from django.db.models.signals import post_migrate
from .celery import app as celery_app

default_app_config = "cantusdata.CantusdataConfig"


class CantusdataConfig(AppConfig):
name = "cantusdata"
Expand Down
4 changes: 2 additions & 2 deletions app/public/cantusdata/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"django_celery_results",
"rest_framework",
"rest_framework.authtoken",
"cantusdata",
"cantusdata.CantusdataConfig",
"django_extensions",
"coverage",
)
Expand Down Expand Up @@ -89,7 +89,7 @@

DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"ENGINE": "django.db.backends.postgresql",
"NAME": os.environ.get("POSTGRES_DB"),
"USER": os.environ.get("POSTGRES_USER"),
"PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
Expand Down
4 changes: 2 additions & 2 deletions app/public/cantusdata/signals/solr_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def folio_or_manuscript_saved(self, sender, instance, created, **kwargs):
with self.get_session() as sess:
sess.schedule_update(instance, is_new=created)

def folio_or_manuscript_deleted(self, sender, instance, **kwargs):
def folio_or_manuscript_deleted(self, sender, instance, using, **kwargs):
with self.get_session() as sess:
sess.schedule_deletion(instance)

Expand All @@ -81,7 +81,7 @@ def chant_saved(self, sender, instance, created, **kwargs):
sess.schedule_update(instance.folio)
sess.schedule_update(instance.manuscript)

def chant_deleted(self, sender, instance, **kwargs):
def chant_deleted(self, sender, instance, using, **kwargs):
with self.get_session() as sess:
sess.schedule_deletion(instance)
sess.schedule_update(instance.folio)
Expand Down
20 changes: 10 additions & 10 deletions app/public/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Django==3.2.19
django-extensions==3.1.0
djangorestframework==3.12.2
Django==4.2.2
django-extensions==3.2.3
djangorestframework==3.14.0
gunicorn==20.1.0
Markdown==2.6.2
psycopg2==2.8.6
requests==2.20.0
Markdown==3.4.3
psycopg==3.1.8
requests==2.31.0
solrpy==0.9.9
coverage==4.0.3
celery==5.1.2
django-celery-results==2.4.0
Werkzeug==2.0.3
coverage==7.2.7
celery==5.3.1
django-celery-results==2.5.1
Werkzeug==2.3.6
2 changes: 1 addition & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN mv volpiano51_web/volpiano.woff ../static/fonts/volpiano.woff
COPY ./public/node/ /code/
RUN gulp build --release

FROM python:3.6.9 AS django-static
FROM python:3.8.17 AS django-static
COPY ./public/python /code

WORKDIR /code
Expand Down
4 changes: 2 additions & 2 deletions nginx/public/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django==3.2.19
psycopg2==2.8.6
Django==4.2.2
psycopg==3.1.8