Run tests without tox

kevin1024 · Dec 11, 2023 · b6b0e0d · b6b0e0d
1 parent 796dc8d
commit b6b0e0d
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 33 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.9", "pypy-3.10"]
+        python-version:
+          [
+            "3.8",
+            "3.9",
+            "3.10",
+            "3.11",
+            "3.12",
+            "pypy-3.8",
+            "pypy-3.9",
+            "pypy-3.10",
+          ]
 
     steps:
       - uses: actions/checkout@v4
@@ -25,19 +35,19 @@ jobs:
 
       - name: Install project dependencies
         run: |
-          pip3 install --upgrade pip
-          pip3 install codecov tox tox-gh-actions
-
-      - name: Run online tests with tox
-        run: tox -- -m online
-
-      - name: Run offline tests with tox with no access to the Internet
-        run: |
-          # We're using unshare to take Internet access
-          # away from tox so that we'll notice whenever some new test
-          # is missing @pytest.mark.online decoration in the future
-          unshare --map-root-user --net -- \
-              sh -c 'ip link set lo up; tox -- -m "not online"'
+          pip install --upgrade pip
+          pip install codecov .[tests]
+
+      - name: Run tests
+        run: ./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append
+
+      # - name: Run offline tests with no access to the Internet
+      #   run: |
+      #     # We're using unshare to take Internet access
+      #     # away from tox so that we'll notice whenever some new test
+      #     # is missing @pytest.mark.online decoration in the future
+      #     unshare --map-root-user --net -- \
+      #         sh -c 'ip link set lo up; ./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append -m "not online"'
 
       - name: Run coverage
         run: codecov
diff --git a/setup.py b/setup.py
@@ -57,24 +57,29 @@ def run_tests(self):
     "urllib3 <2; platform_python_implementation =='PyPy'",
 ]
 
-tests_require = [
-    "aiohttp",
-    "boto3",
-    "httplib2",
-    "httpx",
-    "pytest",
-    "pytest-aiohttp",
-    "pytest-httpbin",
-    "requests>=2.16.2",
-    "tornado",
-    # Needed to un-break httpbin 0.7.0. For httpbin >=0.7.1 and after,
-    # this pin and the dependency itself can be removed, provided
-    # that the related bug in httpbin has been fixed:
-    # https://github.com/kevin1024/vcrpy/issues/645#issuecomment-1562489489
-    # https://github.com/postmanlabs/httpbin/issues/673
-    # https://github.com/postmanlabs/httpbin/pull/674
-    "Werkzeug==2.0.3",
-]
+tests_require = {
+    "tests": [
+        "aiohttp",
+        "boto3",
+        "httplib2",
+        "httpx",
+        "pytest-aiohttp",
+        "pytest-asyncio",
+        "pytest-cov",
+        "pytest-httpbin",
+        "pytest",
+        "requests>=2.22.0",
+        "tornado",
+        "urllib3",
+        # Needed to un-break httpbin 0.7.0. For httpbin >=0.7.1 and after,
+        # this pin and the dependency itself can be removed, provided
+        # that the related bug in httpbin has been fixed:
+        # https://github.com/kevin1024/vcrpy/issues/645#issuecomment-1562489489
+        # https://github.com/postmanlabs/httpbin/issues/673
+        # https://github.com/postmanlabs/httpbin/pull/674
+        "Werkzeug==2.0.3",
+    ],
+}
 
 setup(
     name="vcrpy",
@@ -89,7 +94,7 @@ def run_tests(self):
     python_requires=">=3.8",
     install_requires=install_requires,
     license="MIT",
-    tests_require=tests_require,
+    extras_require=tests_require,
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",