Skip to content

Commit

Permalink
tox + CI: Restore man page rendering
Browse files Browse the repository at this point in the history
Revert parts of commit 98ce41f
  • Loading branch information
hartwork committed Dec 11, 2023
1 parent db27a4e commit 11b2ebc
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 10 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install non-PyPI dependencies
run: |
set -x
sudo apt-get update
sudo apt-get install --yes --no-install-recommends -V \
docbook-xml \
docbook-xsl \
libxml2-utils \
xsltproc
- name: Install tox
run: python3 -m pip install --user "tox>=4.0.0"
- name: Check out src from Git
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ jobs:
~/.cache/pre-commit
key: pre-commit-${{ matrix.name || matrix.passed_name }}-${{ hashFiles('.pre-commit-config.yaml') }}

- name: Install non-PyPI dependencies (Linux only)
if: runner.os == 'Linux'
run: |
set -x
sudo apt-get update
sudo apt-get install --yes --no-install-recommends -V \
docbook-xml \
docbook-xsl \
libxml2-utils \
xsltproc
- name: Set up Python ${{ matrix.python_version || '3.9' }}
uses: actions/setup-python@v4
with:
Expand Down
18 changes: 8 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ deps =
setenv =
commands =
rm -rfv {toxinidir}/dist/
sh -c 'a2x \
--conf-file=man/asciidoc.conf \
--attribute="manual_package=ansi2html" \
--attribute="manual_title=ansi2html Manual" \
--attribute="manual_version=$(python3 -m setuptools_scm)" \
--format=manpage -D man \
man/ansi2html.1.txt'
python -m build \
--outdir {toxinidir}/dist/ \
{toxinidir}
Expand All @@ -61,14 +68,5 @@ allowlist_externals =
description = Generate Sphinx docs under build/docs
extras = docs
commands =
# Disabled due https://github.com/pycontribs/ansi2html/issues/193
; sh -c 'a2x \
; --verbose \
; --no-xmllint \
; --conf-file=man/asciidoc.conf \
; --attribute="manual_package=ansi2html" \
; --attribute="manual_title=ansi2html Manual" \
; --attribute="manual_version=$(python3 -m setuptools_scm)" \
; --format=manpage -D man \
; man/ansi2html.1.txt'
mkdocs {posargs:build --strict --site-dir=_readthedocs/html/}
>>>>>>> 9d9fd46 (tox + CI: Restore man page rendering)

0 comments on commit 11b2ebc

Please sign in to comment.