From 09802549ced3d3d06ca1568bffac8ad70ca2eef7 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Wed, 24 Apr 2024 09:49:42 +0200 Subject: [PATCH 1/3] Update Django/Python/Argus requirements --- pyproject.toml | 9 +- requirements-django41.txt | 205 ------------------ ...-django40.txt => requirements-django42.txt | 183 +++++++++------- ...-django32.txt => requirements-django50.txt | 185 +++++++++------- requirements/django32.txt | 1 - requirements/django40.txt | 1 - requirements/django41.txt | 1 - requirements/django42.txt | 1 + requirements/django50.txt | 1 + 9 files changed, 221 insertions(+), 366 deletions(-) delete mode 100644 requirements-django41.txt rename requirements-django40.txt => requirements-django42.txt (56%) rename requirements-django32.txt => requirements-django50.txt (56%) delete mode 100644 requirements/django32.txt delete mode 100644 requirements/django40.txt delete mode 100644 requirements/django41.txt create mode 100644 requirements/django42.txt create mode 100644 requirements/django50.txt diff --git a/pyproject.toml b/pyproject.toml index 9829e0c..555d9ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,23 +8,24 @@ authors = [{name = "Johanna England", email = "johanna.england@sikt.no"}] maintainers = [{name = "Johanna England", email = "johanna.england@sikt.no"}] readme = "README.md" dependencies = [ - "argus-server>=1.9", + "argus-server>=1.15", "markdownify>=0.11", "PyGithub>=1.58", "requests>=2.14", ] -requires-python = ">=3.7" +requires-python = ">=3.8" classifiers = [ "Development Status :: 4 - Beta", "Framework :: Django", - "Framework :: Django :: 3.2", + "Framework :: Django :: 4.2", "Intended Audience :: Information Technology", "Intended Audience :: System Administrators", "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", ] dynamic = ["version", "description"] diff --git a/requirements-django41.txt b/requirements-django41.txt deleted file mode 100644 index 6a72514..0000000 --- a/requirements-django41.txt +++ /dev/null @@ -1,205 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: -# -# pip-compile --output-file=requirements-django41.txt pyproject.toml requirements/django41.txt requirements/forced-upgrade.txt -# -aioredis==2.0.1 - # via argus-server -argus-server==1.10.1 - # via argus_ticket_github (pyproject.toml) -asgiref==3.5.2 - # via - # channels - # channels-redis - # daphne - # django -async-timeout==4.0.2 - # via - # aioredis - # redis -attrs==22.1.0 - # via - # automat - # jsonschema - # service-identity - # twisted -autobahn==22.7.1 - # via daphne -automat==22.10.0 - # via twisted -beautifulsoup4==4.12.0 - # via markdownify -certifi==2022.12.7 - # via requests -cffi==1.15.1 - # via - # cryptography - # pynacl -channels==3.0.5 - # via - # argus-server - # channels-redis -channels-redis==4.0.0 - # via argus-server -charset-normalizer==2.1.1 - # via requests -constantly==15.1.0 - # via twisted -cryptography==38.0.4 - # via - # autobahn - # pyjwt - # pyopenssl - # service-identity - # social-auth-core -daphne==3.0.2 - # via channels -defusedxml==0.7.1 - # via - # python3-openid - # social-auth-core -deprecated==1.2.13 - # via pygithub -dj-database-url==1.0.0 - # via argus-server -django==4.0.8 - # via - # -r requirements/django41.txt - # argus-server - # channels - # dj-database-url - # django-cors-headers - # django-filter - # django-multiselectfield - # django-phonenumber-field - # djangorestframework - # drf-rw-serializers - # drf-spectacular -django-cors-headers==3.13.0 - # via argus-server -django-filter==22.1 - # via argus-server -django-multiselectfield==0.1.12 - # via argus-server -django-phonenumber-field[phonenumberslite]==7.0.1 - # via argus-server -djangorestframework==3.12.4 - # via - # argus-server - # drf-spectacular -drf-rw-serializers==1.0.5 - # via argus-server -drf-spectacular==0.24.2 - # via argus-server -factory-boy==3.2.1 - # via argus-server -faker==15.3.4 - # via factory-boy -hyperlink==21.0.0 - # via - # autobahn - # twisted -idna==3.4 - # via - # hyperlink - # requests - # twisted -incremental==22.10.0 - # via twisted -inflection==0.5.1 - # via drf-spectacular -jsonschema==4.17.3 - # via drf-spectacular -markdownify==0.11.6 - # via argus_ticket_github (pyproject.toml) -msgpack==1.0.4 - # via channels-redis -oauthlib==3.2.2 - # via - # requests-oauthlib - # social-auth-core -phonenumberslite==8.13.2 - # via django-phonenumber-field -psycopg2==2.9.5 - # via argus-server -pyasn1==0.4.8 - # via - # pyasn1-modules - # service-identity -pyasn1-modules==0.2.8 - # via service-identity -pycparser==2.21 - # via cffi -pygithub==1.58.1 - # via argus_ticket_github (pyproject.toml) -pyjwt[crypto]==2.6.0 - # via - # pygithub - # social-auth-core -pynacl==1.5.0 - # via pygithub -pyopenssl==22.1.0 - # via twisted -pyrsistent==0.19.2 - # via jsonschema -python-dataporten-auth==2.0.0 - # via argus-server -python-dateutil==2.8.2 - # via faker -python3-openid==3.2.0 - # via social-auth-core -pytz==2022.6 - # via argus-server -pyyaml==6.0 - # via drf-spectacular -redis==4.4.0 - # via channels-redis -requests==2.28.1 - # via - # argus_ticket_github (pyproject.toml) - # pygithub - # requests-oauthlib - # social-auth-core -requests-oauthlib==1.3.1 - # via social-auth-core -service-identity==21.1.0 - # via twisted -six==1.16.0 - # via - # automat - # markdownify - # python-dateutil - # service-identity -social-auth-app-django==5.0.0 - # via argus-server -social-auth-core==4.3.0 - # via - # argus-server - # python-dataporten-auth - # social-auth-app-django -soupsieve==2.4 - # via beautifulsoup4 -sqlparse==0.4.3 - # via django -twisted[tls]==22.10.0 - # via daphne -txaio==22.2.1 - # via autobahn -typing-extensions==4.4.0 - # via - # aioredis - # twisted -uritemplate==4.1.1 - # via drf-spectacular -urllib3==1.26.13 - # via requests -whitenoise==6.2.0 - # via argus-server -wrapt==1.14.1 - # via deprecated -zope-interface==5.5.2 - # via twisted - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements-django40.txt b/requirements-django42.txt similarity index 56% rename from requirements-django40.txt rename to requirements-django42.txt index 3bbaaf4..974fa3f 100644 --- a/requirements-django40.txt +++ b/requirements-django42.txt @@ -1,107 +1,119 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # -# pip-compile --output-file=requirements-django40.txt pyproject.toml requirements/django40.txt requirements/forced-upgrade.txt +# pip-compile --output-file=requirements-django42.txt pyproject.toml requirements/django42.txt requirements/forced-upgrade.txt # -aioredis==2.0.1 - # via argus-server -argus-server==1.10.1 +anyio==4.3.0 + # via httpx +argus-server==1.16.0 # via argus_ticket_github (pyproject.toml) -asgiref==3.5.2 +asgiref==3.8.1 # via # channels # channels-redis # daphne # django -async-timeout==4.0.2 - # via - # aioredis - # redis -attrs==22.1.0 + # django-cors-headers +async-timeout==4.0.3 + # via redis +attrs==23.2.0 # via # automat # jsonschema + # referencing # service-identity # twisted -autobahn==22.7.1 +autobahn==23.6.2 # via daphne automat==22.10.0 # via twisted -beautifulsoup4==4.12.0 +beautifulsoup4==4.12.3 # via markdownify -certifi==2022.12.7 - # via requests -cffi==1.15.1 +certifi==2024.2.2 + # via + # httpcore + # httpx + # requests +cffi==1.16.0 # via # cryptography # pynacl -channels==3.0.5 +channels[daphne]==4.1.0 # via # argus-server + # channels # channels-redis -channels-redis==4.0.0 +channels-redis==4.2.0 # via argus-server -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 # via requests -constantly==15.1.0 +constantly==23.10.4 # via twisted -cryptography==38.0.4 +cryptography==42.0.5 # via # autobahn # pyjwt # pyopenssl # service-identity # social-auth-core -daphne==3.0.2 +daphne==4.1.2 # via channels -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -deprecated==1.2.13 +deprecated==1.2.14 # via pygithub -dj-database-url==1.0.0 +dj-database-url==2.1.0 # via argus-server -django==4.0.8 +django==4.2.11 # via - # -r requirements/django40.txt + # -r requirements/django42.txt # argus-server # channels # dj-database-url # django-cors-headers # django-filter - # django-multiselectfield # django-phonenumber-field # djangorestframework # drf-rw-serializers # drf-spectacular -django-cors-headers==3.13.0 - # via argus-server -django-filter==22.1 + # social-auth-app-django +django-cors-headers==4.3.1 # via argus-server -django-multiselectfield==0.1.12 +django-filter==24.2 # via argus-server -django-phonenumber-field[phonenumberslite]==7.0.1 +django-phonenumber-field[phonenumberslite]==7.3.0 # via argus-server -djangorestframework==3.12.4 +djangorestframework==3.15.1 # via # argus-server # drf-spectacular -drf-rw-serializers==1.0.5 +drf-rw-serializers==1.1.1 # via argus-server -drf-spectacular==0.24.2 +drf-spectacular==0.27.2 # via argus-server -factory-boy==3.2.1 +exceptiongroup==1.2.1 + # via anyio +factory-boy==3.3.0 # via argus-server -faker==15.3.4 +faker==24.11.0 # via factory-boy +h11==0.14.0 + # via httpcore +httpcore==1.0.5 + # via httpx +httpx==0.27.0 + # via argus-server hyperlink==21.0.0 # via # autobahn # twisted -idna==3.4 +idna==3.7 # via + # anyio + # httpx # hyperlink # requests # twisted @@ -109,96 +121,115 @@ incremental==22.10.0 # via twisted inflection==0.5.1 # via drf-spectacular -jsonschema==4.17.3 +jsonschema==4.21.1 # via drf-spectacular -markdownify==0.11.6 +jsonschema-specifications==2023.12.1 + # via jsonschema +markdownify==0.12.1 # via argus_ticket_github (pyproject.toml) -msgpack==1.0.4 +msgpack==1.0.8 # via channels-redis oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -phonenumberslite==8.13.2 +phonenumberslite==8.13.35 # via django-phonenumber-field -psycopg2==2.9.5 +psycopg2==2.9.9 # via argus-server -pyasn1==0.4.8 +pyasn1==0.6.0 # via # pyasn1-modules # service-identity -pyasn1-modules==0.2.8 +pyasn1-modules==0.4.0 # via service-identity -pycparser==2.21 +pycparser==2.22 # via cffi -pygithub==1.58.1 +pygithub==2.3.0 # via argus_ticket_github (pyproject.toml) -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # pygithub + # pyjwt # social-auth-core pynacl==1.5.0 # via pygithub -pyopenssl==22.1.0 +pyopenssl==24.1.0 # via twisted -pyrsistent==0.19.2 - # via jsonschema python-dataporten-auth==2.0.0 # via argus-server -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via faker python3-openid==3.2.0 # via social-auth-core -pytz==2022.6 - # via argus-server -pyyaml==6.0 +pyyaml==6.0.1 # via drf-spectacular -redis==4.4.0 +redis==5.0.4 # via channels-redis -requests==2.28.1 +referencing==0.35.0 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 # via # argus_ticket_github (pyproject.toml) # pygithub # requests-oauthlib # social-auth-core -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via social-auth-core -service-identity==21.1.0 +rpds-py==0.18.0 + # via + # jsonschema + # referencing +service-identity==24.1.0 # via twisted six==1.16.0 # via # automat # markdownify # python-dateutil - # service-identity -social-auth-app-django==5.0.0 +sniffio==1.3.1 + # via + # anyio + # httpx +social-auth-app-django==5.4.0 # via argus-server -social-auth-core==4.3.0 +social-auth-core==4.5.3 # via # argus-server # python-dataporten-auth # social-auth-app-django -soupsieve==2.4 +soupsieve==2.5 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.5.0 # via django -twisted[tls]==22.10.0 - # via daphne -txaio==22.2.1 +twisted[tls]==24.3.0 + # via + # daphne + # twisted +txaio==23.1.1 # via autobahn -typing-extensions==4.4.0 +typing-extensions==4.11.0 # via - # aioredis + # anyio + # asgiref + # dj-database-url + # pygithub # twisted uritemplate==4.1.1 # via drf-spectacular -urllib3==1.26.13 - # via requests -whitenoise==6.2.0 +urllib3==2.2.1 + # via + # pygithub + # requests +wheel==0.43.0 + # via argus-server +whitenoise==6.6.0 # via argus-server -wrapt==1.14.1 +wrapt==1.16.0 # via deprecated -zope-interface==5.5.2 +zope-interface==6.3 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements-django32.txt b/requirements-django50.txt similarity index 56% rename from requirements-django32.txt rename to requirements-django50.txt index ff8ecd7..562d6b7 100644 --- a/requirements-django32.txt +++ b/requirements-django50.txt @@ -1,107 +1,119 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # -# pip-compile --output-file=requirements-django32.txt pyproject.toml requirements/django32.txt requirements/forced-upgrade.txt +# pip-compile --output-file=requirements-django50.txt pyproject.toml requirements/django50.txt requirements/forced-upgrade.txt # -aioredis==2.0.1 - # via argus-server -argus-server==1.10.1 +anyio==4.3.0 + # via httpx +argus-server==1.16.0 # via argus_ticket_github (pyproject.toml) -asgiref==3.5.2 +asgiref==3.8.1 # via # channels # channels-redis # daphne # django -async-timeout==4.0.2 - # via - # aioredis - # redis -attrs==22.1.0 + # django-cors-headers +async-timeout==4.0.3 + # via redis +attrs==23.2.0 # via # automat # jsonschema + # referencing # service-identity # twisted -autobahn==22.7.1 +autobahn==23.6.2 # via daphne automat==22.10.0 # via twisted -beautifulsoup4==4.12.0 +beautifulsoup4==4.12.3 # via markdownify -certifi==2022.12.7 - # via requests -cffi==1.15.1 +certifi==2024.2.2 + # via + # httpcore + # httpx + # requests +cffi==1.16.0 # via # cryptography # pynacl -channels==3.0.5 +channels[daphne]==4.1.0 # via # argus-server + # channels # channels-redis -channels-redis==4.0.0 +channels-redis==4.2.0 # via argus-server -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 # via requests -constantly==15.1.0 +constantly==23.10.4 # via twisted -cryptography==38.0.4 +cryptography==42.0.5 # via # autobahn # pyjwt # pyopenssl # service-identity # social-auth-core -daphne==3.0.2 +daphne==4.1.2 # via channels -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -deprecated==1.2.13 +deprecated==1.2.14 # via pygithub -dj-database-url==1.0.0 +dj-database-url==2.1.0 # via argus-server -django==3.2.16 +django==5.0.4 # via - # -r requirements/django32.txt + # -r requirements/django50.txt # argus-server # channels # dj-database-url # django-cors-headers # django-filter - # django-multiselectfield # django-phonenumber-field # djangorestframework # drf-rw-serializers # drf-spectacular -django-cors-headers==3.13.0 - # via argus-server -django-filter==22.1 + # social-auth-app-django +django-cors-headers==4.3.1 # via argus-server -django-multiselectfield==0.1.12 +django-filter==24.2 # via argus-server -django-phonenumber-field[phonenumberslite]==7.0.1 +django-phonenumber-field[phonenumberslite]==7.3.0 # via argus-server -djangorestframework==3.12.4 +djangorestframework==3.15.1 # via # argus-server # drf-spectacular -drf-rw-serializers==1.0.5 +drf-rw-serializers==1.1.1 # via argus-server -drf-spectacular==0.24.2 +drf-spectacular==0.27.2 # via argus-server -factory-boy==3.2.1 +exceptiongroup==1.2.1 + # via anyio +factory-boy==3.3.0 # via argus-server -faker==15.3.4 +faker==24.11.0 # via factory-boy +h11==0.14.0 + # via httpcore +httpcore==1.0.5 + # via httpx +httpx==0.27.0 + # via argus-server hyperlink==21.0.0 # via # autobahn # twisted -idna==3.4 +idna==3.7 # via + # anyio + # httpx # hyperlink # requests # twisted @@ -109,98 +121,115 @@ incremental==22.10.0 # via twisted inflection==0.5.1 # via drf-spectacular -jsonschema==4.17.3 +jsonschema==4.21.1 # via drf-spectacular -markdownify==0.11.6 +jsonschema-specifications==2023.12.1 + # via jsonschema +markdownify==0.12.1 # via argus_ticket_github (pyproject.toml) -msgpack==1.0.4 +msgpack==1.0.8 # via channels-redis oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -phonenumberslite==8.13.2 +phonenumberslite==8.13.35 # via django-phonenumber-field -psycopg2==2.9.5 +psycopg2==2.9.9 # via argus-server -pyasn1==0.4.8 +pyasn1==0.6.0 # via # pyasn1-modules # service-identity -pyasn1-modules==0.2.8 +pyasn1-modules==0.4.0 # via service-identity -pycparser==2.21 +pycparser==2.22 # via cffi -pygithub==1.58.1 +pygithub==2.3.0 # via argus_ticket_github (pyproject.toml) -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # pygithub + # pyjwt # social-auth-core pynacl==1.5.0 # via pygithub -pyopenssl==22.1.0 +pyopenssl==24.1.0 # via twisted -pyrsistent==0.19.2 - # via jsonschema python-dataporten-auth==2.0.0 # via argus-server -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via faker python3-openid==3.2.0 # via social-auth-core -pytz==2022.6 - # via - # argus-server - # django -pyyaml==6.0 +pyyaml==6.0.1 # via drf-spectacular -redis==4.4.0 +redis==5.0.4 # via channels-redis -requests==2.28.1 +referencing==0.35.0 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 # via # argus_ticket_github (pyproject.toml) # pygithub # requests-oauthlib # social-auth-core -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via social-auth-core -service-identity==21.1.0 +rpds-py==0.18.0 + # via + # jsonschema + # referencing +service-identity==24.1.0 # via twisted six==1.16.0 # via # automat # markdownify # python-dateutil - # service-identity -social-auth-app-django==5.0.0 +sniffio==1.3.1 + # via + # anyio + # httpx +social-auth-app-django==5.4.0 # via argus-server -social-auth-core==4.3.0 +social-auth-core==4.5.3 # via # argus-server # python-dataporten-auth # social-auth-app-django -soupsieve==2.4 +soupsieve==2.5 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.5.0 # via django -twisted[tls]==22.10.0 - # via daphne -txaio==22.2.1 +twisted[tls]==24.3.0 + # via + # daphne + # twisted +txaio==23.1.1 # via autobahn -typing-extensions==4.4.0 +typing-extensions==4.11.0 # via - # aioredis + # anyio + # asgiref + # dj-database-url + # pygithub # twisted uritemplate==4.1.1 # via drf-spectacular -urllib3==1.26.13 - # via requests -whitenoise==6.2.0 +urllib3==2.2.1 + # via + # pygithub + # requests +wheel==0.43.0 + # via argus-server +whitenoise==6.6.0 # via argus-server -wrapt==1.14.1 +wrapt==1.16.0 # via deprecated -zope-interface==5.5.2 +zope-interface==6.3 # via twisted # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/django32.txt b/requirements/django32.txt deleted file mode 100644 index 14a9df1..0000000 --- a/requirements/django32.txt +++ /dev/null @@ -1 +0,0 @@ -django>=3.2,<4.0 diff --git a/requirements/django40.txt b/requirements/django40.txt deleted file mode 100644 index bed17ce..0000000 --- a/requirements/django40.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.0,<4.1 diff --git a/requirements/django41.txt b/requirements/django41.txt deleted file mode 100644 index bed17ce..0000000 --- a/requirements/django41.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.0,<4.1 diff --git a/requirements/django42.txt b/requirements/django42.txt new file mode 100644 index 0000000..41baf71 --- /dev/null +++ b/requirements/django42.txt @@ -0,0 +1 @@ +django~=4.2 diff --git a/requirements/django50.txt b/requirements/django50.txt new file mode 100644 index 0000000..db44a27 --- /dev/null +++ b/requirements/django50.txt @@ -0,0 +1 @@ +django>=5.0,<5.1 From f0d17223048d1a2c3e803f80b72913b525a3a8f4 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Wed, 24 Apr 2024 09:49:54 +0200 Subject: [PATCH 2/3] Remove beta development status --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 555d9ac..f71cbe0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ dependencies = [ ] requires-python = ">=3.8" classifiers = [ - "Development Status :: 4 - Beta", "Framework :: Django", "Framework :: Django :: 4.2", "Intended Audience :: Information Technology", From 7b9f291fd3b0cc3baf1789e43c096b5764dd284f Mon Sep 17 00:00:00 2001 From: Johanna England Date: Wed, 24 Apr 2024 09:50:02 +0200 Subject: [PATCH 3/3] Upgrade own version --- src/argus_ticket_github.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/argus_ticket_github.py b/src/argus_ticket_github.py index 12122f1..b13c454 100644 --- a/src/argus_ticket_github.py +++ b/src/argus_ticket_github.py @@ -19,7 +19,7 @@ LOG = logging.getLogger(__name__) -__version__ = "1.0" +__version__ = "1.1" __all__ = [ "GithubPlugin", ]