Skip to content

Commit

Permalink
CI: do not depend on make
Browse files Browse the repository at this point in the history
  • Loading branch information
pajod committed May 19, 2024
1 parent 2b7e3f1 commit e3c72b2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,10 @@ jobs:
if: ${{ matrix.toxenv }}
- name: "Update docs"
if: ${{ ! matrix.toxenv }}
env:
# annoying results for pl_PL and fr_FR.. still the only *obvious* choice
LC_ALL: C
run: |
python -m pip install .[dev]
# this will update docs/source/settings.rst
make -C docs dummy
# this will update docs/source/settings.rst - but will not create html output
(cd docs && sphinx-build -b "dummy" -d _build/doctrees source "_build/dummy")
if unclean=$(git status --untracked-files=no --porcelain) && [ -z "$unclean" ]; then
echo "no uncommitted changes in working tree (as it should be)"
else
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ details.

### Notable changes tested in this repository

* [PR #3196](https://github.com/benoitc/gunicorn/pull/3196)
* [PR #3127: refactor socket wrappers](https://github.com/benoitc/gunicorn/pull/3127)
* [PR #3134: CI test older dependencies](https://github.com/benoitc/gunicorn/pull/3134)
* [PR #3192: fix 22.0 regression: `SCRIPT_NAME` forbidden](https://github.com/benoitc/gunicorn/pull/3192)
* [PR #3191: correct log severity](https://github.com/benoitc/gunicorn/pull/3191)
* [PR #3196: fix 22.0 regression: exception in error handling](https://github.com/benoitc/gunicorn/pull/3196)
* [PR #3197: fix percent-formatting](https://github.com/benoitc/gunicorn/pull/3197)
* [PR #3201: add type stubs](https://github.com/benoitc/gunicorn/pull/3201)
* [PR #3210: remove fcntl](https://github.com/benoitc/gunicorn/pull/3210)
* [PR #3211: CI for 3.13](https://github.com/benoitc/gunicorn/pull/3211)
* unsubmitted: Updated django example for Django 4.2
* unsubmitted: New CI job to verify docs are up to date

</tbody>
</tr></tbody></table>
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ omit = [

[tool.pytest.ini_options]
# can override these: python -m pytest --override-ini="addopts="
faulthandler_timeout = 25
faulthandler_timeout = 600
norecursedirs = ["examples", "lib", "local", "src"]
testpaths = ["tests/"]
addopts = ["--strict-markers", "--assert=plain"]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def read_stdio(self, *, key, timeout_sec, wait_for_keyword, expect=()):
time.sleep(1.0 / poll_per_second)
# assert buf[abs(key - 1)] == ""
assert wait_for_keyword in buf[key], (wait_for_keyword, *buf)
assert not expect, (additional_keyword, *buf)
assert not expect, (expect, *buf)
return buf[key]


Expand Down

0 comments on commit e3c72b2

Please sign in to comment.