diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-06-06 17:04:45 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-06-06 17:04:45 -0400 |
| commit | 995d309317c6895a123c03df28bc8f51f6ead5f5 (patch) | |
| tree | 9b5dee33d1f5f28c727cb8acffba307db4f73a24 | |
| parent | 3b443bc9ca9d7159f57fc232c97a4635ecb4086f (diff) | |
| download | external_python_setuptools-995d309317c6895a123c03df28bc8f51f6ead5f5.tar.gz external_python_setuptools-995d309317c6895a123c03df28bc8f51f6ead5f5.tar.bz2 external_python_setuptools-995d309317c6895a123c03df28bc8f51f6ead5f5.zip | |
Limit the scope of deprecation of the upload_docs command.
| -rw-r--r-- | CHANGES.rst | 11 | ||||
| -rw-r--r-- | setuptools/command/upload_docs.py | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index b2d1ed9a..35ee4776 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,14 @@ +v36.1.0 +------- + +* Removed deprecation of and restored support for + ``upload_docs`` command for sites other than PyPI. + Only warehouse is dropping support, but services like + `devpi <http://doc.devpi.net/latest/>`_ continue to + support docs built by setuptools' plugins. See + `this comment <https://bitbucket.org/hpk42/devpi/issues/388/support-rtd-model-for-building-uploading#comment-34292423>`_ + for more context on the motivation for this change. + v36.0.1 ------- diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 24a017cf..07aa564a 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -57,7 +57,6 @@ class upload_docs(upload): self.target_dir = None def finalize_options(self): - log.warn("Upload_docs command is deprecated. Use RTD instead.") upload.finalize_options(self) if self.upload_dir is None: if self.has_sphinx(): @@ -69,6 +68,8 @@ class upload_docs(upload): else: self.ensure_dirname('upload_dir') self.target_dir = self.upload_dir + if 'pypi.python.org' in self.repository: + log.warn("Upload_docs command is deprecated. Use RTD instead.") self.announce('Using upload directory %s' % self.target_dir) def create_zipfile(self, filename): |