releng - 0.9.19.0 pkg rebase (cloud-custodian#7779)

newscorp-ghfb · Sep 21, 2022 · d6ce0de · d6ce0de
1 parent 3eb5c62
commit d6ce0de
Show file tree

Hide file tree

Showing 42 changed files with 451 additions and 569 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,11 +33,11 @@ importlib-metadata = ">=4.11.1"
 docutils = ">=0.14,<0.18"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.0.0"
-coverage = "^5.0.3"
+pytest = "^7.1.2"
+coverage = "^6.4.4"
 placebo = "^0.9.0"
 pytest-xdist = "^2.0"
-pytest-cov = "^2.8.1"
+pytest-cov = "^3.0.0"
 pytest-terraform = "^0.6.0"
 mock = "^4.0.1"
 vcrpy = "^4.0.2"

diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,15 @@
 argcomplete==2.0.0; python_version >= "3.6"
-atomicwrites==1.4.1; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and python_version < "4.0" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and python_version < "4.0"
-attrs==22.1.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.7" and python_version < "4.0"
+attrs==22.1.0; python_version >= "3.7" and python_version < "4.0"
 aws-xray-sdk==2.10.0
 bleach==5.0.1; python_version >= "3.7"
-boto3==1.24.76; python_version >= "3.7"
-botocore==1.27.76; python_version >= "3.7"
+boto3==1.24.77; python_version >= "3.7"
+botocore==1.27.77; python_version >= "3.7"
 certifi==2022.9.14; python_version >= "3.7" and python_version < "4"
 cffi==1.15.1; sys_platform == "linux" and python_version >= "3.7"
 charset-normalizer==2.1.1; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
 click==8.1.3; python_version >= "3.7"
-colorama==0.4.5; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" and platform_system == "Windows" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and python_version < "4.0" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.5.0" and platform_system == "Windows" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and python_version < "4.0"
-coverage==5.5; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4")
+colorama==0.4.5; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" and platform_system == "Windows" and python_version < "4.0" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.5.0" and platform_system == "Windows" and python_version < "4.0"
+coverage==6.4.4; python_version >= "3.7"
 cryptography==38.0.1; sys_platform == "linux" and python_version >= "3.7"
 docutils==0.17.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 execnet==1.9.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
@@ -19,7 +18,7 @@ freezegun==1.2.2; python_version >= "3.6"
 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"
-iniconfig==1.1.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+iniconfig==1.1.1; python_version >= "3.7" and python_version < "4.0"
 jaraco.classes==3.2.2; python_version >= "3.7"
 jeepney==0.8.0; sys_platform == "linux" and python_version >= "3.7"
 jmespath==1.0.1; python_version >= "3.7" and python_version < "4.0"
@@ -31,27 +30,27 @@ mccabe==0.6.1; python_version >= "2.7" and python_full_version < "3.0.0" or pyth
 mock==4.0.3; python_version >= "3.6"
 more-itertools==8.14.0; python_version >= "3.7"
 multidict==6.0.2; python_version >= "3.7"
-packaging==21.3; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+packaging==21.3; python_version >= "3.7" and python_version < "4.0"
 pkginfo==1.8.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 pkgutil-resolve-name==1.3.10; python_version < "3.9" and python_version >= "3.7"
 placebo==0.9.0
-pluggy==1.0.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+pluggy==1.0.0; python_version >= "3.7" and python_version < "4.0"
 portalocker==2.5.1; python_version >= "3.6" and python_version < "4.0"
 psutil==5.9.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
-py==1.11.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+py==1.11.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.7" and python_version < "4.0"
 pycodestyle==2.7.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 pycparser==2.21; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "linux" or sys_platform == "linux" and python_version >= "3.7" and python_full_version >= "3.4.0"
 pyflakes==2.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 pygments==2.13.0; python_version >= "3.7"
-pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.6"
+pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.7"
 pyrsistent==0.18.1; python_version >= "3.7"
-pytest-cov==2.12.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+pytest-cov==3.0.0; python_version >= "3.6"
 pytest-forked==1.4.0; python_version >= "3.6" and python_version < "4.0"
 pytest-recording==0.12.1; python_version >= "3.5"
 pytest-sugar==0.9.5
 pytest-terraform==0.6.4; python_version >= "3.6" and python_version < "4.0"
 pytest-xdist==2.5.0; python_version >= "3.6"
-pytest==6.2.5; python_version >= "3.6"
+pytest==7.1.3; python_version >= "3.7"
 python-dateutil==2.8.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 pywin32-ctypes==0.2.0; sys_platform == "win32" and python_version >= "3.7"
 pywin32==304; python_version >= "3.6" and python_version < "4.0" and platform_system == "Windows"
@@ -65,7 +64,7 @@ secretstorage==3.3.3; sys_platform == "linux" and python_version >= "3.7"
 six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7"
 tabulate==0.8.10; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 termcolor==2.0.1; python_version >= "3.7"
-toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0"
+tomli==2.0.1; python_full_version <= "3.11.0a6" and python_version >= "3.7" and python_version < "4.0"
 tqdm==4.64.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 twine==3.8.0; python_version >= "3.6"
 typing-extensions==4.3.0; python_version == "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.5.0" and python_version < "3.8" and python_version >= "3.7")

diff --git a/tests/test_packaging.py b/tests/test_packaging.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Cloud Custodian Project and Contributors. All Rights Reserved.
 # Copyright The Cloud Custodian Authors.
 # SPDX-License-Identifier: Apache-2.0
-import toml
+import tomli
 from pathlib import Path
 import pytest
 
@@ -24,7 +24,7 @@ def test_package_metadata(package):
             found = True
             p = c
     assert found, "could not find pyproject.yaml"
-    data = toml.loads(p.read_text())
+    data = tomli.loads(p.read_text())
     md = data['tool']['poetry']
     assert md.get('homepage') == 'https://cloudcustodian.io'
     assert md.get('documentation').startswith('https://cloudcustodian.io/docs')

diff --git a/tools/c7n_awscc/poetry.lock b/tools/c7n_awscc/poetry.lock
diff --git a/tools/c7n_awscc/setup.py b/tools/c7n_awscc/setup.py
@@ -12,17 +12,17 @@
 install_requires = \
 ['argcomplete (>=2.0.0,<3.0.0)',
  'attrs (>=22.1.0,<23.0.0)',
- 'boto3 (>=1.24.76,<2.0.0)',
- 'botocore (>=1.27.76,<2.0.0)',
- 'c7n (>=0.9.18,<0.10.0)',
+ 'boto3 (>=1.24.77,<2.0.0)',
+ 'botocore (>=1.27.77,<2.0.0)',
+ 'c7n (>=0.9.19,<0.10.0)',
  '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) ; python_version < "3.9" and python_version >= "3.7"',
+ 'importlib-resources (>=5.9.0,<6.0.0)',
  '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) ; python_version < "3.9" and python_version >= "3.7"',
+ 'pkgutil-resolve-name (>=1.3.10,<2.0.0)',
  '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/poetry.lock b/tools/c7n_azure/poetry.lock