From a7f8265083fd8e3ce5d889a3c09e2e938a0a16a6 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 29 Oct 2024 08:09:19 +0100 Subject: [PATCH 1/4] Update requirements to test djangocms-link --- requirements.in | 3 ++- requirements.txt | 52 ++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/requirements.in b/requirements.in index d8b3bb6..f08fdec 100644 --- a/requirements.in +++ b/requirements.in @@ -24,7 +24,8 @@ djangocms-text # optional django CMS frontend -djangocms-frontend +git+https://github.com/fsbraun/djangocms-frontend@feat/djangocms-link-support#egg=djangocms-frontend +git+https://github.com/django-cms/djangocms-link@feat/url-mngr#egg=djangocms-link django-filer diff --git a/requirements.txt b/requirements.txt index 24a1326..82b7ad7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,18 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements.txt requirements.in # asgiref==3.8.1 # via django -boto3==1.35.11 +boto3==1.35.50 # via -r requirements.in -botocore==1.35.11 +botocore==1.35.50 # via # boto3 # s3transfer -build==1.2.1 +build==1.2.2.post1 # via pip-tools chardet==5.2.0 # via reportlab @@ -20,9 +20,9 @@ click==8.1.7 # via pip-tools cssselect2==0.7.0 # via svglib -dj-database-url==2.2.0 +dj-database-url==2.3.0 # via -r requirements.in -django==5.0.9 +django==5.1.2 # via # -r requirements.in # dj-database-url @@ -39,24 +39,24 @@ django==5.0.9 # django-treebeard # djangocms-admin-style # djangocms-alias - # djangocms-frontend # djangocms-versioning # easy-thumbnails django-classy-tags==4.1.0 # via # django-cms # django-sekizai -django-cms==4.1.2 +django-cms==4.1.3 # via # -r requirements.in # djangocms-alias # djangocms-attributes-field # djangocms-frontend + # djangocms-link # djangocms-text # djangocms-versioning -django-entangled==0.5.4 +django-entangled==0.6.2 # via djangocms-frontend -django-filer==3.2.0 +django-filer==3.2.3 # via # -r requirements.in # djangocms-frontend @@ -83,14 +83,18 @@ djangocms-admin-style==3.3.1 djangocms-alias==2.0.1 # via -r requirements.in djangocms-attributes-field==3.0.0 - # via djangocms-frontend -djangocms-frontend==1.3.3 + # via + # djangocms-frontend + # djangocms-link +djangocms-frontend @ git+https://github.com/fsbraun/djangocms-frontend@feat/djangocms-link-support + # via -r requirements.in +djangocms-link @ git+https://github.com/django-cms/djangocms-link@feat/url-mngr # via -r requirements.in -djangocms-text==0.2.3 +djangocms-text==0.3.2 # via -r requirements.in -djangocms-versioning==2.0.2 +djangocms-versioning==2.1.0 # via -r requirements.in -easy-thumbnails[svg]==2.9 +easy-thumbnails[svg]==2.10 # via # -r requirements.in # django-filer @@ -114,26 +118,26 @@ packaging==24.1 # build # django-cms # djangocms-text -pillow==10.4.0 +pillow==11.0.0 # via # djangocms-text # easy-thumbnails # reportlab pip-tools==7.4.1 # via -r requirements.in -psycopg2==2.9.9 +psycopg2==2.9.10 # via -r requirements.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools python-dateutil==2.9.0.post0 # via botocore -reportlab==4.2.2 +reportlab==4.2.5 # via # easy-thumbnails # svglib -s3transfer==0.10.2 +s3transfer==0.10.3 # via boto3 six==1.16.0 # via @@ -144,15 +148,15 @@ sqlparse==0.5.1 # via django svglib==1.5.1 # via easy-thumbnails -tinycss2==1.3.0 +tinycss2==1.4.0 # via # cssselect2 # svglib typing-extensions==4.12.2 # via dj-database-url -urllib3==2.2.2 +urllib3==2.2.3 # via botocore -uwsgi==2.0.26 +uwsgi==2.0.28 # via -r requirements.in webencodings==0.5.1 # via @@ -160,7 +164,7 @@ webencodings==0.5.1 # tinycss2 wheel==0.44.0 # via pip-tools -whitenoise==6.7.0 +whitenoise==6.8.1 # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: From 6115fbc9ac34873cca2a0a2c59ce2d5b64f37cc1 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 29 Oct 2024 23:21:58 +0100 Subject: [PATCH 2/4] Add djangocms-link to `INSTALLED_APPS` --- backend/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/settings.py b/backend/settings.py index 14314ea..286d9d8 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -57,6 +57,9 @@ 'djangocms_alias', 'parler', + # links + 'djangocms-link', + # the next-gen text editor - optional, but used in most projects 'djangocms_text', From 0ed227506083565768e89f399b4767b9219cfd16 Mon Sep 17 00:00:00 2001 From: Mario Colombo Date: Fri, 1 Nov 2024 10:24:05 +0100 Subject: [PATCH 3/4] improve testing setup for djangocms-link --- backend/settings.py | 10 ++++++++-- backend/urls.py | 2 ++ requirements.txt | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/backend/settings.py b/backend/settings.py index 286d9d8..09fee1a 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -58,8 +58,8 @@ 'parler', # links - 'djangocms-link', - + 'djangocms_link', + # the next-gen text editor - optional, but used in most projects 'djangocms_text', @@ -81,6 +81,12 @@ 'djangocms_frontend.contrib.image', 'djangocms_frontend.contrib.tabs', 'djangocms_frontend.contrib.utilities', + + 'taggit', + 'taggit_autosuggest', + 'meta', + 'sortedm2m', + 'djangocms_blog', ] MIDDLEWARE = [ diff --git a/backend/urls.py b/backend/urls.py index 4d8bcc7..7ec64af 100644 --- a/backend/urls.py +++ b/backend/urls.py @@ -5,6 +5,8 @@ urlpatterns = [ path('admin/', admin.site.urls), + path('taggit_autosuggest/', include('taggit_autosuggest.urls')), + ] if settings.DEBUG: diff --git a/requirements.txt b/requirements.txt index 82b7ad7..790bc59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,9 @@ # # pip-compile --output-file=requirements.txt requirements.in # + +git+https://github.com/fsbraun/djangocms-blog.git@develop-4#egg=djangocms-blog + asgiref==3.8.1 # via django boto3==1.35.50 From 7ab950f036fde7b6cdaa55b5eb2b447b6fb44b92 Mon Sep 17 00:00:00 2001 From: Mario Colombo Date: Sat, 2 Nov 2024 12:35:35 +0100 Subject: [PATCH 4/4] fixing #45 --- requirements.in | 5 ++++- requirements.txt | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/requirements.in b/requirements.in index f08fdec..04a9b24 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ # pip-compile -U --resolver=backtracking boto3 -psycopg2 +psycopg2-binary uwsgi django<=6 @@ -27,6 +27,9 @@ djangocms-text git+https://github.com/fsbraun/djangocms-frontend@feat/djangocms-link-support#egg=djangocms-frontend git+https://github.com/django-cms/djangocms-link@feat/url-mngr#egg=djangocms-link +# optional for testing of the blog functionalities and for testing djangocms-link +git+https://github.com/fsbraun/djangocms-blog.git@develop-4#egg=djangocms-blog + django-filer diff --git a/requirements.txt b/requirements.txt index 790bc59..90c0902 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,9 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --output-file=requirements.txt requirements.in +# pip-compile requirements.in # - -git+https://github.com/fsbraun/djangocms-blog.git@develop-4#egg=djangocms-blog - asgiref==3.8.1 # via django boto3==1.35.50 @@ -39,6 +36,8 @@ django==5.1.2 # django-sekizai # django-storage-url # django-storages + # django-taggit + # django-taggit-templatetags # django-treebeard # djangocms-admin-style # djangocms-alias @@ -53,6 +52,7 @@ django-cms==4.1.3 # -r requirements.in # djangocms-alias # djangocms-attributes-field + # djangocms-blog # djangocms-frontend # djangocms-link # djangocms-text @@ -62,21 +62,39 @@ django-entangled==0.6.2 django-filer==3.2.3 # via # -r requirements.in + # djangocms-blog # djangocms-frontend django-formtools==2.5.1 # via django-cms django-fsm==2.8.2 # via djangocms-versioning +django-meta==2.4.2 + # via djangocms-blog django-parler==2.3 - # via djangocms-alias + # via + # djangocms-alias + # djangocms-blog django-polymorphic==3.1.0 # via django-filer django-sekizai==4.1.0 # via django-cms +django-sortedm2m==4.0.0 + # via djangocms-blog django-storage-url==0.12.1 # via -r requirements.in django-storages==1.14.4 # via django-storage-url +django-taggit==6.1.0 + # via + # django-taggit-autosuggest + # django-taggit-templatetags + # djangocms-blog +django-taggit-autosuggest==0.4.1 + # via djangocms-blog +django-taggit-templatetags==0.2.5 + # via djangocms-blog +django-templatetag-sugar==1.0 + # via django-taggit-templatetags django-treebeard==4.7.1 # via django-cms djangocms-admin-style==3.3.1 @@ -89,6 +107,8 @@ djangocms-attributes-field==3.0.0 # via # djangocms-frontend # djangocms-link +djangocms-blog @ git+https://github.com/fsbraun/djangocms-blog.git@develop-4 + # via -r requirements.in djangocms-frontend @ git+https://github.com/fsbraun/djangocms-frontend@feat/djangocms-link-support # via -r requirements.in djangocms-link @ git+https://github.com/django-cms/djangocms-link@feat/url-mngr @@ -101,6 +121,7 @@ easy-thumbnails[svg]==2.10 # via # -r requirements.in # django-filer + # djangocms-blog # djangocms-frontend furl==2.1.3 # via django-storage-url @@ -110,6 +131,7 @@ jmespath==1.0.1 # botocore lxml==5.3.0 # via + # djangocms-blog # djangocms-text # svglib nh3==0.2.18 @@ -128,7 +150,7 @@ pillow==11.0.0 # reportlab pip-tools==7.4.1 # via -r requirements.in -psycopg2==2.9.10 +psycopg2-binary==2.9.10 # via -r requirements.in pyproject-hooks==1.2.0 # via @@ -136,6 +158,8 @@ pyproject-hooks==1.2.0 # pip-tools python-dateutil==2.9.0.post0 # via botocore +pytz==2024.2 + # via djangocms-blog reportlab==4.2.5 # via # easy-thumbnails