From ac2c602d550b23753b9583b9be10caf2209070be Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 20 May 2023 13:50:11 -0700 Subject: [PATCH 1/5] bump --- Dockerfile | 8 ++++---- requirements.txt | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 709a785..a6c2418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.ocf.berkeley.edu/theocf/debian:stretch +FROM docker.ocf.berkeley.edu/theocf/debian:bullseye RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -7,17 +7,17 @@ RUN apt-get update \ libcrack2-dev \ libffi-dev \ libssl-dev \ - python3.7-dev \ + python3-dev \ redis-tools \ virtualenv \ + rustc \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* RUN install -d --owner=nobody /opt/ircbot /opt/ircbot/venv COPY requirements.txt /opt/ircbot/ -RUN virtualenv -ppython3.7 /opt/ircbot/venv \ - && /opt/ircbot/venv/bin/pip install pip==8.1.2 \ +RUN virtualenv -ppython3.9 /opt/ircbot/venv \ && /opt/ircbot/venv/bin/pip install \ -r /opt/ircbot/requirements.txt diff --git a/requirements.txt b/requirements.txt index 9190e44..2b3560a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ amqp==5.0.5 attrs==20.3.0 billiard==3.6.3.0 cached-property==1.5.2 -celery==5.0.5 -certifi==2020.12.5 +celery==5.2.7 +certifi==2023.5.7 cffi==1.14.5 chardet==3.0.4 ckuehl-upsidedown==0.4 @@ -12,10 +12,10 @@ click-didyoumean==0.0.3 click-plugins==1.1.1 click-repl==0.1.6 cracklib==2.9.3 -cryptography<=3.3.2 +cryptography Deprecated==1.2.11 dnspython==2.1.0 -Flask==1.1.2 +Flask==2.2.5 github3.py==2.0.0 idna==2.10 importlib-metadata==3.7.0 @@ -28,8 +28,8 @@ jaraco.logging==3.1.0 jaraco.stream==3.0.0 jaraco.text==3.5.0 Jinja2==2.11.3 -jwcrypto==0.8 -kombu==5.0.2 +jwcrypto==1.4 +kombu==5.2.4 ldap3==2.9 markovify==0.9.0 MarkupSafe==1.1.1 @@ -41,26 +41,26 @@ prompt-toolkit==3.0.16 ptyprocess==0.7.0 pyasn1==0.4.8 pycparser==2.20 -pycryptodome==3.10.1 -pycryptodomex==3.10.1 +pycryptodome +pycryptodomex PyGithub==1.54.1 -PyJWT==1.7.1 +PyJWT==2.4.0 PyMySQL==0.9.3 pysmi==0.3.4 pysnmp==4.4.12 python-dateutil==2.8.1 -pytz==2021.1 +pytz PyYAML==5.4.1 -redis==3.5.3 -requests==2.24.0 -six==1.15.0 -SQLAlchemy==1.3.23 +redis==4.4.4 +requests +six==1.16.0 +SQLAlchemy<2 tempora==4.0.1 tld==0.12.5 typing-extensions==3.7.4.3 Unidecode==1.2.0 uritemplate==3.0.1 -urllib3==1.25.11 +urllib3 vine==5.0.0 wcwidth==0.2.5 Werkzeug==1.0.1 From 0493b8c508597c933813b717c5a29d7a6a1a6ee8 Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 20 May 2023 13:59:24 -0700 Subject: [PATCH 2/5] bump --- requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2b3560a..c5b4136 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ -amqp==5.0.5 +amqp<6 attrs==20.3.0 -billiard==3.6.3.0 +billiard==3.6.4.0 cached-property==1.5.2 celery==5.2.7 certifi==2023.5.7 cffi==1.14.5 chardet==3.0.4 ckuehl-upsidedown==0.4 -click==7.1.2 +click<9 click-didyoumean==0.0.3 click-plugins==1.1.1 -click-repl==0.1.6 +click-repl==0.2.0 cracklib==2.9.3 cryptography Deprecated==1.2.11 @@ -20,21 +20,21 @@ github3.py==2.0.0 idna==2.10 importlib-metadata==3.7.0 irc==19.0.1 -itsdangerous==1.1.0 +itsdangerous==2.0 jaraco.classes==3.2.1 jaraco.collections==3.2.0 jaraco.functools==3.2.1 jaraco.logging==3.1.0 jaraco.stream==3.0.0 jaraco.text==3.5.0 -Jinja2==2.11.3 +Jinja2==3.0 jwcrypto==1.4 kombu==5.2.4 ldap3==2.9 markovify==0.9.0 MarkupSafe==1.1.1 more-itertools==8.7.0 -ocflib==2021.1.30.13.10 +ocflib pexpect==4.8.0 ply==3.11 prompt-toolkit==3.0.16 @@ -43,7 +43,7 @@ pyasn1==0.4.8 pycparser==2.20 pycryptodome pycryptodomex -PyGithub==1.54.1 +PyGithub==1.58.2 PyJWT==2.4.0 PyMySQL==0.9.3 pysmi==0.3.4 @@ -63,7 +63,7 @@ uritemplate==3.0.1 urllib3 vine==5.0.0 wcwidth==0.2.5 -Werkzeug==1.0.1 +Werkzeug==2.2.2 wrapt==1.12.1 xkcd==2.4.2 zipp==3.4.0 From 9f156955c6de1bcdb3eaa96ea773b746822ab0f6 Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 20 May 2023 14:00:59 -0700 Subject: [PATCH 3/5] bump --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5b4136..d77ae27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ jwcrypto==1.4 kombu==5.2.4 ldap3==2.9 markovify==0.9.0 -MarkupSafe==1.1.1 +MarkupSafe==2.1.1 more-itertools==8.7.0 ocflib pexpect==4.8.0 From aafe0e859b3b917af7885615edab9becc68a810f Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 20 May 2023 14:09:12 -0700 Subject: [PATCH 4/5] bump --- requirements-dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index fd4c7e1..c8659ae 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,13 +4,13 @@ distlib==0.3.1 filelock==3.0.12 identify==2.1.0 iniconfig==1.1.1 -mypy==0.812 -mypy-extensions==0.4.3 +mypy==1.3.0 +mypy-extensions==1.0.0 nodeenv==1.5.0 packaging==20.9 pluggy==0.13.1 pre-commit==2.10.1 -py==1.10.0 +py==1.11.0 pyparsing==2.4.7 pytest==6.2.2 requirements-tools==1.2.4 From 19f53585233be4bf47433d6c2546c22f6f055f93 Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 20 May 2023 14:11:55 -0700 Subject: [PATCH 5/5] bump --- Makefile | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b6f160d..91419aa 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ install-hooks: venv venv: vendor/venv-update requirements.txt requirements-dev.txt vendor/venv-update \ - venv= -ppython3.7 venv \ + venv= -ppython3.9 venv \ install= -r requirements.txt -r requirements-dev.txt .PHONY: dev diff --git a/requirements.txt b/requirements.txt index d77ae27..3fa4a8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,7 +57,7 @@ six==1.16.0 SQLAlchemy<2 tempora==4.0.1 tld==0.12.5 -typing-extensions==3.7.4.3 +typing-extensions==4.5.0 Unidecode==1.2.0 uritemplate==3.0.1 urllib3