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
868d8498
Commit
868d8498
authored
Mar 27, 2019
by
Philipp A
Committed by
Cheryl Sabella
Mar 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-31292: Fixed distutils check --restructuredtext for include directives (GH-10605)
parent
4c600046
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
command/check.py
command/check.py
+2
-1
tests/includetest.rst
tests/includetest.rst
+1
-0
tests/test_check.py
tests/test_check.py
+15
-1
No files found.
command/check.py
View file @
868d8498
...
...
@@ -120,7 +120,8 @@ class check(Command):
def
_check_rst_data
(
self
,
data
):
"""Returns warnings when the provided data doesn't compile."""
source_path
=
StringIO
()
# the include and csv_table directives need this to be a path
source_path
=
self
.
distribution
.
script_name
or
'setup.py'
parser
=
Parser
()
settings
=
frontend
.
OptionParser
(
components
=
(
Parser
,)).
get_default_values
()
settings
.
tab_width
=
4
...
...
tests/includetest.rst
0 → 100644
View file @
868d8498
This should be included.
tests/test_check.py
View file @
868d8498
"""Tests for distutils.command.check."""
import
os
import
textwrap
import
unittest
from
test.support
import
run_unittest
...
...
@@ -13,13 +14,19 @@ except ImportError:
pygments
=
None
HERE
=
os
.
path
.
dirname
(
__file__
)
class
CheckTestCase
(
support
.
LoggingSilencer
,
support
.
TempdirManager
,
unittest
.
TestCase
):
def
_run
(
self
,
metadata
=
None
,
**
options
):
def
_run
(
self
,
metadata
=
None
,
cwd
=
None
,
**
options
):
if
metadata
is
None
:
metadata
=
{}
if
cwd
is
not
None
:
old_dir
=
os
.
getcwd
()
os
.
chdir
(
cwd
)
pkg_info
,
dist
=
self
.
create_dist
(
**
metadata
)
cmd
=
check
(
dist
)
cmd
.
initialize_options
()
...
...
@@ -27,6 +34,8 @@ class CheckTestCase(support.LoggingSilencer,
setattr
(
cmd
,
name
,
value
)
cmd
.
ensure_finalized
()
cmd
.
run
()
if
cwd
is
not
None
:
os
.
chdir
(
old_dir
)
return
cmd
def
test_check_metadata
(
self
):
...
...
@@ -99,6 +108,11 @@ class CheckTestCase(support.LoggingSilencer,
cmd
=
self
.
_run
(
metadata
,
strict
=
1
,
restructuredtext
=
1
)
self
.
assertEqual
(
cmd
.
_warnings
,
0
)
# check that includes work to test #31292
metadata
[
'long_description'
]
=
'title
\
n
=====
\
n
\
n
.. include:: includetest.rst'
cmd
=
self
.
_run
(
metadata
,
cwd
=
HERE
,
strict
=
1
,
restructuredtext
=
1
)
self
.
assertEqual
(
cmd
.
_warnings
,
0
)
@
unittest
.
skipUnless
(
HAS_DOCUTILS
,
"won't test without docutils"
)
def
test_check_restructuredtext_with_syntax_highlight
(
self
):
# Don't fail if there is a `code` or `code-block` directive
...
...
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