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

Fixes #6759: validation of html static paths and extra paths no longe… #6765

Closed
wants to merge 6 commits into from

Conversation

bizzfitch
Copy link

…r throws an error if the paths are in different directories

Subject: Reimplement behavior from 2.1.2

Feature or Bugfix

  • Bugfix

Purpose

See my issue created. Hopefully I'm doing this right, this is my first pull request, kinda nervous

Detail

In essence, the sys.path.commonpath function throws a Value Error if the paths are in different drives. Sphinx has previously had no issue writing to a different drive than the source, but this validation step throws an error. Now, if the drives are different, the error is caught. Since the purpose of the function was to check if the source and static directories was the same, it would evaluate to True if commonpath didn't raise an error.

Relates

@codecov
Copy link

codecov bot commented Oct 24, 2019

Codecov Report

Merging #6765 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6765      +/-   ##
==========================================
- Coverage   84.42%   84.41%   -0.01%     
==========================================
  Files         266      267       +1     
  Lines       40474    40497      +23     
  Branches     5934     5937       +3     
==========================================
+ Hits        34170    34187      +17     
- Misses       4997     5000       +3     
- Partials     1307     1310       +3
Impacted Files Coverage Δ
sphinx/builders/html.py 85.21% <100%> (ø) ⬆️
sphinx/__init__.py 73.91% <0%> (ø)

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 a6a2a59...3cd24fe. Read the comment docs.

@tk0miya
Copy link
Member

tk0miya commented Oct 26, 2019

Now I'm preparing to merge this into 2.2.1 branch on #6774.

@tk0miya
Copy link
Member

tk0miya commented Oct 26, 2019

I finished to merge this into 2.2.1 branch now.
Thank you for your contribution!

@tk0miya tk0miya closed this Oct 26, 2019
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants