Skip to content

Commit

Permalink
Merge branch 'master' into fix/submit-row
Browse files Browse the repository at this point in the history
  • Loading branch information
@fsbraun
fsbraun authored May 22, 2024
2 parents 6de3ec1 + ffb93ab commit e8c4589
Show file tree
Hide file tree
Showing 36 changed files with 122 additions and 126 deletions.
5 changes: 3 additions & 2 deletions tests/requirements/compile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"py311-dj50-cms41": [],
"py312-dj50-cms41": [],
"py311-djmain-cms4dev": [],
"py311-djmain-cms41": [],
}

django_dict = {
Expand All @@ -36,8 +37,8 @@

cms_dict = {
"cms40": "https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms",
"cms41": "django-cms>=4.1.0rc2,<4.2",
"cms4dev": "https://github.com/django-cms/django-cms/tarball/release/4.1.x#egg=django-cms",
"cms41": "django-cms>=4.1,<4.2",
"cms4dev": "https://github.com/django-cms/django-cms/tarball/develop-4#egg=django-cms",
}


Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj32-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==3.2.23
django==3.2.25
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -74,7 +74,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj32-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==3.2.23
django==3.2.25
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -74,7 +74,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py310-dj40-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py310-dj40-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py310-dj41-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py310-dj41-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj42-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==4.2.8
django==4.2.13
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj42-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==4.2.8
django==4.2.13
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj50-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==5.0
django==5.0.6
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
8 changes: 4 additions & 4 deletions tests/requirements/py310-dj50-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coverage==7.3.2
# via -r requirements.in
dj-database-url==2.1.0
# via django-app-helper
django==5.0
django==5.0.6
# via
# dj-database-url
# django-classy-tags
Expand All @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py311-dj40-cms41-default.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via dj-database-url
Expand Down
6 changes: 3 additions & 3 deletions tests/requirements/py311-dj40-cms41-versioning.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ django-classy-tags==4.1.0
# -r requirements.in
# django-cms
# django-sekizai
django-cms==4.1.0rc5
django-cms==4.1.1
# via djangocms-versioning
django-formtools==2.4.1
# via django-cms
Expand All @@ -50,7 +50,7 @@ django-treebeard==4.7
# via django-cms
djangocms-admin-style==3.2.6
# via django-cms
djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master
djangocms-versioning==2.0.2
# via -r requirements.in
docopt==0.6.2
# via django-app-helper
Expand All @@ -72,7 +72,7 @@ six==1.16.0
# via django-app-helper
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via dj-database-url
Expand Down
Loading

0 comments on commit e8c4589

Please sign in to comment.