From de83655aa6b6127ff5c530aed09766225bba5966 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Fri, 16 Sep 2022 19:32:58 +0200 Subject: [PATCH] Backport PR #48285: WEB: Unpin pydata sphinx theme --- doc/_templates/sidebar-nav-bs.html | 4 ++-- doc/source/conf.py | 4 ++-- environment.yml | 2 +- requirements-dev.txt | 2 +- web/pandas/versions.json | 21 ++++++++++++++------- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/doc/_templates/sidebar-nav-bs.html b/doc/_templates/sidebar-nav-bs.html index 7e0043e771e72..f592a910dfbda 100644 --- a/doc/_templates/sidebar-nav-bs.html +++ b/doc/_templates/sidebar-nav-bs.html @@ -1,9 +1,9 @@ diff --git a/doc/source/conf.py b/doc/source/conf.py index e7e64315a502f..8740f6aa7eef6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,10 +244,10 @@ "github_url": "https://github.com/pandas-dev/pandas", "twitter_url": "https://twitter.com/pandas_dev", "google_analytics_id": "UA-27880019-2", + "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { - "json_url": "https://pandas.pydata.org/versions.json", - "url_template": "https://pandas.pydata.org/{version}/", + "json_url": "/versions.json", "version_match": switcher_version, }, } diff --git a/environment.yml b/environment.yml index 90b6694a392bf..5adcf0dd216d8 100644 --- a/environment.yml +++ b/environment.yml @@ -99,7 +99,7 @@ dependencies: - natsort # DataFrame.sort_values doctest - numpydoc - pandas-dev-flaker=0.5.0 - - pydata-sphinx-theme=0.8.0 + - pydata-sphinx-theme - pytest-cython # doctest - sphinx - sphinx-panels diff --git a/requirements-dev.txt b/requirements-dev.txt index 39118b750fa8c..8be19d85f9515 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -76,7 +76,7 @@ gitdb natsort numpydoc pandas-dev-flaker==0.5.0 -pydata-sphinx-theme==0.8.0 +pydata-sphinx-theme pytest-cython sphinx sphinx-panels diff --git a/web/pandas/versions.json b/web/pandas/versions.json index 3085efe02738b..2b30006db0c4d 100644 --- a/web/pandas/versions.json +++ b/web/pandas/versions.json @@ -1,30 +1,37 @@ [ { "name": "dev", - "version": "docs/dev" + "version": "dev", + "url": "/docs/dev/" }, { "name": "1.4 (stable)", - "version": "docs" + "version": "1.4 (stable)", + "url": "/docs/" }, { "name": "1.4", - "version": "pandas-docs/version/1.4" + "version": "1.4", + "url": "/pandas-docs/version/1.4/" }, { "name": "1.3", - "version": "pandas-docs/version/1.3" + "version": "1.3", + "url": "/pandas-docs/version/1.3/" }, { "name": "1.2", - "version": "pandas-docs/version/1.2" + "version": "1.2", + "url": "/pandas-docs/version/1.2/" }, { "name": "1.1", - "version": "pandas-docs/version/1.1" + "version": "1.1", + "url": "/pandas-docs/version/1.1/" }, { "name": "1.0", - "version": "pandas-docs/version/1.0" + "version": "1.0", + "url": "/pandas-docs/version/1.0/" } ]