Skip to content

Commit

Permalink
Isolate run
Browse files Browse the repository at this point in the history
Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>
  • Loading branch information
gaborbernat committed Jun 26, 2023
1 parent 9143734 commit 6999d56
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 48 deletions.
94 changes: 47 additions & 47 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
fail-fast: false
matrix:
py:
- "3.12.0-beta.2"
- "3.11"
- "3.10"
- "3.9"
- "3.8"
- "3.7"
# - "3.12.0-beta.2"
# - "3.11"
# - "3.10"
# - "3.9"
# - "3.8"
# - "3.7"
- pypy-3.9
- pypy-3.8
- pypy-3.7
# - pypy-3.8
# - pypy-3.7
os:
- ubuntu-latest
- macos-latest
# - ubuntu-latest
# - macos-latest
- windows-latest
include:
- { os: macos-latest, py: "brew@3.9" }
- { os: macos-latest, py: "brew@3.8" }
# include:
# - { os: macos-latest, py: "brew@3.9" }
# - { os: macos-latest, py: "brew@3.8" }
steps:
- uses: taiki-e/install-action@cargo-binstall
- name: Install OS dependencies
Expand Down Expand Up @@ -91,37 +91,37 @@ jobs:
PYTEST_ADDOPTS: "-vv --durations=20"
CI_RUN: "yes"
DIFF_AGAINST: HEAD

check:
name: ${{ matrix.tox_env }} - ${{ matrix.os }}
if: github.event_name != 'schedule' || github.repository_owner == 'pypa'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
- windows-latest
tox_env:
- dev
- docs
- readme
- upgrade
- zipapp
exclude:
- { os: windows-latest, tox_env: readme }
- { os: windows-latest, tox_env: docs }
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Python "3.11"
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Install tox
run: python -m pip install tox
- name: Run check for ${{ matrix.tox_env }}
run: python -m tox -e ${{ matrix.tox_env }}
env:
UPGRADE_ADVISORY: "yes"
#
# check:
# name: ${{ matrix.tox_env }} - ${{ matrix.os }}
# if: github.event_name != 'schedule' || github.repository_owner == 'pypa'
# runs-on: ${{ matrix.os }}
# strategy:
# fail-fast: false
# matrix:
# os:
# - ubuntu-latest
# - windows-latest
# tox_env:
# - dev
# - docs
# - readme
# - upgrade
# - zipapp
# exclude:
# - { os: windows-latest, tox_env: readme }
# - { os: windows-latest, tox_env: docs }
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0
# - name: Setup Python "3.11"
# uses: actions/setup-python@v4
# with:
# python-version: "3.11"
# - name: Install tox
# run: python -m pip install tox
# - name: Run check for ${{ matrix.tox_env }}
# run: python -m tox -e ${{ matrix.tox_env }}
# env:
# UPGRADE_ADVISORY: "yes"
1 change: 1 addition & 0 deletions tests/unit/config/test_ini.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

@pytest.mark.skipif(not fs_supports_symlink(), reason="symlink is not supported")
def test_ini_can_be_overwritten_by_flag(tmp_path, monkeypatch):
assert fs_supports_symlink()
custom_ini = tmp_path / "conf.ini"
custom_ini.write_text(
dedent(
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set_env =
_COVERAGE_SRC = {envsitepackagesdir}/virtualenv
commands =
coverage erase
coverage run -m pytest {posargs:--junitxml {toxworkdir}/junit.{envname}.xml tests --int}
coverage run -m pytest {posargs:tests --int -k 'test_ini_can_be_overwritten_by_flag or test_py_info_cached_symlink'}
coverage combine
coverage report --skip-covered --show-missing
coverage xml -o {toxworkdir}/coverage.{envname}.xml
Expand Down

0 comments on commit 6999d56

Please sign in to comment.