From 9bcfd8185e2a6542a823a7a40b6e7f6f0db6dcd9 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Sat, 27 Aug 2022 23:46:25 +0200 Subject: [PATCH 1/9] WEB: Unpin pydata sphinx theme --- environment.yml | 2 +- requirements-dev.txt | 2 +- web/pandas/versions.json | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/environment.yml b/environment.yml index d9a7dbe880728..20c1260cb908e 100644 --- a/environment.yml +++ b/environment.yml @@ -100,7 +100,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 70455a196d4d7..43bd81779654d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -77,7 +77,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..f735d7ea6693c 100644 --- a/web/pandas/versions.json +++ b/web/pandas/versions.json @@ -1,30 +1,37 @@ [ { "name": "dev", - "version": "docs/dev" + "version": "dev", + "url": "https://pandas.pydata.org/docs/dev/index.html" }, { "name": "1.4 (stable)", - "version": "docs" + "version": "1.4 (stable)", + "url": "https://pandas.pydata.org/docs/index.html" }, { "name": "1.4", - "version": "pandas-docs/version/1.4" + "version": "1.4", + "url": "https://pandas.pydata.org/pandas-docs/version/1.4/index.html" }, { "name": "1.3", - "version": "pandas-docs/version/1.3" + "version": "1.3", + "url": "https://pandas.pydata.org/pandas-docs/version/1.3/index.html" }, { "name": "1.2", - "version": "pandas-docs/version/1.2" + "version": "1.2", + "url": "https://pandas.pydata.org/pandas-docs/version/1.2/index.html" }, { "name": "1.1", - "version": "pandas-docs/version/1.1" + "version": "1.1", + "url": "https://pandas.pydata.org/pandas-docs/version/1.1/index.html" }, { "name": "1.0", - "version": "pandas-docs/version/1.0" + "version": "1.0", + "url": "https://pandas.pydata.org/pandas-docs/version/1.0/index.html" } ] From aa1f773b0f40e09419bf3f913346c63eec620be6 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Sun, 28 Aug 2022 11:38:08 +0200 Subject: [PATCH 2/9] Remove parameter --- doc/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 84958595f6618..5676fdb23e69d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -245,7 +245,6 @@ "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { "json_url": "https://pandas.pydata.org/versions.json", - "url_template": "https://pandas.pydata.org/{version}/", "version_match": switcher_version, }, } From eae1651f0cd89c6e20a0b40d35d502992dfec4ce Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Mon, 12 Sep 2022 22:00:27 +0200 Subject: [PATCH 3/9] Update --- doc/_templates/sidebar-nav-bs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 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 @@ From 3bebd60d9b4397b41a3cb5f92cd0120e912b24c9 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Tue, 13 Sep 2022 09:29:00 +0200 Subject: [PATCH 4/9] Update versions --- web/pandas/versions.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/pandas/versions.json b/web/pandas/versions.json index f735d7ea6693c..9bc57cbc8d6d5 100644 --- a/web/pandas/versions.json +++ b/web/pandas/versions.json @@ -2,36 +2,36 @@ { "name": "dev", "version": "dev", - "url": "https://pandas.pydata.org/docs/dev/index.html" + "url": "docs/dev/" }, { "name": "1.4 (stable)", "version": "1.4 (stable)", - "url": "https://pandas.pydata.org/docs/index.html" + "url": "docs/" }, { "name": "1.4", "version": "1.4", - "url": "https://pandas.pydata.org/pandas-docs/version/1.4/index.html" + "url": "pandas-docs/version/1.4/" }, { "name": "1.3", "version": "1.3", - "url": "https://pandas.pydata.org/pandas-docs/version/1.3/index.html" + "url": "pandas-docs/version/1.3/" }, { "name": "1.2", "version": "1.2", - "url": "https://pandas.pydata.org/pandas-docs/version/1.2/index.html" + "url": "pandas-docs/version/1.2/" }, { "name": "1.1", "version": "1.1", - "url": "https://pandas.pydata.org/pandas-docs/version/1.1/index.html" + "url": "pandas-docs/version/1.1/" }, { "name": "1.0", "version": "1.0", - "url": "https://pandas.pydata.org/pandas-docs/version/1.0/index.html" + "url": "pandas-docs/version/1.0/" } ] From df77a05f6050fee064b4d5a398caeb5531d080e3 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Tue, 13 Sep 2022 10:55:07 +0200 Subject: [PATCH 5/9] Change urls --- web/pandas/versions.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/pandas/versions.json b/web/pandas/versions.json index 9bc57cbc8d6d5..2b30006db0c4d 100644 --- a/web/pandas/versions.json +++ b/web/pandas/versions.json @@ -2,36 +2,36 @@ { "name": "dev", "version": "dev", - "url": "docs/dev/" + "url": "/docs/dev/" }, { "name": "1.4 (stable)", "version": "1.4 (stable)", - "url": "docs/" + "url": "/docs/" }, { "name": "1.4", "version": "1.4", - "url": "pandas-docs/version/1.4/" + "url": "/pandas-docs/version/1.4/" }, { "name": "1.3", "version": "1.3", - "url": "pandas-docs/version/1.3/" + "url": "/pandas-docs/version/1.3/" }, { "name": "1.2", "version": "1.2", - "url": "pandas-docs/version/1.2/" + "url": "/pandas-docs/version/1.2/" }, { "name": "1.1", "version": "1.1", - "url": "pandas-docs/version/1.1/" + "url": "/pandas-docs/version/1.1/" }, { "name": "1.0", "version": "1.0", - "url": "pandas-docs/version/1.0/" + "url": "/pandas-docs/version/1.0/" } ] From 8bfd44bb618a688157fde91d5243904d430a3459 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Tue, 13 Sep 2022 17:47:37 +0200 Subject: [PATCH 6/9] Update doc/source/conf.py Co-authored-by: Marc Garcia --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 5676fdb23e69d..1a4c2011fdda4 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,7 +244,7 @@ "google_analytics_id": "UA-27880019-2", "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { - "json_url": "https://pandas.pydata.org/versions.json", + "json_url": "/versions.json", "version_match": switcher_version, }, } From b76f51367958a60cb298413e8b5222b7825fd38d Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Tue, 13 Sep 2022 18:06:31 +0200 Subject: [PATCH 7/9] Update doc/source/conf.py Co-authored-by: Marc Garcia --- doc/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 1a4c2011fdda4..0f07d8b2ddb3c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -242,6 +242,7 @@ "github_url": "https://github.com/pandas-dev/pandas", "twitter_url": "https://twitter.com/pandas_dev", "google_analytics_id": "UA-27880019-2", + "logo": {"image_dark": "../../web/pandas/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { "json_url": "/versions.json", From 80e25a56ee28b1a3e0095372c3752543967bd050 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Tue, 13 Sep 2022 18:56:58 +0200 Subject: [PATCH 8/9] Fix --- doc/source/_static/pandas_white.svg | 1 + doc/source/conf.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 doc/source/_static/pandas_white.svg diff --git a/doc/source/_static/pandas_white.svg b/doc/source/_static/pandas_white.svg new file mode 100644 index 0000000000000..bc7c41651182d --- /dev/null +++ b/doc/source/_static/pandas_white.svg @@ -0,0 +1 @@ +Artboard 63 copy 2 \ No newline at end of file diff --git a/doc/source/conf.py b/doc/source/conf.py index 0f07d8b2ddb3c..26e555e5dd1c9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -242,7 +242,7 @@ "github_url": "https://github.com/pandas-dev/pandas", "twitter_url": "https://twitter.com/pandas_dev", "google_analytics_id": "UA-27880019-2", - "logo": {"image_dark": "../../web/pandas/static/img/pandas_white.svg"}, + "logo": {"image_dark": "pandas_white.svg"}, "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { "json_url": "/versions.json", From 2c01cc41b9c833b30c082ebe0bfec9eb2e0f51a1 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Thu, 15 Sep 2022 17:20:42 +0200 Subject: [PATCH 9/9] Try url --- doc/source/_static/pandas_white.svg | 1 - doc/source/conf.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 doc/source/_static/pandas_white.svg diff --git a/doc/source/_static/pandas_white.svg b/doc/source/_static/pandas_white.svg deleted file mode 100644 index bc7c41651182d..0000000000000 --- a/doc/source/_static/pandas_white.svg +++ /dev/null @@ -1 +0,0 @@ -Artboard 63 copy 2 \ No newline at end of file diff --git a/doc/source/conf.py b/doc/source/conf.py index 26e555e5dd1c9..fa4b306fc50b8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -242,7 +242,7 @@ "github_url": "https://github.com/pandas-dev/pandas", "twitter_url": "https://twitter.com/pandas_dev", "google_analytics_id": "UA-27880019-2", - "logo": {"image_dark": "pandas_white.svg"}, + "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "navbar-icon-links"], "switcher": { "json_url": "/versions.json",