From 85936ead95441097e805218ab76c7069ea42e67b Mon Sep 17 00:00:00 2001 From: monodo Date: Tue, 28 May 2024 16:07:29 +0200 Subject: [PATCH 1/2] upgrade to jazzmin 3 --- requirements.txt | 2 +- requirements_dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 51ecfc357..d504e5e7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -87,7 +87,7 @@ django-formtools==2.5.1 # via django-two-factor-auth django-ipware==6.0.5 # via django-axes -django-jazzmin==2.6.1 +django-jazzmin==3.0.0 # via -r requirements.in django-jsoneditor==0.2.4 # via -r requirements.in diff --git a/requirements_dev.txt b/requirements_dev.txt index 3a50f0e0a..2d4948fdd 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -126,7 +126,7 @@ django-ipware==6.0.5 # via # -r requirements.txt # django-axes -django-jazzmin==2.6.1 +django-jazzmin==3.0.0 # via -r requirements.txt django-jsoneditor==0.2.4 # via -r requirements.txt From 4481129166fa4d2bd8f3cf055ff74c186c3eb31d Mon Sep 17 00:00:00 2001 From: monodo Date: Tue, 28 May 2024 16:20:10 +0200 Subject: [PATCH 2/2] try automatic update --- requirements.in | 4 +- requirements.txt | 53 +++++++++++--------------- requirements_dev.txt | 88 ++++++++++++++++++-------------------------- 3 files changed, 60 insertions(+), 85 deletions(-) diff --git a/requirements.in b/requirements.in index 950a8cd1f..d28719ef5 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,5 @@ beautifulsoup4 -Django>4.1 +Django>5 django-bootstrap-datepicker-plus==4.0.0 django-bootstrap4==21.2 django-filter @@ -12,7 +12,7 @@ gunicorn html5lib jdcal Pillow -psycopg2-binary +psycopg[binary] PyYAML requests # Required by django-tables2, which doesn't list it in their requirements diff --git a/requirements.txt b/requirements.txt index d504e5e7d..52d8c25af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,15 +21,12 @@ cffi==1.16.0 # via cryptography charset-normalizer==3.3.2 # via requests -cryptography==42.0.5 +cryptography==42.0.7 # via # django-rest-knox # jwcrypto # postfinancecheckout - # pyjwt -defusedxml==0.7.1 - # via python3-openid -django==4.2.11 +django==4.2.13 # via # -r requirements.in # django-admin-sortable2 @@ -59,9 +56,9 @@ django==4.2.11 # django-taggit # django-two-factor-auth # djangorestframework -django-admin-sortable2==2.1.10 +django-admin-sortable2==2.2.1 # via -r requirements.in -django-allauth==0.61.1 +django-allauth==0.63.2 # via -r requirements.in django-appconf==1.0.6 # via django-select2 @@ -71,7 +68,7 @@ django-bootstrap-datepicker-plus==4.0.0 # via -r requirements.in django-bootstrap4==21.2 # via -r requirements.in -django-ckeditor-5==0.2.12 +django-ckeditor-5==0.2.13 # via -r requirements.in django-constance==3.1.0 # via -r requirements.in @@ -85,7 +82,7 @@ django-filter==24.2 # via -r requirements.in django-formtools==2.5.1 # via django-two-factor-auth -django-ipware==6.0.5 +django-ipware==7.0.1 # via django-axes django-jazzmin==3.0.0 # via -r requirements.in @@ -93,7 +90,7 @@ django-jsoneditor==0.2.4 # via -r requirements.in django-jsonform==2.22.0 # via -r requirements.in -django-oauth-toolkit==2.3.0 +django-oauth-toolkit==2.4.0 # via -r requirements.in django-otp==1.5.0 # via django-two-factor-auth @@ -111,7 +108,7 @@ django-select2==8.1.2 # via -r requirements.in django-simple-captcha==0.6.0 # via -r requirements.in -django-simple-history==3.5.0 +django-simple-history==3.6.0 # via -r requirements.in django-tables2==2.7.0 # via @@ -130,7 +127,7 @@ djangorestframework==3.15.1 # djangorestframework-gis djangorestframework-gis==1.0 # via -r requirements.in -docker==7.0.0 +docker==7.1.0 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl @@ -148,7 +145,7 @@ inflection==0.5.1 # via -r requirements.in jdcal==1.4.1 # via -r requirements.in -jinja2==3.1.3 +jinja2==3.1.4 # via -r requirements.in jwcrypto==1.5.6 # via django-oauth-toolkit @@ -157,21 +154,18 @@ markupsafe==2.1.5 numpy==1.26.4 # via pandas oauthlib==3.2.2 - # via - # django-oauth-toolkit - # requests-oauthlib + # via django-oauth-toolkit openpyxl==3.1.2 # via tablib packaging==24.0 # via # django-jsoneditor - # docker # gunicorn pandas==2.2.2 # via -r requirements.in pdf2image==1.17.0 # via -r requirements.in -phonenumbers==8.13.34 +phonenumbers==8.13.37 # via django-two-factor-auth pillow==10.3.0 # via @@ -181,37 +175,33 @@ pillow==10.3.0 # pdf2image postfinancecheckout==5.1.0 # via -r requirements.in -psycopg2-binary==2.9.9 +psycopg[binary]==3.1.19 # via -r requirements.in +psycopg-binary==3.1.19 + # via psycopg pycparser==2.22 # via cffi -pyjwt[crypto]==2.8.0 - # via django-allauth pypng==0.20220715.0 # via qrcode python-dateutil==2.9.0.post0 # via # pandas # postfinancecheckout -python-ipware==2.0.3 +python-ipware==3.0.0 # via django-ipware -python3-openid==3.2.0 - # via django-allauth pytz==2024.1 - # via pandas + # via + # django-oauth-toolkit + # pandas pyyaml==6.0.1 # via -r requirements.in qrcode==7.4.2 # via django-two-factor-auth -requests==2.31.0 +requests==2.32.2 # via # -r requirements.in - # django-allauth # django-oauth-toolkit # docker - # requests-oauthlib -requests-oauthlib==2.0.0 - # via django-allauth six==1.16.0 # via # html5lib @@ -223,10 +213,11 @@ sqlparse==0.5.0 # via django tablib[xlsx]==3.6.1 # via -r requirements.in -typing-extensions==4.11.0 +typing-extensions==4.12.0 # via # asgiref # jwcrypto + # psycopg # qrcode tzdata==2024.1 # via diff --git a/requirements_dev.txt b/requirements_dev.txt index 2d4948fdd..2d2bcb975 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -35,28 +35,23 @@ charset-normalizer==3.3.2 # requests click==8.1.7 # via pip-tools -coverage==7.4.4 +coverage==7.5.3 # via -r requirements_dev.in -cryptography==42.0.5 +cryptography==42.0.7 # via # -r requirements.txt # django-rest-knox # jwcrypto # postfinancecheckout - # pyjwt decorator==5.1.1 # via # ipdb # ipython -defusedxml==0.7.1 - # via - # -r requirements.txt - # python3-openid diffimg==0.3.0 # via -r requirements_dev.in distlib==0.3.8 # via virtualenv -django==4.2.11 +django==4.2.13 # via # -r requirements.txt # django-admin-sortable2 @@ -88,9 +83,9 @@ django==4.2.11 # django-taggit # django-two-factor-auth # djangorestframework -django-admin-sortable2==2.1.10 +django-admin-sortable2==2.2.1 # via -r requirements.txt -django-allauth==0.61.1 +django-allauth==0.63.2 # via -r requirements.txt django-appconf==1.0.6 # via @@ -102,7 +97,7 @@ django-bootstrap-datepicker-plus==4.0.0 # via -r requirements.txt django-bootstrap4==21.2 # via -r requirements.txt -django-ckeditor-5==0.2.12 +django-ckeditor-5==0.2.13 # via -r requirements.txt django-constance==3.1.0 # via -r requirements.txt @@ -112,7 +107,7 @@ django-crispy-forms==1.14.0 # via -r requirements.txt django-cron==0.6.0 # via -r requirements.txt -django-debug-toolbar==4.3.0 +django-debug-toolbar==4.4.2 # via -r requirements_dev.in django-extensions==3.2.3 # via -r requirements_dev.in @@ -122,7 +117,7 @@ django-formtools==2.5.1 # via # -r requirements.txt # django-two-factor-auth -django-ipware==6.0.5 +django-ipware==7.0.1 # via # -r requirements.txt # django-axes @@ -132,7 +127,7 @@ django-jsoneditor==0.2.4 # via -r requirements.txt django-jsonform==2.22.0 # via -r requirements.txt -django-oauth-toolkit==2.3.0 +django-oauth-toolkit==2.4.0 # via -r requirements.txt django-otp==1.5.0 # via @@ -158,7 +153,7 @@ django-select2==8.1.2 # via -r requirements.txt django-simple-captcha==0.6.0 # via -r requirements.txt -django-simple-history==3.5.0 +django-simple-history==3.6.0 # via -r requirements.txt django-tables2==2.7.0 # via @@ -177,27 +172,27 @@ djangorestframework==3.15.1 # djangorestframework-gis djangorestframework-gis==1.0 # via -r requirements.txt -docker==7.0.0 +docker==7.1.0 # via -r requirements.txt et-xmlfile==1.1.0 # via # -r requirements.txt # openpyxl -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via ipython executing==2.0.1 # via stack-data factory-boy==3.3.0 # via -r requirements_dev.in -faker==24.11.0 +faker==25.2.0 # via # -r requirements_dev.in # factory-boy -filelock==3.13.4 +filelock==3.14.0 # via virtualenv filetype==1.2.0 # via -r requirements.txt -freezegun==1.4.0 +freezegun==1.5.1 # via -r requirements_dev.in gdal==3.6.3 # via -r requirements.txt @@ -205,7 +200,7 @@ gunicorn==22.0.0 # via -r requirements.txt html5lib==1.1 # via -r requirements.txt -identify==2.5.35 +identify==2.5.36 # via pre-commit idna==3.7 # via @@ -215,13 +210,13 @@ inflection==0.5.1 # via -r requirements.txt ipdb==0.13.13 # via -r requirements_dev.in -ipython==8.23.0 +ipython==8.24.0 # via ipdb jdcal==1.4.1 # via -r requirements.txt jedi==0.19.1 # via ipython -jinja2==3.1.3 +jinja2==3.1.4 # via -r requirements.txt jwcrypto==1.5.6 # via @@ -243,7 +238,6 @@ oauthlib==3.2.2 # via # -r requirements.txt # django-oauth-toolkit - # requests-oauthlib openpyxl==3.1.2 # via # -r requirements.txt @@ -253,7 +247,6 @@ packaging==24.0 # -r requirements.txt # build # django-jsoneditor - # docker # gunicorn pandas==2.2.2 # via -r requirements.txt @@ -265,7 +258,7 @@ pdf2image==1.17.0 # -r requirements_dev.in pexpect==4.9.0 # via ipython -phonenumbers==8.13.34 +phonenumbers==8.13.37 # via # -r requirements.txt # django-two-factor-auth @@ -278,16 +271,20 @@ pillow==10.3.0 # pdf2image pip-tools==7.4.1 # via -r requirements_dev.in -platformdirs==4.2.0 +platformdirs==4.2.2 # via virtualenv postfinancecheckout==5.1.0 # via -r requirements.txt -pre-commit==3.7.0 +pre-commit==3.7.1 # via -r requirements_dev.in -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.45 # via ipython -psycopg2-binary==2.9.9 +psycopg[binary]==3.1.19 # via -r requirements.txt +psycopg-binary==3.1.19 + # via + # -r requirements.txt + # psycopg ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 @@ -296,17 +293,13 @@ pycparser==2.22 # via # -r requirements.txt # cffi -pygments==2.17.2 +pygments==2.18.0 # via ipython -pyjwt[crypto]==2.8.0 - # via - # -r requirements.txt - # django-allauth pypng==0.20220715.0 # via # -r requirements.txt # qrcode -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -317,17 +310,14 @@ python-dateutil==2.9.0.post0 # freezegun # pandas # postfinancecheckout -python-ipware==2.0.3 +python-ipware==3.0.0 # via # -r requirements.txt # django-ipware -python3-openid==3.2.0 - # via - # -r requirements.txt - # django-allauth pytz==2024.1 # via # -r requirements.txt + # django-oauth-toolkit # pandas pyyaml==6.0.1 # via @@ -337,17 +327,11 @@ qrcode==7.4.2 # via # -r requirements.txt # django-two-factor-auth -requests==2.31.0 +requests==2.32.2 # via # -r requirements.txt - # django-allauth # django-oauth-toolkit # docker - # requests-oauthlib -requests-oauthlib==2.0.0 - # via - # -r requirements.txt - # django-allauth six==1.16.0 # via # -r requirements.txt @@ -373,17 +357,17 @@ tomli==2.0.1 # build # ipdb # pip-tools - # pyproject-hooks -traitlets==5.14.2 +traitlets==5.14.3 # via # ipython # matplotlib-inline -typing-extensions==4.11.0 +typing-extensions==4.12.0 # via # -r requirements.txt # asgiref # ipython # jwcrypto + # psycopg # qrcode tzdata==2024.1 # via @@ -399,7 +383,7 @@ urllib3==2.2.1 # docker # postfinancecheckout # requests -virtualenv==20.25.3 +virtualenv==20.26.2 # via pre-commit wcwidth==0.2.13 # via prompt-toolkit