From a7b8f3c58cc169c3a09087e85d42797e7fccec87 Mon Sep 17 00:00:00 2001 From: Kyle Pitzen Date: Tue, 29 Nov 2022 15:39:59 -0500 Subject: [PATCH 1/2] chore: provide empty requirements files in integration tests --- tests/integration/about/python/requirements.txt | 2 -- tests/integration/enums/python/requirements.txt | 1 - tests/integration/large_resource/python/requirements.txt | 1 - tests/integration/python/missing-main/requirements.txt | 1 - tests/integration/python/pylint/requirements.txt | 1 - tests/integration/python/resource_args/requirements.txt | 1 - .../stack_truncate/main_dir_specified/bar/requirements.txt | 1 - .../python/stack_truncate/main_specified/requirements.txt | 1 - tests/integration/python/stack_truncate/normal/requirements.txt | 1 - tests/integration/python/venv-with-main/infra/requirements.txt | 1 - tests/integration/python/venv/requirements.txt | 1 - .../python_await/create_inside_apply/requirements.txt | 1 - tests/integration/python_await/error_handling/requirements.txt | 1 - tests/integration/python_await/failure/requirements.txt | 1 - .../python_await/failure_exported_output/requirements.txt | 1 - .../failure_multiple_unexported_outputs/requirements.txt | 1 - .../integration/python_await/multiple_outputs/requirements.txt | 1 - tests/integration/python_await/success/requirements.txt | 1 - 18 files changed, 19 deletions(-) diff --git a/tests/integration/about/python/requirements.txt b/tests/integration/about/python/requirements.txt index e9f124085f97..e69de29bb2d1 100644 --- a/tests/integration/about/python/requirements.txt +++ b/tests/integration/about/python/requirements.txt @@ -1,2 +0,0 @@ -pulumi>=3.0.0,<4.0.0 -pulumi-kubernetes>=3.0.0,<4.0.0 diff --git a/tests/integration/enums/python/requirements.txt b/tests/integration/enums/python/requirements.txt index bc4e43087b54..e69de29bb2d1 100644 --- a/tests/integration/enums/python/requirements.txt +++ b/tests/integration/enums/python/requirements.txt @@ -1 +0,0 @@ -pulumi>=3.0.0,<4.0.0 diff --git a/tests/integration/large_resource/python/requirements.txt b/tests/integration/large_resource/python/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/large_resource/python/requirements.txt +++ b/tests/integration/large_resource/python/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python/missing-main/requirements.txt b/tests/integration/python/missing-main/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/missing-main/requirements.txt +++ b/tests/integration/python/missing-main/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/pylint/requirements.txt b/tests/integration/python/pylint/requirements.txt index 7fb0ea150a6b..e69de29bb2d1 100644 --- a/tests/integration/python/pylint/requirements.txt +++ b/tests/integration/python/pylint/requirements.txt @@ -1 +0,0 @@ -pylint diff --git a/tests/integration/python/resource_args/requirements.txt b/tests/integration/python/resource_args/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/resource_args/requirements.txt +++ b/tests/integration/python/resource_args/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/stack_truncate/main_dir_specified/bar/requirements.txt b/tests/integration/python/stack_truncate/main_dir_specified/bar/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/stack_truncate/main_dir_specified/bar/requirements.txt +++ b/tests/integration/python/stack_truncate/main_dir_specified/bar/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/stack_truncate/main_specified/requirements.txt b/tests/integration/python/stack_truncate/main_specified/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/stack_truncate/main_specified/requirements.txt +++ b/tests/integration/python/stack_truncate/main_specified/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/stack_truncate/normal/requirements.txt b/tests/integration/python/stack_truncate/normal/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/stack_truncate/normal/requirements.txt +++ b/tests/integration/python/stack_truncate/normal/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/venv-with-main/infra/requirements.txt b/tests/integration/python/venv-with-main/infra/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/venv-with-main/infra/requirements.txt +++ b/tests/integration/python/venv-with-main/infra/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python/venv/requirements.txt b/tests/integration/python/venv/requirements.txt index b1dc38733acb..e69de29bb2d1 100644 --- a/tests/integration/python/venv/requirements.txt +++ b/tests/integration/python/venv/requirements.txt @@ -1 +0,0 @@ -pulumi diff --git a/tests/integration/python_await/create_inside_apply/requirements.txt b/tests/integration/python_await/create_inside_apply/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/create_inside_apply/requirements.txt +++ b/tests/integration/python_await/create_inside_apply/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/error_handling/requirements.txt b/tests/integration/python_await/error_handling/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/error_handling/requirements.txt +++ b/tests/integration/python_await/error_handling/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/failure/requirements.txt b/tests/integration/python_await/failure/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/failure/requirements.txt +++ b/tests/integration/python_await/failure/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/failure_exported_output/requirements.txt b/tests/integration/python_await/failure_exported_output/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/failure_exported_output/requirements.txt +++ b/tests/integration/python_await/failure_exported_output/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/failure_multiple_unexported_outputs/requirements.txt b/tests/integration/python_await/failure_multiple_unexported_outputs/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/failure_multiple_unexported_outputs/requirements.txt +++ b/tests/integration/python_await/failure_multiple_unexported_outputs/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/multiple_outputs/requirements.txt b/tests/integration/python_await/multiple_outputs/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/multiple_outputs/requirements.txt +++ b/tests/integration/python_await/multiple_outputs/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 diff --git a/tests/integration/python_await/success/requirements.txt b/tests/integration/python_await/success/requirements.txt index 875bbd5ee39c..e69de29bb2d1 100644 --- a/tests/integration/python_await/success/requirements.txt +++ b/tests/integration/python_await/success/requirements.txt @@ -1 +0,0 @@ -pulumi>=2.0.0,<3.0.0 From 0c72f7106d1992e867c295a1c918043646704c24 Mon Sep 17 00:00:00 2001 From: Kyle Pitzen Date: Tue, 29 Nov 2022 12:13:08 -0500 Subject: [PATCH 2/2] Bumps grpcio to version 1.50 Currently, pinning to a version of grpcio <1.50 can cause build errors on newer versions of python+pip - the existing setup.py install method of building libararies is being deprecated and wheels are not being backported for older versions of grpcio. Since this change is a no-op as far as our python proto clients are concerned, it feels safe to bump to a version that will be supported going forward --- .../pending/20221122--sdk-python--bumps-grpcio-to-1-50.yaml | 4 ++++ proto/.checksum.txt | 2 +- proto/build-container/Dockerfile | 4 ++-- sdk/python/lib/setup.py | 2 +- sdk/python/requirements.txt | 2 +- tests/integration/about/python/requirements.txt | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 changelog/pending/20221122--sdk-python--bumps-grpcio-to-1-50.yaml diff --git a/changelog/pending/20221122--sdk-python--bumps-grpcio-to-1-50.yaml b/changelog/pending/20221122--sdk-python--bumps-grpcio-to-1-50.yaml new file mode 100644 index 000000000000..f72a61383654 --- /dev/null +++ b/changelog/pending/20221122--sdk-python--bumps-grpcio-to-1-50.yaml @@ -0,0 +1,4 @@ +changes: +- type: chore + scope: sdk/python + description: Bumps grpcio to 1.50 diff --git a/proto/.checksum.txt b/proto/.checksum.txt index e6697bc4c793..9688fdd38a0b 100644 --- a/proto/.checksum.txt +++ b/proto/.checksum.txt @@ -1,4 +1,4 @@ -283055245 2069 proto/build-container/Dockerfile +3850377987 2069 proto/build-container/Dockerfile 3003861496 625 proto/build-container/scripts/install-go.sh 853251015 873 proto/build-container/scripts/install-node.sh 2003827277 549 proto/build-container/scripts/install-packages.sh diff --git a/proto/build-container/Dockerfile b/proto/build-container/Dockerfile index 512648c03f3d..80fcc66de82d 100644 --- a/proto/build-container/Dockerfile +++ b/proto/build-container/Dockerfile @@ -54,6 +54,6 @@ RUN PROTOC_VERSION=3.20.1 \ PROTOC_GEN_GO_VERSION=1.5.2 \ NODEJS_GRPC_VERSION=1.24.2 \ NODEJS_GRPC_TOOLS_VERSION=1.8.1 \ - PYTHON_GRPCIO_VERSION=1.49.1 \ - PYTHON_GRPCIO_TOOLS_VERSION=1.49.1 \ + PYTHON_GRPCIO_VERSION=1.50.0 \ + PYTHON_GRPCIO_TOOLS_VERSION=1.50.0 \ /build-scripts/install-protobuf-tools.sh \ No newline at end of file diff --git a/sdk/python/lib/setup.py b/sdk/python/lib/setup.py index b6addde69127..1eefaa8dc752 100644 --- a/sdk/python/lib/setup.py +++ b/sdk/python/lib/setup.py @@ -45,7 +45,7 @@ def readme(): # Keep this list in sync with Pipfile install_requires=[ 'protobuf~=4.21', - 'grpcio==1.47', + 'grpcio==1.50', 'dill~=0.3', 'six~=1.12', 'semver~=2.8', diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt index 4f0f7a6452a9..220e281cddfe 100644 --- a/sdk/python/requirements.txt +++ b/sdk/python/requirements.txt @@ -1,7 +1,7 @@ # Packages needed by the library. # Keep this list in sync with setup.py. protobuf~=4.21 -grpcio==1.47 +grpcio==1.50 dill~=0.3 six~=1.12 semver~=2.8 diff --git a/tests/integration/about/python/requirements.txt b/tests/integration/about/python/requirements.txt index e69de29bb2d1..9915461eabdb 100644 --- a/tests/integration/about/python/requirements.txt +++ b/tests/integration/about/python/requirements.txt @@ -0,0 +1 @@ +pulumi-kubernetes>=3.0.0,<4.0.0