Merge pull request #51 from manheim/c7n_update

Bumping c7n to latest release
manheim · Jul 8, 2020 · 7cec202 · 7cec202
2 parents 38692c2 + 699e69a
commit 7cec202
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.2.2 (2020-07-08)
+------------------
+
+* Bump c7n to release 0.9.4
+* Bump c7n-mailer to release 0.6.3
+* Updated dependencies for c7n and c7n-mailer
+
 1.2.1 (2020-06-25)
 ------------------
 

diff --git a/manheim_c7n_tools/version.py b/manheim_c7n_tools/version.py
@@ -17,7 +17,7 @@
 """
 
 #: The semver-compliant version of the package.
-VERSION = '1.2.1'
+VERSION = '1.2.2'
 
 #: The URL for further information about the package.
 PROJECT_URL = 'https://github.com/manheim/manheim-c7n-tools'
diff --git a/requirements.txt b/requirements.txt
@@ -4,12 +4,10 @@ tabulate>=0.8.0,<0.9.0
 pyyaml
 # for building generated policy docs
 sphinx>=1.8.0,<1.9.0
+c7n==0.9.4
+c7n-mailer==0.6.3
 # to match up with c7n / c7n-mailer dependencies
-boto3==1.13.24
-botocore==1.16.24
+boto3==1.14.16
+botocore==1.17.16
 docutils==0.15.2
-jmespath==0.9.5
-# @TODO Bump this to a released version once c7n > 0.9.3 and c7n-mailer > 0.6.2 is out.
-# We're pulling in this git branch in order to pull in https://github.com/cloud-custodian/cloud-custodian/pull/5893
--e git+https://github.com/cloud-custodian/cloud-custodian.git@26ba07ea569dfe320682f7509082fc9bead0ca4c#egg=c7n
--e git+https://github.com/cloud-custodian/cloud-custodian.git@26ba07ea569dfe320682f7509082fc9bead0ca4c#egg=c7n-mailer&subdirectory=tools/c7n_mailer
+jmespath==0.10.0
diff --git a/setup.py b/setup.py
@@ -5,15 +5,15 @@
     long_description = f.read()
 
 requires = [
-    'boto3==1.12.47',
-    'botocore==1.15.47',
+    'boto3==1.14.16',
+    'botocore==1.17.16',
     'docutils>=0.10,<0.16',
     'tabulate>=0.8.0,<0.9.0',
     # In order to work with the "mu" Lambda function management tool,
     # we need PyYAML 3.x, and need it as source and not a wheel
     'pyyaml',
-    'c7n==0.9.3',
-    'c7n-mailer==0.6.2',
+    'c7n==0.9.4',
+    'c7n-mailer==0.6.3',
     # for building generated policy docs
     'sphinx>=1.8.0,<1.9.0',
     'sphinx_rtd_theme',