Skip to content

Commit

Permalink
Downgrade from Django 4.0 to Django 3.2
Browse files Browse the repository at this point in the history
Unfortunately wpull only supports Python 3.6, see

- ArchiveTeam/wpull#404
- ArchiveTeam/wpull#451

Django 4.0 dropped support for Python 3.6, see

https://docs.djangoproject.com/en/4.2/releases/4.0/#python-compatibility

In order to integrate wpull with the viewer application, we need to
downgrade the viewer Django version from 4.0 to 3.2.
  • Loading branch information
chosak committed Oct 18, 2023
1 parent af5d01c commit 8c9ed4a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
12 changes: 6 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
click==8.1.3
click==8.0.4
cssselect==1.1.0
Django==4.0.7
Django==3.2.22
django-click==2.3.0
django-debug-toolbar==3.4.0
django-filter==22.1
django-modelcluster==6.0
django-debug-toolbar==3.2.4
django-filter==21.1
django-modelcluster==5.3
djangorestframework==3.13.1
djangorestframework-csv==2.1.1
lxml==4.9.1
warcio==1.7.4
whitenoise==6.1.0
whitenoise==5.3.0
16 changes: 7 additions & 9 deletions settings.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
"""
Django settings for viewer project.
Generated by 'django-admin startproject' using Django 4.0.3.
For more information on this file, see
https://docs.djangoproject.com/en/4.0/topics/settings/
https://docs.djangoproject.com/en/3.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.0/ref/settings/
https://docs.djangoproject.com/en/3.2/ref/settings/
"""
import os
import sys
Expand All @@ -18,7 +16,7 @@


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = "django-insecure-a94cjadrz=y0o+c75138ro=gn3oq0*by)gs1cs88k$9+taepp("
Expand Down Expand Up @@ -73,7 +71,7 @@


# Database
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases

_sample_db_path = str(BASE_DIR / "sample" / "sample.sqlite3")
_env_db_path = os.getenv("CRAWL_DATABASE")
Expand All @@ -97,7 +95,7 @@
}

# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/
# https://docs.djangoproject.com/en/3.2/topics/i18n/

LANGUAGE_CODE = "en-us"

Expand All @@ -109,12 +107,12 @@


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.0/howto/static-files/
# https://docs.djangoproject.com/en/3.2/howto/static-files/

STATIC_URL = "static/"

# Default primary key field type
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

Expand Down
2 changes: 1 addition & 1 deletion wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/
"""

import os
Expand Down

0 comments on commit 8c9ed4a

Please sign in to comment.