Skip to content

Commit ebf62ac

Browse files
authored
Merge branch 'master' into get-running-loop
2 parents 3cf418f + 9451387 commit ebf62ac

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ jobs:
4848
- python: '3.8'
4949
check_formatting: '1'
5050
extra_name: ', check formatting'
51-
- python: '3.8'
52-
check_docs: '1'
53-
extra_name: ', check docs'
5451
# pypy3.7-nightly produces an "OSError: handle is closed" in the
5552
# bowels of multiprocessing after all tests appear to complete successfully
5653
# - python: '3.7' # <- not actually used

ci.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,6 @@ EOF
103103
exit 1
104104
fi
105105
exit 0
106-
fi
107-
108-
if [ "$CHECK_DOCS" = "1" ]; then
109-
python -m pip install -r docs-requirements.txt
110-
cd docs
111-
# -n (nit-picky): warn on missing references
112-
# -W: turn warnings into errors
113-
sphinx-build -nW -b html source build
114106
else
115107
# Actual tests
116108
python -m pip install -r test-requirements.txt

docs-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
sphinx >= 1.7.0
22
sphinx_rtd_theme
33
sphinxcontrib-trio
4+
towncrier
45
trio >= 0.15.0
56
outcome
67
attrs

docs/source/conf.py

100644100755
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
# So autodoc can import our package
2323
sys.path.insert(0, os.path.abspath('../..'))
2424

25+
# https://docs.readthedocs.io/en/stable/builds.html#build-environment
26+
if "READTHEDOCS" in os.environ:
27+
import glob
28+
if glob.glob("../../newsfragments/*.*.rst"):
29+
print("-- Found newsfragments; running towncrier --", flush=True)
30+
import subprocess
31+
subprocess.run(
32+
["towncrier", "--yes", "--date", "not released yet"],
33+
cwd="../..",
34+
check=True,
35+
)
36+
2537
# Warn about all references to unknown targets
2638
nitpicky = True
2739
# Except for these ones, which we expect to point to unknown targets:

0 commit comments

Comments
 (0)