diff options
| author | Stefan H. Holek <stefan@epy.co.at> | 2012-10-19 04:15:58 +0200 |
|---|---|---|
| committer | Stefan H. Holek <stefan@epy.co.at> | 2012-10-19 04:15:58 +0200 |
| commit | 0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed (patch) | |
| tree | 503026cd7b7729b34657fdd6a15b4235300e44d6 | |
| parent | 197c1c33644d1bae8e58f0fbdbd33b387d8ec0bb (diff) | |
| download | external_python_setuptools-0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed.tar.gz external_python_setuptools-0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed.tar.bz2 external_python_setuptools-0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed.zip | |
Update CHANGES and docs.
--HG--
branch : distribute
extra : rebase_source : e24a57706eebda4c1f989467a0a3bc951f550dd4
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | docs/setuptools.txt | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e2b7874b..3d90f534 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,9 @@ CHANGES 0.6.29 ------ +* If Sphinx is installed, the `upload_docs` command now runs `build_sphinx` + to produce uploadable documentation. +* Issue #326: `upload_docs` provided mangled auth credentials under Python 3. * Issue #320: Fix check for "createable" in distribute_setup.py. * Issue #305: Remove a warning that was triggered during normal operations. * Issue #311: Print metadata in UTF-8 independent of platform. diff --git a/docs/setuptools.txt b/docs/setuptools.txt index 31eedcb1..81c3aae3 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -2423,7 +2423,12 @@ command:: python setup.py upload_docs --upload-dir=docs/build/html -As with any other ``setuptools`` based command, you can define useful +If no ``--upload-dir`` is given, ``upload_docs`` will attempt to run the +``build_sphinx`` command to generate uploadable documentation. +For the command to become available, `Sphinx <http://sphinx.pocoo.org/>`_ +must be installed in the same environment as distribute. + +As with other ``setuptools``-based commands, you can define useful defaults in the ``setup.cfg`` of your Python project, e.g.: .. code-block:: ini |