diff --git a/requirements-dev.txt b/requirements-dev.txt index ef2c5c87eca..242c9431695 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,7 @@ # Note all of these are generated from poetry lock/projects via `make pkg-gen-requirements` -r requirements.txt +-r tools/c7n_awscc/requirements.txt -r tools/c7n_azure/requirements.txt -r tools/c7n_gcp/requirements.txt -r tools/c7n_kube/requirements.txt @@ -15,6 +16,8 @@ -e . # Local package required for c7n_mailer tests -e tools/c7n_mailer +# Local package required for c7n_awscc +-e tools/c7n_awscc # Local package required for c7n_azure tests -e tools/c7n_azure # Local package required for c7n_gcp tests diff --git a/tools/c7n_awscc/setup.py b/tools/c7n_awscc/setup.py index 29de88d207a..0e69d070b4d 100644 --- a/tools/c7n_awscc/setup.py +++ b/tools/c7n_awscc/setup.py @@ -18,11 +18,11 @@ 'click>=8.0,<9.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonpatch>=1.32,<2.0', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_azure/setup.py b/tools/c7n_azure/setup.py index 23e0d2cf54d..e701a485325 100644 --- a/tools/c7n_azure/setup.py +++ b/tools/c7n_azure/setup.py @@ -81,12 +81,12 @@ 'distlib>=0.3.0,<0.4.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jmespath>=1.0.0,<2.0.0', 'jsonschema (>=4.16.0,<5.0.0)', 'netaddr>=0.7.19,<0.8.0', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_gcp/requirements.txt b/tools/c7n_gcp/requirements.txt index 142fc7d62bc..719ba7f7bc3 100644 --- a/tools/c7n_gcp/requirements.txt +++ b/tools/c7n_gcp/requirements.txt @@ -16,7 +16,7 @@ google-resumable-media==2.3.3; python_version >= "3.6" and python_full_version < googleapis-common-protos==1.56.4; python_version >= "3.7" and python_full_version < "3.0.0" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") or python_full_version >= "3.6.0" and python_version >= "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") grpc-google-iam-v1==0.12.4; python_version >= "3.6" grpcio-status==1.48.1; python_version >= "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") -grpcio==1.49.0; python_version >= "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") +grpcio==1.48.1; python_version >= "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") httplib2==0.20.4; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" idna==3.4; python_version >= "3.7" and python_version < "4" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") proto-plus==1.22.1; python_version >= "3.7" diff --git a/tools/c7n_gcp/setup.py b/tools/c7n_gcp/setup.py index 45b94e174b0..ad58ec82be8 100644 --- a/tools/c7n_gcp/setup.py +++ b/tools/c7n_gcp/setup.py @@ -22,10 +22,10 @@ 'google-cloud-monitoring>=2.5.0,<3.0.0', 'google-cloud-storage>=1.42.2,<2.0.0', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_kube/setup.py b/tools/c7n_kube/setup.py index 1a3f63a788d..6dd2f2402d5 100644 --- a/tools/c7n_kube/setup.py +++ b/tools/c7n_kube/setup.py @@ -21,11 +21,11 @@ 'c7n (>=0.9.18,<0.10.0)', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', 'kubernetes>=10.0.1,<11.0.0', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_logexporter/setup.py b/tools/c7n_logexporter/setup.py index 1eb345d75f0..bde2aca4baf 100644 --- a/tools/c7n_logexporter/setup.py +++ b/tools/c7n_logexporter/setup.py @@ -18,10 +18,10 @@ 'click>=8.0,<9.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_mailer/requirements.txt b/tools/c7n_mailer/requirements.txt index 9923649957d..f63e1e8c194 100644 --- a/tools/c7n_mailer/requirements.txt +++ b/tools/c7n_mailer/requirements.txt @@ -11,8 +11,8 @@ google-auth==2.11.0; python_version >= "3.7" and python_full_version < "3.0.0" o google-cloud-secret-manager==2.12.4; python_version >= "3.7" googleapis-common-protos==1.56.4; python_version >= "3.7" grpc-google-iam-v1==0.12.4; python_version >= "3.7" -grpcio-status==1.49.0; python_version >= "3.7" -grpcio==1.49.0; python_version >= "3.7" +grpcio-status==1.48.1; python_version >= "3.7" +grpcio==1.48.1; python_version >= "3.7" idna==3.4; python_version >= "3.7" and python_version < "4" importlib-metadata==4.12.0; python_version >= "3.7" importlib-resources==5.9.0; python_version < "3.9" and python_version >= "3.7" diff --git a/tools/c7n_openstack/setup.py b/tools/c7n_openstack/setup.py index 8cb2e96227b..324332d05f8 100644 --- a/tools/c7n_openstack/setup.py +++ b/tools/c7n_openstack/setup.py @@ -17,11 +17,11 @@ 'c7n (>=0.9.18,<0.10.0)', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', 'openstacksdk>=0.52.0,<0.53.0', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_org/setup.py b/tools/c7n_org/setup.py index 32513eeb81c..27f4763407a 100644 --- a/tools/c7n_org/setup.py +++ b/tools/c7n_org/setup.py @@ -18,10 +18,10 @@ 'click>=8.0,<9.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_policystream/setup.py b/tools/c7n_policystream/setup.py index 958aeeea333..3ca06383583 100644 --- a/tools/c7n_policystream/setup.py +++ b/tools/c7n_policystream/setup.py @@ -15,10 +15,10 @@ 'click>=8.0,<9.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pygit2>=1.9,<1.10', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', diff --git a/tools/c7n_sphinxext/setup.py b/tools/c7n_sphinxext/setup.py index c3b6547242a..7cab00fcb57 100644 --- a/tools/c7n_sphinxext/setup.py +++ b/tools/c7n_sphinxext/setup.py @@ -21,11 +21,11 @@ 'docutils (>=0.17.1,<0.18.0)', 'docutils>=0.14,<0.18', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', 'myst-parser>=0.18.0,<0.19.0', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tools/c7n_terraform/setup.py b/tools/c7n_terraform/setup.py index 0f38409a062..d81cd6e72fc 100644 --- a/tools/c7n_terraform/setup.py +++ b/tools/c7n_terraform/setup.py @@ -18,10 +18,10 @@ 'click>=8.0,<9.0', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'python-hcl2>=2.0,<3.0', diff --git a/tools/c7n_trailcreator/setup.py b/tools/c7n_trailcreator/setup.py index d25791bef5d..8f4b4b944dd 100644 --- a/tools/c7n_trailcreator/setup.py +++ b/tools/c7n_trailcreator/setup.py @@ -21,10 +21,10 @@ 'colorama (>=0.4.5,<0.5.0)', 'docutils (>=0.17.1,<0.18.0)', 'importlib-metadata (>=4.12.0,<5.0.0)', - 'importlib-resources (>=5.9.0,<6.0.0)', + 'importlib-resources (>=5.9.0,<6.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'jmespath (>=1.0.1,<2.0.0)', 'jsonschema (>=4.16.0,<5.0.0)', - 'pkgutil-resolve-name (>=1.3.10,<2.0.0)', + 'pkgutil-resolve-name (>=1.3.10,<2.0.0) ; python_version < "3.9" and python_version >= "3.7"', 'pyrsistent (>=0.18.1,<0.19.0)', 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=6.0,<7.0)', diff --git a/tox.ini b/tox.ini index d76c9c4f23e..d7484e86e5a 100644 --- a/tox.ini +++ b/tox.ini @@ -58,6 +58,10 @@ commands = commands = make lint [testenv:docs] +# https://github.com/grpc/grpc/issues/25082 +setenv = + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 + GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 whitelist_externals = make commands = make sphinx deps =