Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing CI #943

Merged
merged 3 commits into from Nov 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .flake8
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/main.yml
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions README.rst
Expand Up @@ -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
=====

Expand Down
1 change: 0 additions & 1 deletion pytest.ini
Expand Up @@ -6,5 +6,4 @@ filterwarnings=
ignore:the imp module is deprecated::setuptools

addopts =
--cov=twine --cov-context=test --cov-report=
--disable-socket
3 changes: 3 additions & 0 deletions tests/conftest.py
Expand Up @@ -20,6 +20,9 @@ def configure_output():
"""
rich.reconfigure(
no_color=True,
color_system=None,
emoji=False,
highlight=False,
width=500,
)

Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Expand Up @@ -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 =
Expand All @@ -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 =
Expand Down