Skip to content

Commit

Permalink
releng - make tox -e docs work on ARM64 + Python3.10 (cloud-custodi…
Browse files Browse the repository at this point in the history
  • Loading branch information
sontek authored Sep 21, 2022
1 parent ca2a8e0 commit 3eb5c62
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 25 deletions.
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_awscc/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_azure/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
2 changes: 1 addition & 1 deletion tools/c7n_gcp/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_gcp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_kube/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_logexporter/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_mailer/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_openstack/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_org/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_policystream/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_sphinxext/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_terraform/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions tools/c7n_trailcreator/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 3eb5c62

Please sign in to comment.