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

MNT: Update Matplotlib and pydata sphinx theme #92

Merged
merged 2 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
version: 2.1

orbs:
python: circleci/python@0.2.1
# https://circleci.com/developer/orbs/orb/circleci/python
python: circleci/python@2.1.1

jobs:
build_docs:
executor: python/default
executor:
name: python/default
tag: '3.10'
steps:
- checkout
- python/install-deps
- python/install-packages
- run:
name: Build docs
command: cd docs/ && make html
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{ matrix.language }}"
6 changes: 3 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Python dependencies
run: pip install -r requirements.txt
- name: Build
Expand All @@ -15,7 +15,7 @@ jobs:
run: rm ./docs/_build/html/objects.inv
- name: Publish
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_build/html
Expand Down
32 changes: 28 additions & 4 deletions docs/_static/css/landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,13 @@ a.link--offsite::after {
flex-direction: column;
align-items: center;
flex: 1 1 100px;
font-size: var(--heading-4);
font-family: var(--heading-font);
}

.quicklinks a {
.quicklinks a, .quicklinks a:visited,
.quicklinks a:hover, .quicklinks a:visited:hover {
color: var(--default-text);
font-size: var(--heading-4);
font-family: var(--heading-font);
}

.quicklinks__icon {
Expand Down Expand Up @@ -386,11 +387,29 @@ ul.mpl-links {
font-weight: bold;
}

ul.mpl-links a, ul.mpl-links a:visited,
ul.release-docs a, ul.release-docs a:visited
{
color: var(--white);
text-decoration: none;
}

ul.mpl-links a:hover, ul.mpl-links a:visited:hover,
ul.release-docs a:hover, ul.release-docs a:visited:hover
{
color: var(--pst-color-link-hover);
}

.release dt {
font-family: var(--heading-font);
font-size: var(--heading-5);
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 1em;
}

.release dt:first-child {
margin-top: 0;
}

.release dd {
Expand Down Expand Up @@ -657,6 +676,10 @@ a.button::after {
transition: margin 0.2s ease-out;
}

a.button:hover {
color: var(--white);
}

.button:hover::after,
a.button:hover::after {
margin-left: 80px;
Expand All @@ -678,7 +701,8 @@ a.button--teal {
}

.button--green,
a.button--green {
a.button--green,
a.button--green:hover {
background: var(--viridis-green);
color: var(--black);
}
Expand Down
2 changes: 0 additions & 2 deletions docs/_templates/landing_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ <h1>Matplotlib</h1>
<a href="https://matplotlib.org/stable/users/whats_new.html"
>changelog</a>
</dd>
</dl>

<dl class="release">
<dt>Development version</dt>
<dd>
<a href="https://matplotlib.org/devdocs/index.html">docs</a>
Expand Down
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"navbar_links": ("absolute", "server-stable"),
"footer_start": ["landing_footer"],
"secondary_sidebar_items": [],
"back_to_top_button": False,
}

# Add any paths that contain custom static files (such as style sheets) here,
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
jinja2>3
mpl-sphinx-theme~=3.8.0
pydata-sphinx-theme~=0.13.0
mpl-sphinx-theme~=3.9.0
pydata-sphinx-theme~=0.15.0
pygments>=2.7
sphinx>=7.1
sphinx-notfound-page