From 8272ca929a9a8e1b1c82b41c8917433402acc96d Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:16:10 +0300 Subject: [PATCH 1/6] upgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c88bc431..285451ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ psutil~=5.8.0 requests~=2.27.1 -grpcio~=1.43.0 +grpcio~=1.54.0 protobuf~=3.19.4 docker~=5.0.0 dataclasses~=0.8; python_version < '3.7' From e7908b98a0c33a2616986073e24bd0bf9cecfda0 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:19:44 +0300 Subject: [PATCH 2/6] upgrade more --- dev-requirements.txt | 10 +++++----- requirements.txt | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 235aa70b..236e98f2 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,11 +1,11 @@ -flake8==5.0.4 -black==22.8.0 +flake8==6.0.0 +black==23.3.0 mypy==0.971 -isort==5.10.1 +isort==5.12.0 types-requests==0.1.9 types-setuptools==57.4.3 types-psutil==5.8.0 -grpcio-tools==1.43.0 -types-dataclasses==0.6.4 +grpcio-tools==1.53.0 +types-dataclasses==0.6.6 backoff-stubs~=1.10 pytest~=7.0.1 diff --git a/requirements.txt b/requirements.txt index 285451ed..ddb212f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ requests~=2.27.1 grpcio~=1.54.0 protobuf~=3.19.4 docker~=5.0.0 -dataclasses~=0.8; python_version < '3.7' typing-extensions>=4.1.0 pyelftools~=0.28 packaging~=21.2 From 2992a6278f1c3936c3e71428a9848d75aed23e9b Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:25:15 +0300 Subject: [PATCH 3/6] upgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ddb212f5..b294a955 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ psutil~=5.8.0 requests~=2.27.1 -grpcio~=1.54.0 +grpcio~=1.53.0 protobuf~=3.19.4 docker~=5.0.0 typing-extensions>=4.1.0 From 8d4be3cb2a8e976fe8ed7eaadad3adf52c3e6382 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:28:08 +0300 Subject: [PATCH 4/6] update --- granulate_utils/java.py | 2 +- lint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/granulate_utils/java.py b/granulate_utils/java.py index 3fd27574..64026282 100644 --- a/granulate_utils/java.py +++ b/granulate_utils/java.py @@ -140,7 +140,7 @@ def parse_jvm_version(version_string: str) -> JvmVersion: # the version always starts with "openjdk version" or "java version". strip all lines # before that. - lines = list(dropwhile(lambda l: not ("openjdk version" in l or "java version" in l), lines)) + lines = list(dropwhile(lambda line: not ("openjdk version" in line or "java version" in line), lines)) # version is always in quotes _, version_str, _ = lines[0].split('"') diff --git a/lint.sh b/lint.sh index e23b77e0..7bba96e1 100755 --- a/lint.sh +++ b/lint.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -xe if [ -f venv/bin/activate ]; then source venv/bin/activate From 8c332bbf3a3857ab5ea93ad9a0571b0e17548ffb Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 23:37:23 +0300 Subject: [PATCH 5/6] update --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b294a955..7827bb83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ protobuf~=3.19.4 docker~=5.0.0 typing-extensions>=4.1.0 pyelftools~=0.28 -packaging~=21.2 +packaging~=23.1 From 34a53f8e83d0b4ef384e0f97f91007efed68de7c Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Wed, 3 Jan 2024 01:52:17 +0200 Subject: [PATCH 6/6] grpcio 1.60.0 --- dev-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 4bad9343..15aca5a1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,7 +5,7 @@ isort==5.12.0 types-requests==2.27.1 types-setuptools==57.4.3 types-psutil==5.8.0 -grpcio-tools==1.53.0 +grpcio-tools==1.60.0 types-dataclasses==0.6.6 backoff-stubs~=1.10 pytest~=7.0.1 diff --git a/requirements.txt b/requirements.txt index 8544113d..ab27e927 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ psutil~=5.8.0 requests~=2.27.1 -grpcio~=1.53.0 +grpcio~=1.60.0 protobuf~=3.19.4 docker~=5.0.0 typing-extensions>=4.1.0