Skip to content

GH41457 Upgrade Bootstrap to v5.0 #41651

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

Merged
merged 4 commits into from
Jul 6, 2021

Conversation

calvh
Copy link
Contributor

@calvh calvh commented May 24, 2021

Whats new:

Update BS script tags in template

Replace jumbotron with utilities

Replace font-weight-bold with fw-bold

Replace ml-auto with ms-auto

Replace float-right with float-end

Replace data-target with data-bs-target

Replace data-toggle with data-bs-toggle

Add CSS rules for

Update BS script tags in template

Replace jumbotron with utilities

Replace font-weight-bold with fw-bold

Replace ml-auto with ms-auto

Replace float-right with float-end

Replace data-target with data-bs-target

Replace data-toggle with data-bs-toggle

Add CSS rules for <a>
@calvh
Copy link
Contributor Author

calvh commented May 24, 2021

Live preview here
I have the build folder too in case anyone wants to double check locally without pulling the branch.
build.zip

@lithomas1 lithomas1 added the Web pandas website label May 24, 2021
@lithomas1 lithomas1 requested a review from datapythonista June 7, 2021 23:38
Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

Thanks @calvh, really nice. Lgtm, sorry for the delay.

Do you mind merging master? I think the CI should be green now.

@calvh
Copy link
Contributor Author

calvh commented Jun 8, 2021

Thank you @datapythonista! I am sorry this may be a dumb question, but do you mean I should merge with the latest master so that the CI will pass? If so, should I be doing merge (fast-forward) or rebase?

@datapythonista
Copy link
Member

Your branch was created two weeks ago, so your changes (the diff in this PR) are proposed on that old master. That master was broken for some problems with the development branch of numpy, that's why the CI is red.

So, the idea is that you updated your branch, so it contains all the changes in master for the last two weeks. The CI should be then green, and also, if anything changed in master that affects this PR, we should have it in the diff and in the CI.

In practice, that's simply git fetch upstream, and then git merge upstream/master being in your branch. And then you git push to update this PR.

Does it make sense?

@calvh
Copy link
Contributor Author

calvh commented Jun 12, 2021

@datapythonista I need some help, I merged master but some CI checks are still failing. Should I merge again with the latest master and try again? Thank you in advance.

@datapythonista
Copy link
Member

I can't check in detail now, but seems like all last PRs are red, so I guess something is broken in master. You'll have to wait until it's fixed, and thrn merge master again.

Merge branch 'master' into 41457-upgrade-to-bootstrap5
@calvh
Copy link
Contributor Author

calvh commented Jul 6, 2021

@datapythonista thought I'd try again after merging with the latest master, but still no luck :(

The error from one of the failing check occurs when running the bash script to create the conda environment

("Connection broken: ConnectionResetError(10054, 'An existing connection was forcibly closed by the remote host', None, 10054, None)", ConnectionResetError(10054, 'An existing connection was forcibly closed by the remote host', None, 10054, None))

I wonder what I can do to fix this problem?

@datapythonista
Copy link
Member

Let's rerun and see, seems like conda servers are having problems recently.

@calvh
Copy link
Contributor Author

calvh commented Jul 6, 2021

Thank you!

All the tests passed except one. Looks like an issue with one of the scalar/timedelta tests. There is currently a PR to fix it (#42413). Once that is merged to master I will merge and push again.

GH PR pandas-dev#42413

Merge branch 'master' into 41457-upgrade-to-bootstrap5
@calvh
Copy link
Contributor Author

calvh commented Jul 6, 2021

@datapythonista all the tests passed. Thank you for your guidance and assistance!

@jreback jreback added this to the 1.4 milestone Jul 6, 2021
@jreback jreback merged commit ee3a5b7 into pandas-dev:master Jul 6, 2021
@jreback
Copy link
Contributor

jreback commented Jul 6, 2021

thanks @calvh

@calvh calvh deleted the 41457-upgrade-to-bootstrap5 branch July 6, 2021 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Web pandas website
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WEB: Upgrade Bootstrap from v4.0 to v5.0
4 participants