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.

Sign up for GitHub

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

Fixups after release of SciPy 1.8.0 #1

Merged
merged 6 commits into from
Feb 8, 2022
Merged

Fixups after release of SciPy 1.8.0 #1

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
195f61a
Fixups after release of SciPy 1.8.0
tylerjereddy Feb 7, 2022
5856659
First round of revisions suggested in PR 1.
tylerjereddy Feb 7, 2022
9261994
More review suggestions
tylerjereddy Feb 7, 2022
e5bf4d9
Revert "More review suggestions"
tylerjereddy Feb 7, 2022
d08759d
Revert "First round of revisions suggested in PR 1."
tylerjereddy Feb 7, 2022
483f0c1
Add suggestions from 2nd round of review.
tylerjereddy Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ RewriteEngine On
RewriteRule ^numpy(/.*) https://numpy.org/doc/stable$1 [R=permanent]
# See https://github.com/scipy/scipy/issues/14267
Redirect 301 /scipy/reference/objects.inv /scipy/objects.inv
RewriteRule scipy/ scipy-1.8.0/reference
Copy link

@maxnoe maxnoe Feb 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I think this needs to be as above for numpy: ^scipy(/.*) scipy-1.8.0/html-scipyorg$1 should work

Copy link

Choose a reason for hiding this comment

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

And probably also one for 1.8:

^scipy-1.8.0(/.*) scipy-1.8.0/html-scipyorg$1

Copy link
Owner Author

Choose a reason for hiding this comment

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

@maxnoe I applied and deployed your suggestions from the review process here.

Note that this did break someting that worked before--the HTML zip and PDF links are now broken on the side list for 1.8.0:

image

Copy link

Choose a reason for hiding this comment

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

Sorry, I think the regex matches to much, the slash should be in front of the parentheses and in front of $1

Copy link
Owner Author

Choose a reason for hiding this comment

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

The adjusted regex would still catch the tarball/PDF, which haven't been moved to the new location with the new theme. There's another issue though noted in #1 (comment) which I don't understand yet, since the file seems to be there.

Copy link

@maxnoe maxnoe Feb 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Rewrite rule are processed in order, so of we add one rule each first matching exactly the pdf and zipped html that should work, right?

RewriteRule scipy-1.8.0/reference scipy-1.8.0/html-scipyorg/reference
Copy link

Choose a reason for hiding this comment

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

And then this one shouldn't be needed.

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /index.html [L]