From c7130d559405df9c96b873a6287723654ac992d9 Mon Sep 17 00:00:00 2001
From: Daniel Morell <daniel@cairntek.com>
Date: Fri, 13 Sep 2024 16:20:29 -0500
Subject: [PATCH] Moved Python 3.6 tests out of tox.

---
 .github/workflows/ci.yml | 9 +++++++--
 tox.ini                  | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28b033bc..dbf2cc00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
       - name: Install Python 3.6 dependencies
         if: ${{ contains(matrix.python-version, '3.6') }}
         # typing-extensions dropped support for Python 3.6 in version 4.2
-        run: pip install "typing-extensions<4.2" requests==2.27.0 blinker==1.5 immutables==0.19
+        run: pip install "typing-extensions<4.2" requests==2.27.0 blinker==1.5 immutables==0.19 webob blinker httpx aiocontextvars
 
       - name: Install Python 3.7 dependencies
         if: ${{ contains(matrix.python-version, '3.7') }}
@@ -135,5 +135,10 @@ jobs:
       - name: Install Tox
         run: pip install tox
 
-      - name: Run tests
+      - name: Run tests (skip on Python 3.6)
+        if: ${{ !contains(matrix.python-version, '3.6') }}
         run: tox
+
+      - name: Run tests (Python 3.6)
+        if: ${{ contains(matrix.python-version, '3.6') }}
+        run: python -m unittest rollbar.test.discover
diff --git a/tox.ini b/tox.ini
index e535f841..a05ac4b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-requires = tox>=3
+requires = tox>=4
 
 [testenv]
 deps = webob
        blinker
        httpx
-       aiocontextvars; python_version == "3.6"
 description = run unit tests
 commands = python -m unittest rollbar.test.discover