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.

Sign up for GitHub

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

Jump to bottom

Make the app compatible with Django 3 #130

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make the app compatible with Django 3 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca5b2a1
Bump django to > 3.1
Guts Jan 4, 2021
97e6bd9
Remove render_to_response
Guts Jan 4, 2021
0728744
Use load static instead of deprecated tags
Guts Jan 4, 2021
1a127ef
dépendances: définit django>=3.2 (LTS)
Guts Nov 21, 2023
0a00725
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 21, 2023
9b94054
docs: MAJ les dépendances
Guts Nov 21, 2023
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 elgeopaso/cms/templates/cms/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load static %}
{% block content %}
<div class="text">{{ content|safe }}</div>
{% endblock content %}
6 changes: 3 additions & 3 deletions elgeopaso/cms/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.shortcuts import get_object_or_404, render, render_to_response
from django.shortcuts import get_object_or_404, render
from django.views.decorators.cache import cache_page
from django.views.decorators.gzip import gzip_page
from django.views.decorators.http import require_safe
Expand Down Expand Up @@ -37,7 +37,7 @@ def docs(request):
@cache_page(60 * 60)
def view_category(request, slug):
category = get_object_or_404(Category, slug_name=slug)
return render_to_response(
return render(
"cms/category_detail.html",
{
"categories": Category.objects.all(),
Expand All @@ -53,7 +53,7 @@ def view_category(request, slug):
@gzip_page
@cache_page(60 * 60)
def view_article(request, slug, category):
return render_to_response(
return render(
"cms/article_detail.html",
{"article": get_object_or_404(Article, slug_title=slug)},
)
2 changes: 1 addition & 1 deletion elgeopaso/templates/admin/base_site.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "admin/base.html" %}
{% load admin_static %}
{% load static %}


<!-- {# Additional <head> content here, some extra meta tags or favicon #}
Expand Down
2 changes: 1 addition & 1 deletion elgeopaso/templates/jobs/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load static %}
{% load widget_tweaks %}
{% load tpl_extras %}
{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion elgeopaso/templates/jobs/timeline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load static %}
{% block content %}
<div class="container">
<div class="page-header">
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel

# Django
# -----------------------
django>=2.2,<3
django>=3.2,<4
django-allauth>=0.42,<0.45 # https://django-allauth.readthedocs.io
django-crispy-forms==1.11.* # https://django-crispy-forms.readthedocs.io
django-ckeditor>=6.0,<6.8
Expand Down
10 changes: 5 additions & 5 deletions requirements/documentation.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Documentation (for devs)
# -----------------------

myst-parser[linkify]>=0.14,<0.16
sphinx-autobuild==2021.3.14
sphinx-autodoc-typehints>=1.11,<1.13
myst-parser[linkify]>=2
sphinx-autobuild>=2021
sphinx-autodoc-typehints>=1.11
sphinx-copybutton<1
sphinx-rtd-theme<1
sphinxext-opengraph>=0.4,<1
sphinx-rtd-theme
sphinxext-opengraph>=0.4
Loading