From 2560cb7b76c7d7758343c771037d6d95ff841dae Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 16:14:08 -0800
Subject: [PATCH 01/33] test

---
 .github/workflows/ci-master.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 572435502b3..24fc3334aa5 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -65,8 +65,8 @@ jobs:
 
       - name: Install Deps
         run: |
-          tox -e ${{ matrix.tox-target }} --notest
+          tox --notest
 
       - name: Test
         run: |
-          tox -e ${{ matrix.tox-target }}
+          tox

From 8875bb651bf0c86f35735f1f6422320f368a2c8a Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 16:28:28 -0800
Subject: [PATCH 02/33] test

---
 .github/workflows/ci-master.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 24fc3334aa5..7e8f6b8e075 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -52,11 +52,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Set up cache
-        uses: actions/cache@v1
-        with:
-          path: .tox/${{ matrix.tox-target }}
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}
+#      - name: Set up cache
+#        uses: actions/cache@v1
+#        with:
+#          path: .tox/${{ matrix.tox-target }}
+#          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |
@@ -65,8 +65,8 @@ jobs:
 
       - name: Install Deps
         run: |
-          tox --notest
+          tox -e py36 --notest
 
       - name: Test
         run: |
-          tox
+          tox -e py36

From 0190b7955d65a9f1b9060f211d5497a8debc60f2 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 16:31:53 -0800
Subject: [PATCH 03/33] test

---
 .github/workflows/ci-master.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 7e8f6b8e075..6138df9e419 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -65,8 +65,8 @@ jobs:
 
       - name: Install Deps
         run: |
-          tox -e py36 --notest
+          tox -e ${{ matrix.tox-target }} --notest
 
       - name: Test
         run: |
-          tox -e py36
+          tox -e ${{ matrix.tox-target }}

From 159589b789d28864fd91500b74a28979cc152446 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 16:40:54 -0800
Subject: [PATCH 04/33] test

---
 .github/workflows/ci-master.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 6138df9e419..f755be5b78e 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -52,11 +52,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-#      - name: Set up cache
-#        uses: actions/cache@v1
-#        with:
-#          path: .tox/${{ matrix.tox-target }}
-#          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}
+      - name: Set up cache
+        uses: actions/cache@v1
+        with:
+          path: .tox/${{ matrix.tox-target }}
+          key: venv-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |

From 3c36a5a812ef3eaffb326dd5e667d9e3ed578aa5 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:29:47 -0800
Subject: [PATCH 05/33] test

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..ac8676c735c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ envlist = py27,py36,py37,lint
 
 [testenv]
 usedevelop = True
+recreate = True
 deps =
     -rrequirements-dev.txt
 

From ff315464897695e4f38984ff94d1a196c485edf2 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:29:47 -0800
Subject: [PATCH 06/33] test

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..ac8676c735c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ envlist = py27,py36,py37,lint
 
 [testenv]
 usedevelop = True
+recreate = True
 deps =
     -rrequirements-dev.txt
 

From cbc27ff095f5ebe5553aa4c8df365a06059e480a Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:39:09 -0800
Subject: [PATCH 07/33] test

---
 .github/workflows/ci-master.yml | 16 ++++++++++------
 tox.ini                         |  1 -
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index f755be5b78e..2fd93bc2e3d 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -63,10 +63,14 @@ jobs:
           python -m pip install pip
           pip install tox codecov
 
-      - name: Install Deps
-        run: |
-          tox -e ${{ matrix.tox-target }} --notest
+      - name: test
+        run : |
+          source .tox/${{ matrix.tox-target }}/bin/activate && pip freeze
 
-      - name: Test
-        run: |
-          tox -e ${{ matrix.tox-target }}
+#      - name: Install Deps
+#        run: |
+#          tox -e ${{ matrix.tox-target }} --notest
+#
+#      - name: Test
+#        run: |
+#          tox -e ${{ matrix.tox-target }}
diff --git a/tox.ini b/tox.ini
index ac8676c735c..d168ed2bcd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,6 @@ envlist = py27,py36,py37,lint
 
 [testenv]
 usedevelop = True
-recreate = True
 deps =
     -rrequirements-dev.txt
 

From 0ac35c546ca057e5336c9461abd2cd833fa77f11 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:39:50 -0800
Subject: [PATCH 08/33] test

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index ac8676c735c..d168ed2bcd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,6 @@ envlist = py27,py36,py37,lint
 
 [testenv]
 usedevelop = True
-recreate = True
 deps =
     -rrequirements-dev.txt
 

From e139123e89d608d5f06bfef3e0a51369c6071522 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:43:20 -0800
Subject: [PATCH 09/33] test

---
 .github/workflows/ci-master.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 2fd93bc2e3d..a06350519e9 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -65,7 +65,11 @@ jobs:
 
       - name: test
         run : |
-          source .tox/${{ matrix.tox-target }}/bin/activate && pip freeze
+          ls .tox/py36/lib/python3.6/site-packages/
+
+      - name: test
+        run : |
+          cat .tox/py36/lib/python3.6/site-packages/c7n-mailer.egg-link
 
 #      - name: Install Deps
 #        run: |

From 3b2826154883706f4168b80a86a74e2ba8f4df9c Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:44:39 -0800
Subject: [PATCH 10/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index a06350519e9..171408310f7 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6]
         include:
           - python-version: 3.6
             os: ubuntu-latest

From 3f628c055ce9cf6dcaf86a05482e1467ac4f74aa Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 17:52:27 -0800
Subject: [PATCH 11/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 171408310f7..fe984310635 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -71,7 +71,7 @@ jobs:
         run : |
           cat .tox/py36/lib/python3.6/site-packages/c7n-mailer.egg-link
 
-#      - name: Install Deps
+#      - name: Install Deps test
 #        run: |
 #          tox -e ${{ matrix.tox-target }} --notest
 #

From f7d4bbea0f2f6a0e5b2032321519d1e9b3486522 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:08:34 -0800
Subject: [PATCH 12/33] 
 /Users/runner/runners/2.165.2/work/cloud-custodian/cloud-custodian/tools/c7n_mailer

---
 .github/workflows/ci-master.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index fe984310635..b56066b2248 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -71,6 +71,10 @@ jobs:
         run : |
           cat .tox/py36/lib/python3.6/site-packages/c7n-mailer.egg-link
 
+      - name: test
+        run : |
+          ls .tox/py36/lib/python3.6/site-packages/
+
 #      - name: Install Deps test
 #        run: |
 #          tox -e ${{ matrix.tox-target }} --notest

From f6d350f949c5a66927eecc85282c5e711c2c9a4e Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:08:46 -0800
Subject: [PATCH 13/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index b56066b2248..1f52b1ecbf0 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: test
         run : |
-          ls .tox/py36/lib/python3.6/site-packages/
+          ls /Users/runner/runners/2.165.2/work/cloud-custodian/cloud-custodian/tools/c7n_mailer
 
 #      - name: Install Deps test
 #        run: |

From 27d8ab1329092e395bf3db9c2dd4a35c30411e93 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:10:45 -0800
Subject: [PATCH 14/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 1f52b1ecbf0..15510c44eae 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
         python-version: [3.6]
         include:
           - python-version: 3.6

From 617714ca7d8b1390013b7433115bf182f084865c Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:11:59 -0800
Subject: [PATCH 15/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 15510c44eae..c7691cbaf79 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: test
         run : |
-          ls /Users/runner/runners/2.165.2/work/cloud-custodian/cloud-custodian/tools/c7n_mailer
+          ls /home/runner/work/cloud-custodian/cloud-custodian/tools/c7n_mailer
 
 #      - name: Install Deps test
 #        run: |

From 1a010d6edf9a16ec917362fafc8d59d5de203d3d Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:14:26 -0800
Subject: [PATCH 16/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index c7691cbaf79..b6590cb4bec 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -65,7 +65,7 @@ jobs:
 
       - name: test
         run : |
-          ls .tox/py36/lib/python3.6/site-packages/
+          ls -l .tox/py36/lib/python3.6/site-packages/
 
       - name: test
         run : |

From 79b715b74513bd7ab16f0fe41ad7df5d793de630 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:16:40 -0800
Subject: [PATCH 17/33] test

---
 .github/workflows/ci-master.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index b6590cb4bec..0c7b780b418 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -56,13 +56,17 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .tox/${{ matrix.tox-target }}
-          key: venv-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
+          key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |
           python -m pip install pip
           pip install tox codecov
 
+      - name: Install Deps test
+        run: |
+          tox -e ${{ matrix.tox-target }} --notest
+
       - name: test
         run : |
           ls -l .tox/py36/lib/python3.6/site-packages/
@@ -75,9 +79,6 @@ jobs:
         run : |
           ls /home/runner/work/cloud-custodian/cloud-custodian/tools/c7n_mailer
 
-#      - name: Install Deps test
-#        run: |
-#          tox -e ${{ matrix.tox-target }} --notest
 #
 #      - name: Test
 #        run: |

From 064e52886c4b27fa341c8d1f45a2470a1b78094e Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:23:53 -0800
Subject: [PATCH 18/33] test

---
 .github/workflows/ci-master.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 0c7b780b418..2e929b448e3 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -58,6 +58,10 @@ jobs:
           path: .tox/${{ matrix.tox-target }}
           key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
+      - name: Remove egg links
+        run : |
+          find .tox/${{ matrix.tox-target }} -name *.egg-link -exec rm -rf {} \;
+
       - name: Install Test Runner
         run: |
           python -m pip install pip

From 45b7b850bc3a5f23e74b5e22cbc4243cf8602155 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:42:49 -0800
Subject: [PATCH 19/33] test

---
 .github/workflows/ci-master.yml | 7 +++++--
 tox.ini                         | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 2e929b448e3..416a1f2f926 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -58,9 +58,12 @@ jobs:
           path: .tox/${{ matrix.tox-target }}
           key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
-      - name: Remove egg links
+      - name: Recreate egg-info
         run : |
-          find .tox/${{ matrix.tox-target }} -name *.egg-link -exec rm -rf {} \;
+          pip install --no-deps -e tools/c7n_mailer
+          pip install --no-deps -e tools/c7n_azure
+          pip install --no-deps -e tools/c7n_gcp
+          pip install --no-deps -e tools/c7n_kube
 
       - name: Install Test Runner
         run: |
diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..293e0b8baed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,6 +17,7 @@ envlist = py27,py36,py37,lint
 usedevelop = True
 deps =
     -rrequirements-dev.txt
+    -etools/c7n_mailer
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1

From 2d9445667af528d373ed4151dd18dccc3646c2a3 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:45:25 -0800
Subject: [PATCH 20/33] test

---
 .github/workflows/ci-master.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 416a1f2f926..7afc30a7fd8 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -55,7 +55,9 @@ jobs:
       - name: Set up cache
         uses: actions/cache@v1
         with:
-          path: .tox/${{ matrix.tox-target }}
+          path: |
+            .tox/${{ matrix.tox-target }}
+            tools/c7n_mailer/c7n_mailer.egg-info
           key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Recreate egg-info

From cd27157bc98417a748a244e9d222d2b1ecece3fe Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:47:33 -0800
Subject: [PATCH 21/33] test

---
 .github/workflows/ci-master.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 7afc30a7fd8..bef65a03a67 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -55,11 +55,15 @@ jobs:
       - name: Set up cache
         uses: actions/cache@v1
         with:
-          path: |
-            .tox/${{ matrix.tox-target }}
-            tools/c7n_mailer/c7n_mailer.egg-info
+          path: .tox/${{ matrix.tox-target }}
           key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
+      - name: Set up cache - mailer
+        uses: actions/cache@v1
+        with:
+          path: tools/c7n_mailer/c7n_mailer.egg-info
+          key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}-mailer
+
       - name: Recreate egg-info
         run : |
           pip install --no-deps -e tools/c7n_mailer

From 1af306461fe346e243994a56b8b2e354ecde84ed Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:51:21 -0800
Subject: [PATCH 22/33] test

---
 .github/workflows/ci-master.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index bef65a03a67..54ac1ca840a 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -64,13 +64,6 @@ jobs:
           path: tools/c7n_mailer/c7n_mailer.egg-info
           key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}-mailer
 
-      - name: Recreate egg-info
-        run : |
-          pip install --no-deps -e tools/c7n_mailer
-          pip install --no-deps -e tools/c7n_azure
-          pip install --no-deps -e tools/c7n_gcp
-          pip install --no-deps -e tools/c7n_kube
-
       - name: Install Test Runner
         run: |
           python -m pip install pip

From e510912a6de855dbdc10da9b71d3ac96a12a9a18 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Mon, 2 Mar 2020 18:52:38 -0800
Subject: [PATCH 23/33] test

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 293e0b8baed..d168ed2bcd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,6 @@ envlist = py27,py36,py37,lint
 usedevelop = True
 deps =
     -rrequirements-dev.txt
-    -etools/c7n_mailer
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1

From 773e12b8aaa244a131a24e0ed8e997d532e31060 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 08:47:49 -0800
Subject: [PATCH 24/33] test

---
 requirements-ci.txt | 12 ++++++++++++
 tox.ini             |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 requirements-ci.txt

diff --git a/requirements-ci.txt b/requirements-ci.txt
new file mode 100644
index 00000000000..e8bcea684f9
--- /dev/null
+++ b/requirements-ci.txt
@@ -0,0 +1,12 @@
+-r requirements-dev.txt
+
+# Local package required for c7n_mailer tests
+tools/c7n_mailer
+# Local package required for c7n_azure tests
+tools/c7n_azure
+# Local package required for c7n_gcp tests
+tools/c7n_gcp
+# Local package required for c7n_kube tests
+tools/c7n_kube
+# Local package required for c7n_org tests
+tools/c7n_org
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..3661d2b387c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ envlist = py27,py36,py37,lint
 [testenv]
 usedevelop = True
 deps =
-    -rrequirements-dev.txt
+    -rrequirements-ci.txt
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1

From 4ef8f390758bf9c5ef4cf909e139017d013b3dfd Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 08:48:28 -0800
Subject: [PATCH 25/33] test

---
 .github/workflows/ci-master.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 54ac1ca840a..c7eef83502c 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -56,13 +56,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .tox/${{ matrix.tox-target }}
-          key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
-
-      - name: Set up cache - mailer
-        uses: actions/cache@v1
-        with:
-          path: tools/c7n_mailer/c7n_mailer.egg-info
-          key: venv1-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}-mailer
+          key: venv2-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |

From 8b02bb7948300a8a4d488005b412949bd5b3b91f Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:11:29 -0800
Subject: [PATCH 26/33] test

---
 .github/workflows/ci-master.yml | 4 ++++
 tox.ini                         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index c7eef83502c..33886f4b3e4 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -63,6 +63,10 @@ jobs:
           python -m pip install pip
           pip install tox codecov
 
+      - name: Reinstall missing deps
+        run: |
+          pip install -r requirements-dev.txt -t .tox/${{ matrix.tox-target }}
+
       - name: Install Deps test
         run: |
           tox -e ${{ matrix.tox-target }} --notest
diff --git a/tox.ini b/tox.ini
index 3661d2b387c..d168ed2bcd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ envlist = py27,py36,py37,lint
 [testenv]
 usedevelop = True
 deps =
-    -rrequirements-ci.txt
+    -rrequirements-dev.txt
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1

From ef5c10a58c677e00585219ab2586e0cc78541c60 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:14:42 -0800
Subject: [PATCH 27/33] test

---
 .github/workflows/ci-master.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 33886f4b3e4..cdc28f8c1af 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -65,7 +65,9 @@ jobs:
 
       - name: Reinstall missing deps
         run: |
+          source .tox/${{ matrix.tox-target }}/bin/activate
           pip install -r requirements-dev.txt -t .tox/${{ matrix.tox-target }}
+          deactivate
 
       - name: Install Deps test
         run: |

From ecc6f133facb967bfe12c7cf39d616040d57e139 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:20:27 -0800
Subject: [PATCH 28/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index cdc28f8c1af..2aec39cec9f 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Reinstall missing deps
         run: |
           source .tox/${{ matrix.tox-target }}/bin/activate
-          pip install -r requirements-dev.txt -t .tox/${{ matrix.tox-target }}
+          pip install -r requirements-dev.txt
           deactivate
 
       - name: Install Deps test

From f9691b4cfd6911695f2c729adcf3db91b8504749 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:31:16 -0800
Subject: [PATCH 29/33] test

---
 .github/workflows/ci-master.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 2aec39cec9f..41de9fcadd7 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -61,30 +61,17 @@ jobs:
       - name: Install Test Runner
         run: |
           python -m pip install pip
-          pip install tox codecov
+          pip install tox codecov tox-battery
 
-      - name: Reinstall missing deps
-        run: |
-          source .tox/${{ matrix.tox-target }}/bin/activate
-          pip install -r requirements-dev.txt
-          deactivate
+#      - name: Reinstall missing deps
+#        run: |
+#          source .tox/${{ matrix.tox-target }}/bin/activate
+#          pip install -r requirements-dev.txt
+#          deactivate
 
       - name: Install Deps test
         run: |
           tox -e ${{ matrix.tox-target }} --notest
-
-      - name: test
-        run : |
-          ls -l .tox/py36/lib/python3.6/site-packages/
-
-      - name: test
-        run : |
-          cat .tox/py36/lib/python3.6/site-packages/c7n-mailer.egg-link
-
-      - name: test
-        run : |
-          ls /home/runner/work/cloud-custodian/cloud-custodian/tools/c7n_mailer
-
 #
 #      - name: Test
 #        run: |

From e124cdb059133ad3cdcfcf932ab642cbe84108fc Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:35:36 -0800
Subject: [PATCH 30/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 tox.ini                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 41de9fcadd7..624ab0f7652 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Install Test Runner
         run: |
           python -m pip install pip
-          pip install tox codecov tox-battery
+          pip install tox codecov tox-pip-extensions
 
 #      - name: Reinstall missing deps
 #        run: |
diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..5fa95968115 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ max-line-length = 100
 
 [tox]
 envlist = py27,py36,py37,lint
+tox_pip_extensions_ext_venv_update = true
 
 [testenv]
 usedevelop = True

From 1b855b16ff2cbe0476a1ff58496c5c41f971205f Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 09:38:37 -0800
Subject: [PATCH 31/33] test

---
 .github/workflows/ci-master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 624ab0f7652..7968a476ac2 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .tox/${{ matrix.tox-target }}
-          key: venv2-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
+          key: venv3-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |

From c65625f3bdb033fc3b9baa4ddda2191689ffbaa2 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 12:29:54 -0800
Subject: [PATCH 32/33] Test

---
 .github/workflows/ci-master.yml |  2 +-
 requirements-ci.txt             |  2 +-
 requirements-dev.txt            | 30 +-----------------------------
 requirements-src.txt            | 31 +++++++++++++++++++++++++++++++
 tox.ini                         |  2 +-
 5 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 requirements-src.txt

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 7968a476ac2..e01e63a0d7e 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .tox/${{ matrix.tox-target }}
-          key: venv3-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
+          key: venv4-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |
diff --git a/requirements-ci.txt b/requirements-ci.txt
index e8bcea684f9..4fa9da31e7d 100644
--- a/requirements-ci.txt
+++ b/requirements-ci.txt
@@ -1,4 +1,4 @@
--r requirements-dev.txt
+-r requirements-src.txt
 
 # Local package required for c7n_mailer tests
 tools/c7n_mailer
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3710b58d64a..dc6088e79ba 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,29 +1,4 @@
--r requirements.txt
-
-# Test & lint packages
-coverage==5.0.3
-mock==3.0.5
-placebo==0.9.0
-flake8==3.7.9
-pytest
-pytest-xdist
-pytest-cov==2.8.1
-twine
-tox==3.14.3
-six >= 1.12.0
-
-# Optional feature testing in c7n
-psutil==5.6.7
-aws_xray_sdk==2.4.3
-importlib_metadata==1.4.0
-
--r tools/c7n_mailer/requirements.txt
--r tools/c7n_azure/requirements.txt
--r tools/c7n_gcp/requirements.txt
--r tools/c7n_kube/requirements.txt
-
-# Specific to testing mailer
-fakeredis==1.1.0
+-r requirements-src.txt
 
 # Local package required for c7n_mailer tests
 -e tools/c7n_mailer
@@ -35,6 +10,3 @@ fakeredis==1.1.0
 -e tools/c7n_kube
 # Local package required for c7n_org tests
 -e tools/c7n_org
-
-# requires pandoc, fails on ci server, only used for pypi metadata
-# setuptools-markdown==0.2
diff --git a/requirements-src.txt b/requirements-src.txt
new file mode 100644
index 00000000000..cb753cf05a6
--- /dev/null
+++ b/requirements-src.txt
@@ -0,0 +1,31 @@
+-r requirements.txt
+
+# Test & lint packages
+coverage==5.0.3
+mock==3.0.5
+placebo==0.9.0
+flake8==3.7.9
+pytest
+pytest-xdist
+pytest-cov==2.8.1
+twine
+tox==3.14.3
+six >= 1.12.0
+
+# Optional feature testing in c7n
+psutil==5.6.7
+aws_xray_sdk==2.4.3
+importlib_metadata==1.4.0
+
+-r tools/c7n_mailer/requirements.txt
+-r tools/c7n_azure/requirements.txt
+-r tools/c7n_gcp/requirements.txt
+-r tools/c7n_kube/requirements.txt
+
+# Specific to testing mailer
+fakeredis==1.1.0
+
+
+
+# requires pandoc, fails on ci server, only used for pypi metadata
+# setuptools-markdown==0.2
diff --git a/tox.ini b/tox.ini
index 5fa95968115..ffb03be29ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ tox_pip_extensions_ext_venv_update = true
 [testenv]
 usedevelop = True
 deps =
-    -rrequirements-dev.txt
+    -rrequirements-ci.txt
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1

From f30a863f89430b38066f4824f862b38343d0fad6 Mon Sep 17 00:00:00 2001
From: Kirill <logachev.k@gmail.com>
Date: Tue, 3 Mar 2020 12:32:14 -0800
Subject: [PATCH 33/33] Test

---
 .github/workflows/ci-master.yml | 2 +-
 tox.ini                         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index e01e63a0d7e..10b634cbc79 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Install Test Runner
         run: |
           python -m pip install pip
-          pip install tox codecov tox-pip-extensions
+          pip install tox codecov
 
 #      - name: Reinstall missing deps
 #        run: |
diff --git a/tox.ini b/tox.ini
index ffb03be29ac..3661d2b387c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ max-line-length = 100
 
 [tox]
 envlist = py27,py36,py37,lint
-tox_pip_extensions_ext_venv_update = true
 
 [testenv]
 usedevelop = True