Skip to content

Commit

Permalink
Merge branch 'master' into 822-819-search-bar-improvments-and-help
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanlatr authored Nov 21, 2024
2 parents 3ea18e8 + ad1fc12 commit 53b1cdf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<!--
Thanks for your contribution!
Make sure the tests passes with the following command:
tox -p all
Don't forget to include a summary of your changes in the changelog located in the README file.
Read more about contributing to pydoctor here:
https://pydoctor.readthedocs.io/en/latest/contrib.html
-->
4 changes: 2 additions & 2 deletions .github/workflows/unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
python -c "print('\nENVIRONMENT VARIABLES\n=====================\n')"
python -c "import os; [print(f'{k}={v}') for k, v in os.environ.items()]"
- name: Run unit tests
- name: Run unit tests and coverage reports
run: |
tox -e test
tox -e test-cov
- name: Run unit tests with latest Twisted version
run: |
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install_requires =
astor; python_version < "3.9"
attrs
docutils>=0.17
lunr==0.6.2
lunr>=0.6.2,<0.8.0
configargparse
toml
importlib_metadata; python_version < "3.8"
Expand All @@ -65,6 +65,7 @@ test =
docutils>=0.18.1
coverage
pytest
pytest-xdist
hypothesis
cython-test-exception-raiser
bs4
Expand Down
8 changes: 8 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,19 @@ allowlist_externals =
passenv = *

[testenv:test]
description = Run tests with multiprocessing without coverage report, made for local development.
extras =
test
commands =
pytest -vv -n auto {posargs: pydoctor}

[testenv:test-cov]
description = Run tests and coverage report
extras =
test
commands =
coverage erase
# The multiprocessing doesn't play well with the coverage :/
coverage run -m pytest -vv {posargs: pydoctor}
coverage report -m
# The XML version is generatred to be uploaded to Codecov.
Expand Down

0 comments on commit 53b1cdf

Please sign in to comment.