2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-14 19:15:41 +00:00

Bump to Dj 4.x (#6173)

* bump to dj >4.2

* switch to experimental git release

* bump django-import_export

* bump mptt

* replace is_ajax, which was removed
https://docs.djangoproject.com/en/3.1/releases/3.1/#id2

* Save before accessing values in m2m/fk fields

* move plugin init

* use dev version of django for fix

* update deps

* fix deps

* use django smaller 4.2

* fix reqs

* fix merge

* remove moved code

* another merge fix

* fix ajax call

* fix refs

* change python min v

* fix deps

* bump deps

* fix deps

* pin pillow

* dj 4.1 upgrades

* make diff smaller

* bump all deps

* drop down to py3.9

* bump versions

* merge fix

* fix diff

* more bumping

* diff cleanup

* bump deps

* fix reqs

* use accurate state for model migrations
using apps the historically correct state is used

* try import

* added more logs

* add try here too

* clean up rebuilds

* Dj 4.2 (#161)

* autochanges

* bump

* fix diff

* fix diff

* bump deps

* fix req

* remove select_related to test error influence

* switch to mptt fork

* fix reqs for upstream

* move tracking ensureance into save

* optimize check frequency

* use psycopg instead of psycopg2

* fix header

* just use the values

* switch to dj < 4.2

* fix req

* another req fix

* switch to 4.2 again

* fix merge error

* Check for null pk in calculate_total_price

Cannot access self.lines if pk is Null

* use patched mptt

* try psycopg2 again

* Remove tree rebuild from migrations

* Prevent notify_users if importing or migrating

* Add order_by() to subquery annotations

- Ref: https://stackoverflow.com/a/629691

* Update stock filters

- Append order_by()

* fix error if running without timezones in testing

* add logging to figure this out

* remove tz from self.creation if TZ is off

* add tz?

* move around?

* only run the test i am trying to figure out
not reproducible on my machine

* only run the test i am trying to figure out
not reproducible on my machine

* run all tests again

---------

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
Matthias Mair
2024-02-06 02:30:50 +00:00
committed by GitHub
parent 676bb02f6e
commit d36cf358f8
29 changed files with 151 additions and 178 deletions

View File

@ -5,14 +5,16 @@
# pip-compile --output-file=requirements.txt requirements.in
#
asgiref==3.7.2
# via django
# via
# django
# django-cors-headers
async-timeout==4.0.3
# via redis
attrs==23.1.0
attrs==23.2.0
# via
# jsonschema
# referencing
babel==2.13.1
babel==2.14.0
# via py-moneyed
backoff==2.2.1
# via
@ -25,7 +27,7 @@ bleach[css]==6.1.0
# django-markdownify
brotli==1.1.0
# via fonttools
certifi==2023.7.22
certifi==2023.11.17
# via
# requests
# sentry-sdk
@ -39,7 +41,7 @@ coreapi==2.3.3
# via -r requirements.in
coreschema==0.0.4
# via coreapi
cryptography==41.0.6
cryptography==41.0.7
# via
# -r requirements.in
# djangorestframework-simplejwt
@ -59,7 +61,7 @@ diff-match-patch==20230430
# via django-import-export
dj-rest-auth==5.0.2
# via -r requirements.in
django==3.2.23
django==4.2.9
# via
# -r requirements.in
# dj-rest-auth
@ -76,7 +78,6 @@ django==3.2.23
# django-js-asset
# django-markdownify
# django-money
# django-mptt
# django-otp
# django-picklefield
# django-q2
@ -101,7 +102,7 @@ django-allauth-2fa==0.11.1
# via -r requirements.in
django-cleanup==8.0.0
# via -r requirements.in
django-cors-headers==4.3.0
django-cors-headers==4.3.1
# via -r requirements.in
django-crispy-forms==1.14.0
# via -r requirements.in
@ -109,17 +110,17 @@ django-dbbackup==4.0.2
# via -r requirements.in
django-error-report-2==0.4.2
# via -r requirements.in
django-filter==23.3
django-filter==23.5
# via -r requirements.in
django-flags==5.0.13
# via -r requirements.in
django-formtools==2.4.1
django-formtools==2.5.1
# via -r requirements.in
django-ical==1.9.2
# via -r requirements.in
django-import-export==3.3.1
django-import-export==3.3.5
# via -r requirements.in
django-js-asset==2.1.0
django-js-asset==2.2.0
# via django-mptt
django-maintenance-mode==0.21.0
# via -r requirements.in
@ -127,9 +128,9 @@ django-markdownify==0.9.3
# via -r requirements.in
django-money==3.2.0
# via -r requirements.in
django-mptt==0.11.0
django-mptt==0.16.0
# via -r requirements.in
django-otp==1.2.4
django-otp==1.3.0
# via django-allauth-2fa
django-picklefield==3.1
# via django-q2
@ -141,7 +142,7 @@ django-recurrence==1.11.1
# via django-ical
django-redis==5.4.0
# via -r requirements.in
django-sesame==3.2.1
django-sesame==3.2.2
# via -r requirements.in
django-sql-utils==0.7.0
# via -r requirements.in
@ -149,11 +150,11 @@ django-sslserver==0.22
# via -r requirements.in
django-stdimage==6.0.2
# via -r requirements.in
django-taggit==4.0.0
django-taggit==5.0.1
# via -r requirements.in
django-user-sessions==2.0.0
# via -r requirements.in
django-weasyprint==2.2.1
django-weasyprint==2.2.2
# via -r requirements.in
django-xforwardedfor-middleware==2.0
# via -r requirements.in
@ -163,15 +164,15 @@ djangorestframework==3.14.0
# dj-rest-auth
# djangorestframework-simplejwt
# drf-spectacular
djangorestframework-simplejwt[crypto]==5.3.0
djangorestframework-simplejwt[crypto]==5.3.1
# via -r requirements.in
drf-spectacular==0.26.5
drf-spectacular==0.27.0
# via -r requirements.in
dulwich==0.21.6
dulwich==0.21.7
# via -r requirements.in
et-xmlfile==1.1.0
# via openpyxl
feedparser==6.0.10
feedparser==6.0.11
# via -r requirements.in
fonttools[woff]==4.44.0
# via
@ -189,7 +190,7 @@ html5lib==1.1
# via weasyprint
icalendar==5.0.11
# via django-ical
idna==3.4
idna==3.6
# via requests
importlib-metadata==6.8.0
# via
@ -202,9 +203,9 @@ itypes==1.2.0
# via coreapi
jinja2==3.1.3
# via coreschema
jsonschema==4.19.2
jsonschema==4.20.0
# via drf-spectacular
jsonschema-specifications==2023.7.1
jsonschema-specifications==2023.12.1
# via jsonschema
markdown==3.5.1
# via django-markdownify
@ -277,7 +278,7 @@ opentelemetry-util-http==0.43b0
# opentelemetry-instrumentation-wsgi
packaging==23.2
# via gunicorn
pdf2image==1.16.3
pdf2image==1.17.0
# via -r requirements.in
pillow==10.2.0
# via
@ -316,13 +317,12 @@ python-dateutil==2.8.2
# icalendar
python-dotenv==1.0.0
# via -r requirements.in
python-fsutil==0.12.0
python-fsutil==0.13.0
# via django-maintenance-mode
python3-openid==3.2.0
# via django-allauth
pytz==2023.3.post1
# via
# django
# django-dbbackup
# djangorestframework
# icalendar
@ -339,11 +339,11 @@ rapidfuzz==0.7.6
# via -r requirements.in
redis==5.0.1
# via django-redis
referencing==0.30.2
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
regex==2023.10.3
regex==2023.12.25
# via -r requirements.in
requests==2.31.0
# via
@ -353,11 +353,11 @@ requests==2.31.0
# requests-oauthlib
requests-oauthlib==1.3.1
# via django-allauth
rpds-py==0.12.0
rpds-py==0.16.2
# via
# jsonschema
# referencing
sentry-sdk==1.34.0
sentry-sdk==1.39.2
# via
# -r requirements.in
# django-q-sentry
@ -381,9 +381,10 @@ tinycss2==1.2.1
# bleach
# cssselect2
# weasyprint
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# asgiref
# drf-spectacular
# opentelemetry-sdk
# py-moneyed
# qrcode
@ -391,12 +392,12 @@ uritemplate==4.1.1
# via
# coreapi
# drf-spectacular
urllib3==2.0.7
urllib3==2.1.0
# via
# dulwich
# requests
# sentry-sdk
weasyprint==60.1
weasyprint==60.2
# via
# -r requirements.in
# django-weasyprint
@ -415,7 +416,7 @@ xlrd==2.0.1
# via tablib
xlwt==1.3.0
# via tablib
zipp==3.16.0
zipp==3.16.2
# via importlib-metadata
zopfli==0.2.3
# via fonttools