Skip to content

Commit 850c09b

Browse files
authored
Merge pull request #30 from dhellmann/15-modernize-doc-build
tox: update doc build commands
2 parents a204317 + e31583e commit 850c09b

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

docs/source/command_ref.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ installed.
5757
* :ref:`scripts-postmkvirtualenv`
5858
* `requirements file format`_
5959

60-
.. _requirements file format: https://pip.pypa.io/en/latest/reference/pip_install/#requirements-file-format
60+
.. _requirements file format: https://pip.pypa.io/en/stable/reference/requirements-file-format/
6161

6262
.. _command-mktmpenv:
6363

docs/source/developers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ the ``tests`` directory.
9898

9999
.. _shunit2: https://github.com/kward/shunit2
100100

101-
.. _tox: https://tox.testrun.org/
101+
.. _tox: https://tox.wiki/
102102

103103
.. _developer-templates:
104104

docs/source/plugins.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ used).
186186

187187
.. seealso::
188188

189-
* `namespace packages <https://setuptools.readthedocs.io/en/latest/setuptools.html#namespace-packages>`__
190-
* `Extensible Applications and Frameworks <https://setuptools.readthedocs.io/en/latest/setuptools.html#extensible-applications-and-frameworks>`__
189+
* `namespace packages <https://packaging.python.org/en/latest/guides/packaging-namespace-packages/>`__
191190

192191
The Hook Loader
193192
---------------
@@ -257,7 +256,7 @@ messages.
257256
.. seealso::
258257

259258
* `Standard library documentation for logging <https://docs.python.org/library/logging.html>`__
260-
* `PyMOTW for logging <https://www.doughellmann.com/PyMOTW/logging/>`__
259+
* `PyMOTW for logging <http://pymotw.com/3/logging/>`__
261260

262261
.. _plugins-extension-points:
263262

docs/source/tips.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ While the virtualenv ``activate`` script does attempt to provide
1919
an indicator in the prompt, it has various shortcomings, and
2020
cannot be customized.
2121

22-
However, it does also set a shell variable named
22+
However, it does also set a shell variable named
2323
``VIRTUAL_ENV`` which can be used as the basis for disabling the
2424
built-in prompt indicator and substituting an improved one,
2525
as a customization to ``.bashrc`` or ``.zshrc``::
2626

2727
virtualenv_prompt() {
2828
# If not in a virtualenv, print nothing
2929
[[ "$VIRTUAL_ENV" == "" ]] && return
30-
30+
3131
# Distinguish between the shell where the virtualenv was activated
3232
# and its children
3333
local venv_name="${VIRTUAL_ENV##*/}"
@@ -37,7 +37,7 @@ as a customization to ``.bashrc`` or ``.zshrc``::
3737
echo "<${venv_name}> "
3838
fi
3939
}
40-
40+
4141
# Display a "we are in a virtualenv" indicator that works in child shells too
4242
VIRTUAL_ENV_DISABLE_PROMPT=1
4343
PS1='$(virtualenv_prompt)'"$PS1"
@@ -116,10 +116,6 @@ directory each time he runs ``cd``. If it finds a ``.venv`` file, it
116116
activates the environment named within. On leaving that directory,
117117
the current virtualenv is automatically deactivated.
118118

119-
`Harry Marr <http://hmarr.com/about/>`__
120-
wrote a similar function that works with `git repositories
121-
<http://hmarr.com/2010/jan/19/making-virtualenv-play-nice-with-git/>`__.
122-
123119
Installing Common Tools Automatically in New Environments
124120
=========================================================
125121

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ classifier =
1414
Programming Language :: Python :: 3.9
1515
Programming Language :: Python :: 3.10
1616
Programming Language :: Python :: 3.11
17-
Intended Audience :: Developers
17+
Intended Audience :: Developers
1818
Environment :: Console
1919
keywords =
2020
virtualenv

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ commands = zsh -o shwordsplit ./tests/run_tests {envdir} []
3535
deps =
3636
-r{toxinidir}/requirements.txt
3737
-r{toxinidir}/docs/requirements.txt
38-
commands = python setup.py build_sphinx
38+
commands =
39+
sphinx-build -W -j auto -b html -d docs/build/doctrees docs/source docs/build/html
40+
sphinx-build -W -j auto -b linkcheck -d docs/build/doctrees docs/source docs/build/linkcheck
3941

4042
[testenv:pkglint]
4143
deps=

0 commit comments

Comments
 (0)