Skip to content

Commit

Permalink
Merge pull request #64 from kurtmckee/fix-coverage-run-parallel
Browse files Browse the repository at this point in the history
Support running `tox p`
  • Loading branch information
kurtmckee authored Aug 29, 2024
2 parents 9df2237 + e54d9ed commit 5b4b063
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
.venv/bin/python -m pip install tox
- name: "Run tests"
run: ".venv/bin/tox run"
run: ".venv/bin/tox run --colored yes"
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Development

- Support running tox environments in parallel.
- Configure mypy to output in color in CI.
53 changes: 33 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
# scriv
# -----
# coverage
# --------

[tool.scriv]
version = "command: grep -e 'version=' client/setup.py | grep -oPe '[\\d.]+'"
categories = [
"Python support",
"Added",
"Fixed",
"Removed",
"Changed",
"Deprecated",
"Security",
"Development",
]
entry_title_template = "{{ version }} - {{ date.strftime('%Y-%m-%d') }}"
format = "md"
md_header_level = "2"
fragment_directory = "changelog.d"
insert_marker = "scriv-insert-here"
main_branches = ["main"]
[tool.coverage.run]
relative_files = true
parallel = true
branch = true

[tool.coverage.report]
skip_covered = true
fail_under = 84


# isort
Expand All @@ -44,3 +34,26 @@ addopts = "--color=yes"
filterwarnings = [
"error",
]


# scriv
# -----

[tool.scriv]
version = "command: grep -e 'version=' client/setup.py | grep -oPe '[\\d.]+'"
categories = [
"Python support",
"Added",
"Fixed",
"Removed",
"Changed",
"Deprecated",
"Security",
"Development",
]
entry_title_template = "{{ version }} - {{ date.strftime('%Y-%m-%d') }}"
format = "md"
md_header_level = "2"
fragment_directory = "changelog.d"
insert_marker = "scriv-insert-here"
main_branches = ["main"]
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ commands = coverage erase
deps = coverage
skip_install = true
commands_pre = -coverage combine
commands = coverage report --skip-covered
commands = coverage report

[testenv:mypy-{client,daemon}]
skip_install = true
Expand All @@ -42,6 +42,8 @@ deps =
client: ./client
daemon: ./daemon
daemon: boto3-stubs[logs]
setenv =
MYPY_FORCE_COLOR=1
commands =
client: mypy globus_cw_client {posargs}
daemon: mypy globus_cw_daemon {posargs}
Expand Down

0 comments on commit 5b4b063

Please sign in to comment.