Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
a3b0f601
Commit
a3b0f601
authored
2 years ago
by
jan.bednarik
Browse files
Options
Downloads
Patches
Plain Diff
Upgrade to Wagtail 4.1.1 and Django 4.1
parent
81debbac
No related branches found
No related tags found
2 merge requests
!706
Release
,
!705
Upgrade
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
requirements/base.txt
+53
-69
53 additions, 69 deletions
requirements/base.txt
requirements/dev.in
+1
-1
1 addition, 1 deletion
requirements/dev.in
requirements/dev.txt
+19
-21
19 additions, 21 deletions
requirements/dev.txt
with
73 additions
and
91 deletions
requirements/base.txt
+
53
−
69
View file @
a3b0f601
...
...
@@ -10,33 +10,33 @@ anyascii==0.3.1
# via wagtail
appnope==0.1.3
# via ipython
arrow==1.2.
2
arrow==1.2.
3
# via
# -r base.in
# ics
asgiref==3.
5.2
asgiref==3.
6.0
# via django
asttokens==2.
0.5
asttokens==2.
2.1
# via stack-data
async-timeout==4.0.2
# via redis
attrs==22.
1
.0
attrs==22.
2
.0
# via ics
backcall==0.2.0
# via ipython
beautifulsoup4==4.
9.3
beautifulsoup4==4.
11.1
# via
# -r base.in
# wagtail
billiard==3.6.4.0
# via celery
bleach==
5
.0.
1
bleach==
6
.0.
0
# via -r base.in
brotli==1.0.9
# via fonttools
celery==5.2.7
# via -r base.in
certifi==2022.
6.15
certifi==2022.
12.7
# via
# requests
# sentry-sdk
...
...
@@ -44,7 +44,7 @@ cffi==1.15.1
# via
# cryptography
# weasyprint
charset-normalizer==
2.1.0
charset-normalizer==
3.0.1
# via requests
click==8.1.3
# via
...
...
@@ -58,20 +58,18 @@ click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
cryptography==3
7
.0.
4
cryptography==3
9
.0.
0
# via
# josepy
# mozilla-django-oidc
# pyopenssl
cssselect2==0.
6
.0
cssselect2==0.
7
.0
# via weasyprint
datetime==4.3
# via icalevnt
decorator==5.1.1
# via ipython
deprecated==1.2.13
# via redis
django==4.0.7
django==4.1.5
# via
# django-extensions
# django-filter
...
...
@@ -88,9 +86,9 @@ django==4.0.7
# wagtail
django-environ==0.9.0
# via -r base.in
django-extensions==3.2.
0
django-extensions==3.2.
1
# via -r base.in
django-filter==2
1
.1
django-filter==2
2
.1
# via wagtail
django-modelcluster==6.0
# via wagtail
...
...
@@ -104,23 +102,23 @@ django-settings-export==1.2.1
# via -r base.in
django-simple-captcha==0.5.17
# via -r base.in
django-taggit==
2
.1.0
django-taggit==
3
.1.0
# via wagtail
django-treebeard==4.
5.1
django-treebeard==4.
6.0
# via wagtail
django-widget-tweaks==1.4.12
# via -r base.in
djangorestframework==3.1
3.1
djangorestframework==3.1
4.0
# via wagtail
draftjs-exporter==2.1.7
# via wagtail
et-xmlfile==1.1.0
# via openpyxl
executing==
0.9.1
executing==
1.2.0
# via stack-data
fastjsonschema==2.16.
1
fastjsonschema==2.16.
2
# via -r base.in
fonttools[woff]==4.3
4.4
fonttools[woff]==4.3
8.0
# via weasyprint
html5lib==1.1
# via
...
...
@@ -134,11 +132,11 @@ icalevnt==0.1.26
# via -r base.in
ics==0.7.2
# via -r base.in
idna==3.
3
idna==3.
4
# via requests
ipython==8.
4
.0
ipython==8.
9
.0
# via -r base.in
jedi==0.18.
1
jedi==0.18.
2
# via ipython
josepy==1.13.0
# via mozilla-django-oidc
...
...
@@ -148,40 +146,38 @@ l18n==2021.3
# via wagtail
markdown==3.4.1
# via -r base.in
matplotlib-inline==0.1.
3
matplotlib-inline==0.1.
6
# via ipython
mozilla-django-oidc==2.0.0
# via pirates
numpy==1.2
3
.1
numpy==1.2
4
.1
# via opencv-python
oauthlib==3.2.
0
oauthlib==3.2.
2
# via
# requests-oauthlib
# tweepy
opencv-python==4.
6
.0.6
6
opencv-python==4.
7
.0.6
8
# via -r base.in
openpyxl==3.0.10
# via tablib
packaging==21.3
# via redis
# via wagtail
parso==0.8.3
# via jedi
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pillow==9.
2
.0
pillow==9.
4
.0
# via
# django-simple-captcha
# wagtail
# weasyprint
pirates==0.6.0
# via -r base.in
prompt-toolkit==3.0.3
0
prompt-toolkit==3.0.3
6
# via
# click-repl
# ipython
psycopg2-binary==2.9.
3
psycopg2-binary==2.9.
5
# via -r base.in
ptyprocess==0.7.0
# via pexpect
...
...
@@ -189,19 +185,17 @@ pure-eval==0.2.2
# via stack-data
pycparser==2.21
# via cffi
pydyf==0.
2
.0
pydyf==0.
5
.0
# via weasyprint
pygments==2.1
2
.0
pygments==2.1
4
.0
# via ipython
pyopenssl==2
2
.0.0
pyopenssl==2
3
.0.0
# via josepy
pyparsing==2.4.7
# via
# httplib2
# packaging
pypdf2==2.9.0
# via httplib2
pypdf2==3.0.1
# via -r base.in
pyphen==0.1
2.0
pyphen==0.1
3.2
# via weasyprint
python-dateutil==2.8.2
# via
...
...
@@ -220,9 +214,9 @@ pytz==2021.3
# l18n
pyyaml==6.0
# via -r base.in
redis==4.
3.4
redis==4.
4.2
# via django-redis
requests==2.28.
1
requests==2.28.
2
# via
# -r base.in
# mozilla-django-oidc
...
...
@@ -231,7 +225,7 @@ requests==2.28.1
# wagtail
requests-oauthlib==1.3.1
# via tweepy
sentry-sdk==1.
9.2
sentry-sdk==1.
14.0
# via -r base.in
six==1.16.0
# via
...
...
@@ -244,27 +238,25 @@ six==1.16.0
# python-dateutil
soupsieve==2.3.2.post1
# via beautifulsoup4
sqlparse==0.4.
2
sqlparse==0.4.
3
# via django
stack-data==0.
3.0
stack-data==0.
6.2
# via ipython
tablib[xls,xlsx]==3.2.1
# via wagtail
tatsu==5.8.3
# via ics
telepath==0.
2
telepath==0.
3
# via wagtail
tinycss2==1.
1
.1
tinycss2==1.
2
.1
# via
# cssselect2
# weasyprint
traitlets==5.
3
.0
traitlets==5.
9
.0
# via
# ipython
# matplotlib-inline
tweepy==4.1
0.0
tweepy==4.1
2.1
# via -r base.in
urllib3==1.26.1
1
urllib3==1.26.1
4
# via
# requests
# sentry-sdk
...
...
@@ -273,18 +265,18 @@ vine==5.0.0
# amqp
# celery
# kombu
wagtail==
3.0
.1
wagtail==
4.1
.1
# via
# -r base.in
# wagtail-metadata
# wagtail-trash
wagtail-metadata==4.0.
0
wagtail-metadata==4.0.
2
# via -r base.in
wagtail-trash==0.3.0
# via -r base.in
wcwidth==0.2.
5
wcwidth==0.2.
6
# via prompt-toolkit
weasyprint==5
6.1
weasyprint==5
7.2
# via -r base.in
webencodings==0.5.1
# via
...
...
@@ -292,21 +284,13 @@ webencodings==0.5.1
# cssselect2
# html5lib
# tinycss2
whitenoise==6.
2
.0
whitenoise==6.
3
.0
# via -r base.in
willow==1.4.1
# via wagtail
wrapt==1.14.1
# via deprecated
xlrd==2.0.1
# via tablib
xlsxwriter==3.0.3
# via wagtail
xlwt==1.3.0
# via tablib
zope-interface==5.4.0
zope-interface==5.5.2
# via datetime
zopfli==0.2.
1
zopfli==0.2.
2
# via fonttools
# The following packages are considered to be unsafe in a requirements file:
...
...
This diff is collapsed.
Click to expand it.
requirements/dev.in
+
1
−
1
View file @
a3b0f601
django
<4.1
django
django-debug-toolbar
pytest
pytest-sugar
...
...
This diff is collapsed.
Click to expand it.
requirements/dev.txt
+
19
−
21
View file @
a3b0f601
...
...
@@ -4,41 +4,39 @@
#
# pip-compile dev.in
#
asgiref==3.
5.2
asgiref==3.
6.0
# via django
attrs==22.
1
.0
attrs==22.
2
.0
# via pytest
coverage[toml]==
6.4.2
coverage[toml]==
7.1.0
# via pytest-cov
django==4.
0.7
django==4.
1.5
# via
# -r dev.in
# django-debug-toolbar
django-debug-toolbar==3.
5.0
django-debug-toolbar==3.
8.1
# via -r dev.in
exceptiongroup==1.1.0
# via pytest
factory-boy==3.2.1
# via pytest-factoryboy
faker==1
3.15
.1
faker==1
6.6
.1
# via factory-boy
fastdiff==0.3.0
# via snapshottest
freezegun==1.2.
1
freezegun==1.2.
2
# via pytest-freezegun
inflection==0.5.1
# via pytest-factoryboy
iniconfig==
1.1.1
iniconfig==
2.0.0
# via pytest
packaging==2
1.3
packaging==2
3.0
# via
# pytest
# pytest-sugar
pluggy==1.0.0
# via pytest
py==1.11.0
# via pytest
pyparsing==2.4.7
# via packaging
pytest==7.1.2
pytest==7.2.1
# via
# -r dev.in
# pytest-cov
...
...
@@ -47,17 +45,17 @@ pytest==7.1.2
# pytest-freezegun
# pytest-mock
# pytest-sugar
pytest-cov==
3
.0.0
pytest-cov==
4
.0.0
# via -r dev.in
pytest-django==4.5.2
# via -r dev.in
pytest-factoryboy==2.5.
0
pytest-factoryboy==2.5.
1
# via -r dev.in
pytest-freezegun==0.4.2
# via -r dev.in
pytest-mock==3.
8.2
pytest-mock==3.
10.0
# via -r dev.in
pytest-sugar==0.9.
5
pytest-sugar==0.9.
6
# via -r dev.in
python-dateutil==2.8.2
# via
...
...
@@ -69,11 +67,11 @@ six==1.16.0
# snapshottest
snapshottest==0.6.0
# via -r dev.in
sqlparse==0.4.
2
sqlparse==0.4.
3
# via
# django
# django-debug-toolbar
termcolor==
1.1
.0
termcolor==
2.2
.0
# via
# pytest-sugar
# snapshottest
...
...
@@ -81,7 +79,7 @@ tomli==2.0.1
# via
# coverage
# pytest
typing-extensions==4.
3
.0
typing-extensions==4.
4
.0
# via pytest-factoryboy
wasmer==1.1.0
# via fastdiff
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment