From 717ae3d55b1b4a3e294319102ca70b33a4c6315c Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 29 Nov 2022 16:10:56 -0500
Subject: [PATCH] Fix failing CI (#943)

* Fix flake8 config

* Drop Codecov

* Disable more rich markup in tests
---
 .flake8                    | 5 +++--
 .github/workflows/main.yml | 8 +-------
 README.rst                 | 3 ---
 pytest.ini                 | 1 -
 tests/conftest.py          | 3 +++
 tox.ini                    | 9 +++++----
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.flake8 b/.flake8
index 32c14c0b..8d5d21f5 100644
--- a/.flake8
+++ b/.flake8
@@ -3,9 +3,10 @@
 max-line-length = 88
 
 extend-ignore =
-    D107,  # Missing docstring in __init__
+    # Missing docstring in __init__
+    D107
 
-per-file-ignores = 
+per-file-ignores =
     # TODO: Incrementally add missing docstrings
     # D100 Missing docstring in public module
     # D101 Missing docstring in public class
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 23adde8b..ef5a5dc6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,13 +52,7 @@ jobs:
       - name: Run type-checking
         run: python -m tox -e types
       - name: Run tests
-        run: python -m tox -e py -- --cov-report xml
-      - uses: codecov/codecov-action@v1
-        if: github.event_name != 'schedule'
-        with:
-          file: ./coverage.xml
-          name: ${{ matrix.python-version }} - ${{ matrix.platform }}
-          fail_ci_if_error: true
+        run: python -m tox -e py
 
   # Because the tests can be flaky, they shouldn't be required for merge, but
   # it's still helpful to run them on PRs. See:
diff --git a/README.rst b/README.rst
index 5ae7eb5c..440553dd 100644
--- a/README.rst
+++ b/README.rst
@@ -10,9 +10,6 @@
 .. image:: https://img.shields.io/github/workflow/status/pypa/twine/Main
    :target: https://github.com/pypa/twine/actions
 
-.. image:: https://img.shields.io/codecov/c/github/pypa/twine
-   :target: https://codecov.io/gh/pypa/twine
-
 twine
 =====
 
diff --git a/pytest.ini b/pytest.ini
index 928f8cd9..608949b5 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -6,5 +6,4 @@ filterwarnings=
 	ignore:the imp module is deprecated::setuptools
 
 addopts =
-	--cov=twine --cov-context=test --cov-report=
 	--disable-socket
diff --git a/tests/conftest.py b/tests/conftest.py
index a0254a85..266cfee3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,6 +20,9 @@ def configure_output():
     """
     rich.reconfigure(
         no_color=True,
+        color_system=None,
+        emoji=False,
+        highlight=False,
         width=500,
     )
 
diff --git a/tox.ini b/tox.ini
index 406d68d4..ef968105 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,13 +7,15 @@ isolated_build = True
 deps =
     pretend
     pytest
-    pytest-cov
     pytest-socket
     build
+    coverage
 passenv =
     PYTEST_ADDOPTS
 commands =
-    pytest --ignore-glob '*integration*.py' {posargs:--cov-report term-missing --cov-report html}
+    python -m coverage run -m pytest --ignore-glob '*integration*.py'
+    python -m coverage html --show-contexts
+    python -m coverage report -m --fail-under 97
 
 [testenv:integration]
 deps =
@@ -26,8 +28,7 @@ deps =
 passenv =
     PYTEST_ADDOPTS
 commands =
-    # Skipping coverage because that should be handled by the other tests
-    pytest -r aR --no-cov tests/test_integration.py
+    pytest -r aR tests/test_integration.py
 
 [testenv:docs]
 deps =