Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
7f814454
Commit
7f814454
authored
Sep 01, 2016
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provide forward compatibility for Warehouse as the default repository for the upload command.
parent
1bab356f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
0 deletions
+44
-0
CHANGES.rst
CHANGES.rst
+22
-0
setuptools/__init__.py
setuptools/__init__.py
+17
-0
setuptools/command/upload_docs.py
setuptools/command/upload_docs.py
+5
-0
No files found.
CHANGES.rst
View file @
7f814454
...
...
@@ -2,6 +2,28 @@
CHANGES
=======
v27
.0.0
-------
*
Now
use
Warehouse
by
default
for
``
upload
``,
patching
``
distutils
.
config
.
PyPIRCCommand
``
to
affect
default
behavior
.
Any
config
in
.
pypirc
should
be
updated
to
replace
https
://
pypi
.
python
.
org
/
pypi
/
with
https
://
upload
.
pypi
.
org
/
legacy
/
Similarly
,
any
passwords
stored
in
the
keyring
should
be
updated
to
use
this
new
value
for
"system"
.
The
``
upload_docs
``
command
will
continue
to
use
the
python
.
org
site
,
but
the
command
is
now
deprecated
.
Users
are
urged
to
use
Read
The
Docs
instead
.
v26
.1.1
-------
...
...
setuptools/__init__.py
View file @
7f814454
...
...
@@ -183,3 +183,20 @@ has_issue_12885 = (
if
has_issue_12885
:
# fix findall bug in distutils (http://bugs.python.org/issue12885)
distutils
.
filelist
.
findall
=
findall
needs_warehouse
=
(
sys
.
version_info
<
(
2
,
7
,
13
)
or
(
3
,
0
)
<
sys
.
version_info
<
(
3
,
3
,
7
)
or
(
3
,
4
)
<
sys
.
version_info
<
(
3
,
4
,
6
)
or
(
3
,
5
)
<
sys
.
version_info
<=
(
3
,
5
,
3
)
or
(
3
,
6
)
<
sys
.
version_info
)
if
needs_warehouse
:
warehouse
=
'https://upload.pypi.org/legacy/'
distutils
.
config
.
PyPIRCCommand
.
DEFAULT_REPOSITORY
=
warehouse
setuptools/command/upload_docs.py
View file @
7f814454
...
...
@@ -29,6 +29,10 @@ def _encode(s):
class
upload_docs
(
upload
):
# override the default repository as upload_docs isn't
# supported by Warehouse (and won't be).
DEFAULT_REPOSITORY
=
'https://pypi.python.org/pypi/'
description
=
'Upload documentation to PyPI'
user_options
=
[
...
...
@@ -53,6 +57,7 @@ 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
():
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment