From db6bd73563f4f688affea655c5e67baf453e5d76 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Sun, 5 Dec 2021 18:42:54 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Update=20verz=C3=AD=20v=20requirements.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3a411faa..3e95b816 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -c constraints.txt # basic libs -psycopg2<2.9 # Kvůli djangu 2.2, odstranit při přechodu na 3. +psycopg2 html5lib ipython Pillow @@ -13,7 +13,7 @@ Unidecode # Django and modules -Django<2.3 +Django<3.3 #django-bootstrap-sass django-mptt django-reversion @@ -34,14 +34,14 @@ django-webpack-loader django-rest-polymorphic # Comments -django-contrib-comments==1.9.0 +django-contrib-comments # debug tools/extensions -django-debug-toolbar==1.11 -django-extensions==2.1.9 -sqlparse==0.2.4 -Werkzeug==0.14.1 +django-debug-toolbar +django-extensions +sqlparse +Werkzeug # G+, FB authorisation @@ -52,7 +52,7 @@ requests # requests-oauthlib # uWSGI -uWSGI==2.0.17.1 +uWSGI # Potřeba pro test data From 42d5ddc6fb929508ebe0d8ee99fb88068c038ade Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Mon, 31 Jan 2022 20:10:39 +0100 Subject: [PATCH 2/3] =?UTF-8?q?P=C5=99id=C3=A1n=20parametr,=20kter=C3=BD?= =?UTF-8?q?=20je=20=C3=BApln=C4=9B=20k=20ni=C4=8Demu=20:-)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit env/lib/python3.9/site-packages/django/contrib/admin/checks.py:1099: RemovedInDjango30Warning: Update Seznam_PrednaskaInline.has_add_permission() to accept a positional `obj` argument. --- prednasky/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prednasky/admin.py b/prednasky/admin.py index 2688fffc..c9807b27 100644 --- a/prednasky/admin.py +++ b/prednasky/admin.py @@ -52,7 +52,7 @@ class Seznam_PrednaskaInline(admin.TabularInline): ] exclude = ['prednaska'] - def has_add_permission(self, req): return False + def has_add_permission(self, req, obj): return False class SeznamAdmin(VersionAdmin): From b6327b03d2480f8ec320def8d3843304fd79582b Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Mon, 31 Jan 2022 20:36:14 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Dal=C5=A1=C3=AD=20ne-zm=C4=9Bna=20:-)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/settings_common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index 5b7b257b..3f9edab6 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -348,4 +348,5 @@ class InvalidTemplateVariable(str): return '' TEMPLATES[0]['OPTIONS']['string_if_invalid'] = InvalidTemplateVariable('%s') - +# Django 3.2 vyžaduje explicitní nastavení autoklíče, zatím nechápu proč +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'