Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6803: Disable parallel build on macOS and py38+ #6879

Merged

Conversation

tk0miya
Copy link
Member

@tk0miya tk0miya commented Dec 1, 2019

Feature or Bugfix

  • Bugfix

Purpose

@tk0miya tk0miya added this to the 2.2.2 milestone Dec 1, 2019
@tk0miya tk0miya force-pushed the 6803_parallel_build_error_on_macOS branch from 8304804 to e742af0 Compare December 1, 2019 07:10
@codecov
Copy link

codecov bot commented Dec 1, 2019

Codecov Report

Merging #6879 into 2.2.2 will decrease coverage by <.01%.
The diff coverage is 80%.

Impacted file tree graph

@@            Coverage Diff             @@
##            2.2.2    #6879      +/-   ##
==========================================
- Coverage   83.75%   83.74%   -0.01%     
==========================================
  Files         271      271              
  Lines       41014    41022       +8     
  Branches     6002     6003       +1     
==========================================
+ Hits        34352    34355       +3     
- Misses       5335     5339       +4     
- Partials     1327     1328       +1
Impacted Files Coverage Δ
setup.py 0% <ø> (ø) ⬆️
sphinx/util/parallel.py 74.19% <100%> (+0.56%) ⬆️
sphinx/pycode/parser.py 94.95% <100%> (ø) ⬆️
tests/test_util_logging.py 100% <100%> (ø) ⬆️
sphinx/application.py 77.9% <33.33%> (-0.4%) ⬇️
sphinx/highlighting.py 83.63% <0%> (-2.73%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc53404...e742af0. Read the comment docs.

@@ -129,7 +129,7 @@ class TokenProcessor:
def __init__(self, buffers: List[str]) -> None:
lines = iter(buffers)
self.buffers = buffers
self.tokens = tokenize.generate_tokens(lambda: next(lines))
self.tokens = tokenize.generate_tokens(lambda: next(lines)) # type: ignore
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR contains #6874 's change.

Copy link
Contributor

@jfbu jfbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, test behaves as designed and xfails:

tests/test_util_logging.py::test_logging_in_ParallelTasks XFAIL          [100%]

============================== 1 xfailed in 0.47s ==============================

and is marked as passing on Python 3.7 and 3.6 at my mac ox x... (the above via make test)

I also tested behavior with -j4. With Python 3.8:

$ make html O=-j4
Sphinx v2.2.2+/e742af060 en cours d'exécution
For security reason, parallel mode is disabled on macOS and python3.8 and above.  For more details, please read https://github.com/sphinx-doc/sphinx/issues/6803

and the build proceeds in non-parallel mode, whereas
with Python 3.7.5 parallel build proceeds with no warning. Only to confirm!

@tk0miya tk0miya merged commit 3bc16b0 into sphinx-doc:2.2.2 Dec 1, 2019
@tk0miya
Copy link
Member Author

tk0miya commented Dec 1, 2019

Thank you for reviewing! Merged.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants