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

New version of djangocms link #67

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

New version of djangocms link #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7f8265
Update requirements to test djangocms-link
fsbraun Oct 29, 2024
6115fbc
Add djangocms-link to `INSTALLED_APPS`
fsbraun Oct 29, 2024
0ed2275
improve testing setup for djangocms-link
Nov 1, 2024
7ab950f
fixing #45
Nov 2, 2024
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
9 changes: 9 additions & 0 deletions backend/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
'djangocms_alias',
'parler',

# links
'djangocms_link',

# the next-gen text editor - optional, but used in most projects
'djangocms_text',

Expand All @@ -78,6 +81,12 @@
'djangocms_frontend.contrib.image',
'djangocms_frontend.contrib.tabs',
'djangocms_frontend.contrib.utilities',

'taggit',
'taggit_autosuggest',
'meta',
'sortedm2m',
'djangocms_blog',
]

MIDDLEWARE = [
Expand Down
2 changes: 2 additions & 0 deletions backend/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

urlpatterns = [
path('admin/', admin.site.urls),
path('taggit_autosuggest/', include('taggit_autosuggest.urls')),

]

if settings.DEBUG:
Expand Down
8 changes: 6 additions & 2 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# pip-compile -U --resolver=backtracking

boto3
psycopg2
psycopg2-binary
uwsgi

django<=6
Expand All @@ -24,7 +24,11 @@ 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

# 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

Expand Down
81 changes: 56 additions & 25 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
# 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
#
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
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
Expand All @@ -36,44 +36,65 @@ django==5.0.9
# django-sekizai
# django-storage-url
# django-storages
# django-taggit
# django-taggit-templatetags
# 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-blog
# 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-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
Expand All @@ -83,17 +104,24 @@ 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-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
# 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
# djangocms-blog
# djangocms-frontend
furl==2.1.3
# via django-storage-url
Expand All @@ -103,6 +131,7 @@ jmespath==1.0.1
# botocore
lxml==5.3.0
# via
# djangocms-blog
# djangocms-text
# svglib
nh3==0.2.18
Expand All @@ -114,26 +143,28 @@ 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-binary==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
pytz==2024.2
# via djangocms-blog
reportlab==4.2.5
# via
# easy-thumbnails
# svglib
s3transfer==0.10.2
s3transfer==0.10.3
# via boto3
six==1.16.0
# via
Expand All @@ -144,23 +175,23 @@ 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
# cssselect2
# 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:
Expand Down