Skip to content

Commit

Permalink
feat: django 4.2 and django CMS 4.1 (#57)
Browse files Browse the repository at this point in the history
* Update readme

* Update to django CMS 4.1rc3

* Update dependencies on djangocms-versioning and djangocms-alias

* Update requirements to include filer 3.0

* Add Django-4.2 and django CMS 4.1 support

* Update requirements.in

* Update github action
  • Loading branch information
fsbraun authored Dec 31, 2023
1 parent 21fa750 commit be996aa
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
- name: Set up Python 3.11
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.11
- name: Configure sysctl limits
run: |
sudo swapoff -a
Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django CMS quickstart
A dockerised django CMS project, ready to deploy on `Divio <https://www.divio.com/>`_ or another Docker-based cloud
platform, and run locally in Docker on your own machine.

This version uses Python 3.11 and the most up-to-date versions of Django 3.2, and django CMS 4.1.0rc3
This version uses Python 3.11 and the most up-to-date versions of Django 4.2, and django CMS 4.1.0

This project is endorsed by the `django CMS Association <https://www.django-cms.org/en/about-us/>`_. That means that it
is officially accepted by the dCA as being in line with our roadmap vision and development/plugin policy. Join us on
Expand All @@ -34,7 +34,6 @@ Try it
git clone git@github.com:django-cms/django-cms-quickstart.git
cd django-cms-quickstart
git switch -t origin/support/cms-4.1.x
docker compose build web
docker compose up -d database_default
docker compose run web python manage.py migrate
Expand Down
8 changes: 4 additions & 4 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ boto3
psycopg2
uwsgi

django<4
django<5
dj-database-url
django-storage-url
whitenoise
easy-thumbnails

# key requirements for django CMS
django-cms>=4.1.0rc3
djangocms-versioning>=2.0.0rc1
djangocms-alias>=2.0.0rc1
django-cms>=4.1.0
djangocms-versioning>=2.0.0
djangocms-alias>=2.0.0

# optional, but used in most projects
djangocms-admin-style>=3.2.2
Expand Down
65 changes: 33 additions & 32 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@
#
asgiref==3.7.2
# via django
boto3==1.28.4
boto3==1.34.11
# via -r requirements.in
botocore==1.31.4
botocore==1.34.11
# via
# boto3
# s3transfer
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.5
chardet==5.2.0
# via reportlab
click==8.1.7
# via pip-tools
cssselect2==0.7.0
# via svglib
dj-database-url==2.0.0
dj-database-url==2.1.0
# via -r requirements.in
django==3.2.20
django==4.2.8
# via
# -r requirements.in
# dj-database-url
Expand All @@ -37,17 +39,18 @@ django==3.2.20
# django-storage-url
# django-storages
# django-treebeard
# djangocms-admin-style
# djangocms-alias
# djangocms-frontend
# djangocms-versioning
# easy-thumbnails
django-appconf==1.0.5
django-appconf==1.0.6
# via django-select2
django-classy-tags==4.0.0
django-classy-tags==4.1.0
# via
# django-cms
# django-sekizai
django-cms==4.1.0rc3
django-cms==4.1.0
# via
# -r requirements.in
# djangocms-alias
Expand All @@ -57,11 +60,11 @@ django-cms==4.1.0rc3
# djangocms-versioning
django-entangled==0.5.4
# via djangocms-frontend
django-filer==3.0.2
django-filer==3.1.1
# via
# -r requirements.in
# djangocms-frontend
django-formtools==2.4.1
django-formtools==2.5.1
# via django-cms
django-fsm==2.8.1
# via djangocms-versioning
Expand All @@ -73,27 +76,27 @@ django-sekizai==4.1.0
# via django-cms
django-select2==8.1.2
# via djangocms-frontend
django-storage-url==0.9.2
django-storage-url==0.12.0
# via -r requirements.in
django-storages==1.13.2
django-storages==1.14.2
# via django-storage-url
django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.4
djangocms-admin-style==3.2.6
# via
# -r requirements.in
# django-cms
djangocms-alias==2.0.0rc1
djangocms-alias==2.0.0
# via -r requirements.in
djangocms-attributes-field==3.0.0
# via djangocms-frontend
djangocms-frontend==1.1.5
djangocms-frontend==1.2.1
# via -r requirements.in
djangocms-text-ckeditor==5.1.3
djangocms-text-ckeditor==5.1.5
# via
# -r requirements.in
# djangocms-frontend
djangocms-versioning==2.0.0rc1
djangocms-versioning==2.0.0
# via -r requirements.in
easy-thumbnails[svg]==2.8.5
# via
Expand All @@ -108,35 +111,33 @@ jmespath==1.0.1
# via
# boto3
# botocore
lxml==4.9.3
lxml==5.0.0
# via svglib
orderedmultidict==1.0.1
# via furl
packaging==23.1
packaging==23.2
# via
# build
# django-cms
# djangocms-text-ckeditor
pillow==10.0.0
pillow==10.1.0
# via
# djangocms-text-ckeditor
# easy-thumbnails
# reportlab
pip-tools==7.0.0
pip-tools==7.3.0
# via -r requirements.in
psycopg2==2.9.6
psycopg2==2.9.9
# via -r requirements.in
pyproject-hooks==1.0.0
# via build
python-dateutil==2.8.2
# via botocore
pytz==2023.3
# via django
reportlab==4.0.4
reportlab==4.0.8
# via
# easy-thumbnails
# svglib
s3transfer==0.6.1
s3transfer==0.10.0
# via boto3
six==1.16.0
# via
Expand All @@ -152,20 +153,20 @@ tinycss2==1.2.1
# via
# cssselect2
# svglib
typing-extensions==4.7.1
typing-extensions==4.9.0
# via dj-database-url
urllib3==1.26.16
urllib3==2.0.7
# via botocore
uwsgi==2.0.21
uwsgi==2.0.23
# via -r requirements.in
webencodings==0.5.1
# via
# cssselect2
# html5lib
# tinycss2
wheel==0.40.0
wheel==0.42.0
# via pip-tools
whitenoise==6.5.0
whitenoise==6.6.0
# via -r requirements.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down

0 comments on commit be996aa

Please sign in to comment.