Skip to content

Commit

Permalink
Limit the scope of deprecation of the upload_docs command.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Jun 6, 2017
1 parent 3b443bc commit 995d309
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
11 changes: 11 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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
-------

Expand Down
3 changes: 2 additions & 1 deletion setuptools/command/upload_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def initialize_options(self):
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():
Expand All @@ -69,6 +68,8 @@ def finalize_options(self):
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):
Expand Down

0 comments on commit 995d309

Please sign in to comment.