From f9f470ef04fcda831308dfa69bbeb1d20fc32d8e Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 27 Aug 2021 13:32:17 +0200 Subject: [PATCH 01/18] DOC: migrate from sphinx-panels to sphinx-design --- doc/source/_static/css/pandas.css | 23 ++----- doc/source/conf.py | 3 +- doc/source/index.rst.template | 107 ++++++++++++++++-------------- 3 files changed, 66 insertions(+), 67 deletions(-) diff --git a/doc/source/_static/css/pandas.css b/doc/source/_static/css/pandas.css index 452c7d20ff5df..13d169a5497ca 100644 --- a/doc/source/_static/css/pandas.css +++ b/doc/source/_static/css/pandas.css @@ -8,36 +8,25 @@ /* Main index page overview cards */ .intro-card { - background: #fff; - border-radius: 0; padding: 30px 10px 20px 10px; - margin: 10px 0px; } -.intro-card p.card-text { - margin: 0px; -} - -.intro-card .card-img-top { +.intro-card .sd-card-img-top { margin: 10px; height: 52px; } -.intro-card .card-header { - border: none; - background-color:white; - color: #150458 !important; +.intro-card .sd-card-title { + color: rgb(var(--pst-color-h1)) !important; font-size: var(--pst-font-size-h5); - font-weight: bold; - padding: 2.5rem 0rem 0.5rem 0rem; + padding: 1rem 0rem 0.5rem 0rem; } -.intro-card .card-footer { +.intro-card .sd-card-footer { border: none; - background-color:white; } -.intro-card .card-footer p.card-text{ +.intro-card .sd-card-footer p.sd-card-text{ max-width: 220px; margin-left: auto; margin-right: auto; diff --git a/doc/source/conf.py b/doc/source/conf.py index 184bdcfd39bf6..0b99da1e328d9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -65,7 +65,8 @@ "sphinx.ext.ifconfig", "sphinx.ext.linkcode", "nbsphinx", - "sphinx_panels", + # "sphinx_panels", + "sphinx_design", "contributors", # custom pandas extension ] diff --git a/doc/source/index.rst.template b/doc/source/index.rst.template index 3b440122c2b97..fb84546741639 100644 --- a/doc/source/index.rst.template +++ b/doc/source/index.rst.template @@ -26,75 +26,84 @@ pandas documentation easy-to-use data structures and data analysis tools for the `Python `__ programming language. -.. panels:: - :card: + intro-card text-center - :column: col-lg-6 col-md-6 col-sm-6 col-xs-12 d-flex +.. grid:: 1 2 2 2 + :gutter: 4 + :padding: 2 2 0 0 + :class-container: sd-text-center - --- - :img-top: _static/index_getting_started.svg + .. grid-item-card:: Getting started + :img-top: _static/index_getting_started.svg + :class-card: intro-card + :shadow: md - Getting started - ^^^^^^^^^^^^^^^ + New to *pandas*? Check out the getting started guides. They contain an + introduction to *pandas'* main concepts and links to additional tutorials. - New to *pandas*? Check out the getting started guides. They contain an - introduction to *pandas'* main concepts and links to additional tutorials. + +++ - +++ + .. button-ref:: getting_started + :ref-type: ref + :click-parent: + :color: secondary + :expand: - .. link-button:: getting_started - :type: ref - :text: To the getting started guides - :classes: btn-block btn-secondary stretched-link + To the getting started guides - --- - :img-top: _static/index_user_guide.svg + .. grid-item-card:: User guide + :img-top: _static/index_user_guide.svg + :class-card: intro-card + :shadow: md - User guide - ^^^^^^^^^^ + The user guide provides in-depth information on the + key concepts of pandas with useful background information and explanation. - The user guide provides in-depth information on the - key concepts of pandas with useful background information and explanation. + +++ - +++ + .. button-ref:: user_guide + :ref-type: ref + :click-parent: + :color: secondary + :expand: - .. link-button:: user_guide - :type: ref - :text: To the user guide - :classes: btn-block btn-secondary stretched-link + To the user guide - --- - :img-top: _static/index_api.svg + .. grid-item-card:: API reference + :img-top: _static/index_api.svg + :class-card: intro-card + :shadow: md - API reference - ^^^^^^^^^^^^^ + The reference guide contains a detailed description of + the pandas API. The reference describes how the methods work and which parameters can + be used. It assumes that you have an understanding of the key concepts. - The reference guide contains a detailed description of - the pandas API. The reference describes how the methods work and which parameters can - be used. It assumes that you have an understanding of the key concepts. + +++ - +++ + .. button-ref:: api + :ref-type: ref + :click-parent: + :color: secondary + :expand: - .. link-button:: api - :type: ref - :text: To the reference guide - :classes: btn-block btn-secondary stretched-link + To the reference guide - --- - :img-top: _static/index_contribute.svg + .. grid-item-card:: Developer guide + :img-top: _static/index_contribute.svg + :class-card: intro-card + :shadow: md - Developer guide - ^^^^^^^^^^^^^^^ + Saw a typo in the documentation? Want to improve + existing functionalities? The contributing guidelines will guide + you through the process of improving pandas. - Saw a typo in the documentation? Want to improve - existing functionalities? The contributing guidelines will guide - you through the process of improving pandas. + +++ - +++ + .. button-ref:: development + :ref-type: ref + :click-parent: + :color: secondary + :expand: - .. link-button:: development - :type: ref - :text: To the development guide - :classes: btn-block btn-secondary stretched-link + To the development guide {% if single_doc and single_doc.endswith('.rst') -%} From 344201d0e2c9f4586751b9609a833d67f0b3e2cd Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 2 Dec 2022 21:23:20 +0100 Subject: [PATCH 02/18] update css for latest pydata-sphinx-theme --- doc/source/_static/css/pandas.css | 14 ++++++++++++-- doc/source/index.rst.template | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/source/_static/css/pandas.css b/doc/source/_static/css/pandas.css index 8d0a4f991d7b0..435416b35b8b5 100644 --- a/doc/source/_static/css/pandas.css +++ b/doc/source/_static/css/pandas.css @@ -27,15 +27,25 @@ table { } .intro-card .sd-card-footer { - border: none; + border: none !important; } -.intro-card .sd-card-footer p.sd-card-text{ +.intro-card .sd-card-footer p.sd-card-text { max-width: 220px; margin-left: auto; margin-right: auto; } +.intro-card .sd-btn-secondary { + background-color: #6c757d !important; + border-color: #6c757d !important; +} + +.intro-card .sd-btn-secondary:hover { + background-color: #5a6268 !important; + border-color: #545b62 !important; +} + .card, .card img { background-color: transparent !important; } diff --git a/doc/source/index.rst.template b/doc/source/index.rst.template index 67cfb7db05006..8a72df0661fe4 100644 --- a/doc/source/index.rst.template +++ b/doc/source/index.rst.template @@ -26,7 +26,7 @@ pandas documentation easy-to-use data structures and data analysis tools for the `Python `__ programming language. -{% if not single_doc -%} +{% if not single_doc or single_doc == "index.rst" -%} .. grid:: 1 2 2 2 :gutter: 4 :padding: 2 2 0 0 From 4e3f51d5a6ff0bc44d6c982db5b4a98839a5abc9 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 2 Dec 2022 21:24:17 +0100 Subject: [PATCH 03/18] add sphinx-design to env --- doc/source/conf.py | 2 +- environment.yml | 1 + requirements-dev.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index d577d0f633122..2bde36f2dcf79 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -56,7 +56,7 @@ "matplotlib.sphinxext.plot_directive", "numpydoc", "sphinx_copybutton", - # "sphinx_panels", + "sphinx_panels", "sphinx_design", "sphinx_toggleprompt", "sphinx.ext.autodoc", diff --git a/environment.yml b/environment.yml index 1a02b522fab06..85d0c5afb76f3 100644 --- a/environment.yml +++ b/environment.yml @@ -105,6 +105,7 @@ dependencies: - pytest-cython # doctest - sphinx - sphinx-panels + - sphinx-design - sphinx-copybutton - types-python-dateutil - types-PyMySQL diff --git a/requirements-dev.txt b/requirements-dev.txt index 19ed830eca07e..f9bdf751f9f78 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -80,6 +80,7 @@ pydata-sphinx-theme<0.11 pytest-cython sphinx sphinx-panels +sphinx-design sphinx-copybutton types-python-dateutil types-PyMySQL From be156b97f60cba573b6107b6f76453b207616c1c Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 2 Dec 2022 21:43:30 +0100 Subject: [PATCH 04/18] further fix css --- doc/source/_static/css/pandas.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/_static/css/pandas.css b/doc/source/_static/css/pandas.css index 435416b35b8b5..c856dc5560242 100644 --- a/doc/source/_static/css/pandas.css +++ b/doc/source/_static/css/pandas.css @@ -21,7 +21,7 @@ table { } .intro-card .sd-card-title { - color: rgb(var(--pst-color-h1)) !important; + color: var(--pst-color-primary); font-size: var(--pst-font-size-h5); padding: 1rem 0rem 0.5rem 0rem; } From 92df06b12e18f3cf3e0315d7f30c893ade1177bc Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:01:21 -0700 Subject: [PATCH 05/18] Convert panels to grid, address warning, remove panel dependency --- doc/source/conf.py | 7 +- doc/source/getting_started/index.rst | 199 +++++++++++++++------------ environment.yml | 1 - requirements-dev.txt | 1 - 4 files changed, 113 insertions(+), 95 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index f4d21e1db2a6b..4940ed7148955 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -56,7 +56,6 @@ "matplotlib.sphinxext.plot_directive", "numpydoc", "sphinx_copybutton", - "sphinx_panels", "sphinx_design", "sphinx_toggleprompt", "sphinx.ext.autodoc", @@ -144,10 +143,6 @@ # nbsphinx do not use requirejs (breaks bootstrap) nbsphinx_requirejs_path = "" -# sphinx-panels shouldn't add bootstrap css since the pydata-sphinx-theme -# already loads it -panels_add_bootstrap_css = False - # https://sphinx-toggleprompt.readthedocs.io/en/stable/#offset toggleprompt_offset_right = 35 @@ -461,7 +456,7 @@ # extlinks alias extlinks = { - "issue": ("https://github.com/pandas-dev/pandas/issues/%s", "GH"), + "issue": ("https://github.com/pandas-dev/pandas/issues/%s", "GH %s"), } diff --git a/doc/source/getting_started/index.rst b/doc/source/getting_started/index.rst index d344c0750b73d..2d4fa4cedddae 100644 --- a/doc/source/getting_started/index.rst +++ b/doc/source/getting_started/index.rst @@ -9,48 +9,52 @@ Getting started Installation ------------ -.. panels:: - :card: + install-card - :column: col-lg-6 col-md-6 col-sm-12 col-xs-12 p-3 +.. grid:: 1 2 2 2 + :gutter: 4 - Working with conda? - ^^^^^^^^^^^^^^^^^^^ + .. grid-item-card:: Working with conda? + :class-card: install-card + :column: 12 12 6 6 + :padding: 3 - pandas is part of the `Anaconda `__ - distribution and can be installed with Anaconda or Miniconda: + pandas is part of the `Anaconda `__ + distribution and can be installed with Anaconda or Miniconda: - ++++++++++++++++++++++ + ++++++++++++++++++++++ - .. code-block:: bash + .. code-block:: bash - conda install pandas + conda install pandas - --- + .. grid-item-card:: Prefer pip? + :class-card: install-card + :column: 12 12 6 6 + :padding: 3 - Prefer pip? - ^^^^^^^^^^^ + pandas can be installed via pip from `PyPI `__. - pandas can be installed via pip from `PyPI `__. + ++++ - ++++ + .. code-block:: bash - .. code-block:: bash + pip install pandas - pip install pandas + .. grid-item-card:: In-depth instructions? + :class-card: install-card + :column: 12 + :padding: 3 - --- - :column: col-12 p-3 - In-depth instructions? - ^^^^^^^^^^^^^^^^^^^^^^ + Installing a specific version? Installing from source? Check the advanced + installation page. - Installing a specific version? Installing from source? Check the advanced - installation page. + .. button-ref:: install + :ref-type: ref + :click-parent: + :color: secondary + :expand: - .. link-button:: ./install.html - :type: url - :text: Learn more - :classes: btn-secondary stretched-link + Learn more .. _gentle_intro: @@ -536,90 +540,111 @@ Coming from... Are you familiar with other software for manipulating tabular data? Learn the pandas-equivalent operations compared to software you already know: -.. panels:: - :img-top-cls: dark-light - :card: + comparison-card text-center shadow - :column: col-lg-6 col-md-6 col-sm-6 col-xs-12 d-flex +.. grid:: 1 2 2 2 + :gutter: 4 + :class-container: sd-text-center sd-d-inline-flex - --- - :card: + comparison-card-r - :img-top: ../_static/logo_r.svg + .. grid-item-card:: + :img-top: ../_static/logo_r.svg + :column: 12 6 6 6 + :class-card: comparison-card-r + :shadow: md - The `R programming language `__ provides the - ``data.frame`` data structure and multiple packages, such as - `tidyverse `__ use and extend ``data.frame`` - for convenient data handling functionalities similar to pandas. + The `R programming language `__ provides the + ``data.frame`` data structure and multiple packages, such as + `tidyverse `__ use and extend ``data.frame`` + for convenient data handling functionalities similar to pandas. - +++ + +++ - .. link-button:: compare_with_r - :type: ref - :text: Learn more - :classes: btn-secondary stretched-link + .. button-ref:: compare_with_r + :ref-type: ref + :click-parent: + :color: secondary + :expand: + Learn more - --- - :card: + comparison-card-sql - :img-top: ../_static/logo_sql.svg - Already familiar to ``SELECT``, ``GROUP BY``, ``JOIN``, etc.? - Most of these SQL manipulations do have equivalents in pandas. + .. grid-item-card:: + :img-top: ../_static/logo_sql.svg + :column: 12 6 6 6 + :class-card: comparison-card-sql + :shadow: md - +++ + Already familiar to ``SELECT``, ``GROUP BY``, ``JOIN``, etc.? + Most of these SQL manipulations do have equivalents in pandas. - .. link-button:: compare_with_sql - :type: ref - :text: Learn more - :classes: btn-secondary stretched-link + +++ + .. button-ref:: compare_with_sql + :ref-type: ref + :click-parent: + :color: secondary + :expand: - --- - :card: + comparison-card-stata - :img-top: ../_static/logo_stata.svg + Learn more - The ``data set`` included in the `STATA `__ - statistical software suite corresponds to the pandas ``DataFrame``. - Many of the operations known from STATA have an equivalent in pandas. + .. grid-item-card:: + :img-top: ../_static/logo_stata.svg + :column: 12 6 6 6 + :class-card: comparison-card-stata + :shadow: md - +++ + The ``data set`` included in the `STATA `__ + statistical software suite corresponds to the pandas ``DataFrame``. + Many of the operations known from STATA have an equivalent in pandas. - .. link-button:: compare_with_stata - :type: ref - :text: Learn more - :classes: btn-secondary stretched-link + +++ + .. button-ref:: compare_with_stata + :ref-type: ref + :click-parent: + :color: secondary + :expand: - --- - :card: + comparison-card-excel - :img-top: ../_static/spreadsheets/logo_excel.svg + Learn more - Users of `Excel `__ - or other spreadsheet programs will find that many of the concepts are - transferrable to pandas. + .. grid-item-card:: + :img-top: ../_static/spreadsheets/logo_excel.svg + :column: 12 6 6 6 + :class-card: comparison-card-excel + :shadow: md - +++ + Users of `Excel `__ + or other spreadsheet programs will find that many of the concepts are + transferrable to pandas. - .. link-button:: compare_with_spreadsheets - :type: ref - :text: Learn more - :classes: btn-secondary stretched-link + +++ + .. button-ref:: compare_with_spreadsheets + :ref-type: ref + :click-parent: + :color: secondary + :expand: - --- - :card: + comparison-card-sas - :img-top: ../_static/logo_sas.svg + Learn more - The `SAS `__ statistical software suite - also provides the ``data set`` corresponding to the pandas ``DataFrame``. - Also SAS vectorized operations, filtering, string processing operations, - and more have similar functions in pandas. + .. grid-item-card:: + :img-top: ../_static/logo_sas.svg + :column: 12 6 6 6 + :class-card: comparison-card-sas + :shadow: md - +++ + The `SAS `__ statistical software suite + also provides the ``data set`` corresponding to the pandas ``DataFrame``. + Also SAS vectorized operations, filtering, string processing operations, + and more have similar functions in pandas. - .. link-button:: compare_with_sas - :type: ref - :text: Learn more - :classes: btn-secondary stretched-link + +++ + + .. button-ref:: compare_with_sas + :ref-type: ref + :click-parent: + :color: secondary + :expand: + + Learn more Tutorials diff --git a/environment.yml b/environment.yml index 802c691cd6be7..86272b9f325ca 100644 --- a/environment.yml +++ b/environment.yml @@ -90,7 +90,6 @@ dependencies: - pydata-sphinx-theme<0.11 - pytest-cython # doctest - sphinx - - sphinx-panels - sphinx-design - sphinx-copybutton - types-python-dateutil diff --git a/requirements-dev.txt b/requirements-dev.txt index 25264761476b7..4d5e1fda40680 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -65,7 +65,6 @@ numpydoc pydata-sphinx-theme<0.11 pytest-cython sphinx -sphinx-panels sphinx-design sphinx-copybutton types-python-dateutil From 3090553347e768599666fdc4f83f68e3fd7eb6d1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 27 Apr 2023 15:17:23 -0700 Subject: [PATCH 06/18] Try addressing failures --- doc/source/getting_started/index.rst | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/source/getting_started/index.rst b/doc/source/getting_started/index.rst index 2d4fa4cedddae..e604817cee2a7 100644 --- a/doc/source/getting_started/index.rst +++ b/doc/source/getting_started/index.rst @@ -14,7 +14,7 @@ Installation .. grid-item-card:: Working with conda? :class-card: install-card - :column: 12 12 6 6 + :columns: 12 12 6 6 :padding: 3 pandas is part of the `Anaconda `__ @@ -28,7 +28,7 @@ Installation .. grid-item-card:: Prefer pip? :class-card: install-card - :column: 12 12 6 6 + :columns: 12 12 6 6 :padding: 3 pandas can be installed via pip from `PyPI `__. @@ -41,13 +41,14 @@ Installation .. grid-item-card:: In-depth instructions? :class-card: install-card - :column: 12 + :columns: 12 :padding: 3 - Installing a specific version? Installing from source? Check the advanced installation page. + +++ + .. button-ref:: install :ref-type: ref :click-parent: @@ -546,7 +547,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_r.svg - :column: 12 6 6 6 + :columns: 12 6 6 6 :class-card: comparison-card-r :shadow: md @@ -565,10 +566,9 @@ the pandas-equivalent operations compared to software you already know: Learn more - .. grid-item-card:: :img-top: ../_static/logo_sql.svg - :column: 12 6 6 6 + :columns: 12 6 6 6 :class-card: comparison-card-sql :shadow: md @@ -587,7 +587,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_stata.svg - :column: 12 6 6 6 + :columns: 12 6 6 6 :class-card: comparison-card-stata :shadow: md @@ -607,7 +607,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/spreadsheets/logo_excel.svg - :column: 12 6 6 6 + :columns: 12 6 6 6 :class-card: comparison-card-excel :shadow: md @@ -627,7 +627,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_sas.svg - :column: 12 6 6 6 + :columns: 12 6 6 6 :class-card: comparison-card-sas :shadow: md @@ -646,7 +646,6 @@ the pandas-equivalent operations compared to software you already know: Learn more - Tutorials --------- From 31db3e1867ced6c484af3765ff28e53adcf629cd Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 27 Apr 2023 18:03:54 -0700 Subject: [PATCH 07/18] Fix css --- doc/source/_static/css/getting_started.css | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/source/_static/css/getting_started.css b/doc/source/_static/css/getting_started.css index e4c5964259349..14e0dba8280f4 100644 --- a/doc/source/_static/css/getting_started.css +++ b/doc/source/_static/css/getting_started.css @@ -138,13 +138,24 @@ ul.task-bullet > li > p:first-child { margin: 0px; } -.comparison-card .card-img-top { +.comparison-card .sd-card-img-top { margin: 10px; margin-bottom: 20px; height: 72px; background: none !important; } +.comparison-card .sd-btn-secondary { + background-color: #6c757d !important; + border-color: #6c757d !important; +} + +.comparison-card .intro-card .sd-btn-secondary:hover { + background-color: #5a6268 !important; + border-color: #545b62 !important; +} + + .comparison-card-excel .card-img-top, .comparison-card-stata .card-img-top, .comparison-card-sas .card-img-top { height: 52px; } @@ -178,6 +189,16 @@ ul.task-bullet > li > p:first-child { margin: 0 1em 1em 1em; } +.install-card .sd-btn-secondary { + background-color: #6c757d !important; + border-color: #6c757d !important; +} + +.install-card .intro-card .sd-btn-secondary:hover { + background-color: #5a6268 !important; + border-color: #545b62 !important; +} + .custom-button { background-color:#DCDCDC; border: none; From 0bb740d188cb007ae0f5439d6787447830bf754e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 27 Apr 2023 19:44:00 -0700 Subject: [PATCH 08/18] Fix more css --- doc/source/_static/css/getting_started.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/_static/css/getting_started.css b/doc/source/_static/css/getting_started.css index 14e0dba8280f4..4a73cdcaa206f 100644 --- a/doc/source/_static/css/getting_started.css +++ b/doc/source/_static/css/getting_started.css @@ -150,13 +150,13 @@ ul.task-bullet > li > p:first-child { border-color: #6c757d !important; } -.comparison-card .intro-card .sd-btn-secondary:hover { +.comparison-card .sd-btn-secondary:hover { background-color: #5a6268 !important; border-color: #545b62 !important; } -.comparison-card-excel .card-img-top, .comparison-card-stata .card-img-top, .comparison-card-sas .card-img-top { +.comparison-card-excel .sd-card-img-top, .comparison-card-stata .sd-card-img-top, .comparison-card-sas .sd-card-img-top { height: 52px; } @@ -194,7 +194,7 @@ ul.task-bullet > li > p:first-child { border-color: #6c757d !important; } -.install-card .intro-card .sd-btn-secondary:hover { +.install-card .sd-btn-secondary:hover { background-color: #5a6268 !important; border-color: #545b62 !important; } From 823ca9715ddc6d5dc8111263750265f9f890d061 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Fri, 28 Apr 2023 09:48:27 -0700 Subject: [PATCH 09/18] Just use one comparison card class --- doc/source/_static/css/getting_started.css | 7 +------ doc/source/getting_started/index.rst | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/source/_static/css/getting_started.css b/doc/source/_static/css/getting_started.css index 4a73cdcaa206f..0d53bbde94ae3 100644 --- a/doc/source/_static/css/getting_started.css +++ b/doc/source/_static/css/getting_started.css @@ -141,7 +141,7 @@ ul.task-bullet > li > p:first-child { .comparison-card .sd-card-img-top { margin: 10px; margin-bottom: 20px; - height: 72px; + height: 52px; background: none !important; } @@ -155,11 +155,6 @@ ul.task-bullet > li > p:first-child { border-color: #545b62 !important; } - -.comparison-card-excel .sd-card-img-top, .comparison-card-stata .sd-card-img-top, .comparison-card-sas .sd-card-img-top { - height: 52px; -} - .comparison-card .card-footer { border: none; background-color: var(--pst-color-background); diff --git a/doc/source/getting_started/index.rst b/doc/source/getting_started/index.rst index e604817cee2a7..250fa37a84619 100644 --- a/doc/source/getting_started/index.rst +++ b/doc/source/getting_started/index.rst @@ -548,7 +548,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_r.svg :columns: 12 6 6 6 - :class-card: comparison-card-r + :class-card: comparison-card :shadow: md The `R programming language `__ provides the @@ -569,7 +569,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_sql.svg :columns: 12 6 6 6 - :class-card: comparison-card-sql + :class-card: comparison-card :shadow: md Already familiar to ``SELECT``, ``GROUP BY``, ``JOIN``, etc.? @@ -588,7 +588,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_stata.svg :columns: 12 6 6 6 - :class-card: comparison-card-stata + :class-card: comparison-card :shadow: md The ``data set`` included in the `STATA `__ @@ -608,7 +608,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/spreadsheets/logo_excel.svg :columns: 12 6 6 6 - :class-card: comparison-card-excel + :class-card: comparison-card :shadow: md Users of `Excel `__ @@ -628,7 +628,7 @@ the pandas-equivalent operations compared to software you already know: .. grid-item-card:: :img-top: ../_static/logo_sas.svg :columns: 12 6 6 6 - :class-card: comparison-card-sas + :class-card: comparison-card :shadow: md The `SAS `__ statistical software suite From 0bcd79d252ca31f9b691cf7ea2913b08cbbc2d21 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:22:00 -0700 Subject: [PATCH 10/18] Unpin pydata-sphinx-theme --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 86272b9f325ca..fffd5faf731b7 100644 --- a/environment.yml +++ b/environment.yml @@ -87,7 +87,7 @@ dependencies: - gitdb - natsort # DataFrame.sort_values doctest - numpydoc - - pydata-sphinx-theme<0.11 + - pydata-sphinx-theme - pytest-cython # doctest - sphinx - sphinx-design diff --git a/requirements-dev.txt b/requirements-dev.txt index 4d5e1fda40680..16e8629d0e706 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -62,7 +62,7 @@ gitpython gitdb natsort numpydoc -pydata-sphinx-theme<0.11 +pydata-sphinx-theme pytest-cython sphinx sphinx-design From dbdfc389baa0044009d2dea542ff06228af75a2e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:23:19 -0700 Subject: [PATCH 11/18] Uncomment other workflows --- .github/workflows/code-checks.yml | 5 +++++ .github/workflows/unit-tests.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index ab8f873e9b70b..397747932761c 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -19,6 +19,7 @@ permissions: jobs: pre_commit: + if: false name: pre-commit runs-on: ubuntu-22.04 concurrency: @@ -40,6 +41,7 @@ jobs: extra_args: --verbose --all-files docstring_typing_manual_hooks: + if: false name: Docstring validation, typing, and other manual pre-commit hooks runs-on: ubuntu-22.04 defaults: @@ -103,6 +105,7 @@ jobs: if: ${{ steps.build.outcome == 'success' && always() }} asv-benchmarks: + if: false name: ASV Benchmarks runs-on: ubuntu-22.04 defaults: @@ -134,6 +137,7 @@ jobs: asv run --quick --dry-run --strict --durations=30 --python=same build_docker_dev_environment: + if: false name: Build Docker Dev Environment runs-on: ubuntu-22.04 defaults: @@ -161,6 +165,7 @@ jobs: run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())" requirements-dev-text-installable: + if: false name: Test install requirements-dev.txt runs-on: ubuntu-22.04 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 69baa3ccd6f34..f8ee5582597eb 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -22,6 +22,7 @@ defaults: jobs: ubuntu: + if: false runs-on: ubuntu-22.04 timeout-minutes: 180 strategy: @@ -169,6 +170,7 @@ jobs: if: ${{ matrix.pattern == '' && (always() && steps.build.outcome == 'success')}} macos-windows: + if: false timeout-minutes: 180 strategy: matrix: @@ -206,6 +208,7 @@ jobs: uses: ./.github/actions/run-tests Linux-32-bit: + if: false runs-on: ubuntu-22.04 container: image: quay.io/pypa/manylinux2014_i686 From 28dae97d4af5040c31901f238c56b2cc5664492d Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:23:12 -0700 Subject: [PATCH 12/18] address some warnings --- {web/pandas => doc/source/_static}/versions.json | 16 ++++++++-------- doc/source/conf.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) rename {web/pandas => doc/source/_static}/versions.json (55%) diff --git a/web/pandas/versions.json b/doc/source/_static/versions.json similarity index 55% rename from web/pandas/versions.json rename to doc/source/_static/versions.json index 81021e5a7c72f..ef03a02713886 100644 --- a/web/pandas/versions.json +++ b/doc/source/_static/versions.json @@ -2,41 +2,41 @@ { "name": "dev", "version": "docs/dev", - "url": "/docs/dev/" + "url": "https://pandas.pydata.org/docs/dev/" }, { "name": "2.0 (stable)", "version": "docs", - "url": "/docs/" + "url": "https://pandas.pydata.org/docs/" }, { "name": "1.5", "version": "pandas-docs/version/1.5", - "url": "/pandas-docs/version/1.5/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.5/" }, { "name": "1.4", "version": "pandas-docs/version/1.4", - "url": "/pandas-docs/version/1.4/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.4/" }, { "name": "1.3", "version": "pandas-docs/version/1.3", - "url": "/pandas-docs/version/1.3/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.3/" }, { "name": "1.2", "version": "pandas-docs/version/1.2", - "url": "/pandas-docs/version/1.2/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.2/" }, { "name": "1.1", "version": "pandas-docs/version/1.1", - "url": "/pandas-docs/version/1.1/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.1/" }, { "name": "1.0", "version": "pandas-docs/version/1.0", - "url": "/pandas-docs/version/1.0/" + "url": "https://pandas.pydata.org/pandas-docs/version/1.0/" } ] diff --git a/doc/source/conf.py b/doc/source/conf.py index 4940ed7148955..81a3ab94c01ab 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -237,10 +237,10 @@ html_theme_options = { "external_links": [], - "footer_items": ["pandas_footer", "sphinx-version"], + "footer_start": ["pandas_footer", "sphinx-version"], "github_url": "https://github.com/pandas-dev/pandas", "twitter_url": "https://twitter.com/pandas_dev", - "google_analytics_id": "UA-27880019-2", + "analytics": {"google_analytics_id": "UA-27880019-2"}, "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "switcher": { From bd210bc952254431de03720a70197492e7171a02 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 1 May 2023 16:46:46 -0700 Subject: [PATCH 13/18] Revert "Uncomment other workflows" This reverts commit dbdfc389baa0044009d2dea542ff06228af75a2e. --- .github/workflows/code-checks.yml | 5 ----- .github/workflows/unit-tests.yml | 3 --- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 397747932761c..ab8f873e9b70b 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -19,7 +19,6 @@ permissions: jobs: pre_commit: - if: false name: pre-commit runs-on: ubuntu-22.04 concurrency: @@ -41,7 +40,6 @@ jobs: extra_args: --verbose --all-files docstring_typing_manual_hooks: - if: false name: Docstring validation, typing, and other manual pre-commit hooks runs-on: ubuntu-22.04 defaults: @@ -105,7 +103,6 @@ jobs: if: ${{ steps.build.outcome == 'success' && always() }} asv-benchmarks: - if: false name: ASV Benchmarks runs-on: ubuntu-22.04 defaults: @@ -137,7 +134,6 @@ jobs: asv run --quick --dry-run --strict --durations=30 --python=same build_docker_dev_environment: - if: false name: Build Docker Dev Environment runs-on: ubuntu-22.04 defaults: @@ -165,7 +161,6 @@ jobs: run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())" requirements-dev-text-installable: - if: false name: Test install requirements-dev.txt runs-on: ubuntu-22.04 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index c34f3ea6e2f77..553d3e7d568a1 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -22,7 +22,6 @@ defaults: jobs: ubuntu: - if: false runs-on: ubuntu-22.04 timeout-minutes: 180 strategy: @@ -170,7 +169,6 @@ jobs: if: ${{ matrix.pattern == '' && (always() && steps.build.outcome == 'success')}} macos-windows: - if: false timeout-minutes: 180 strategy: matrix: @@ -208,7 +206,6 @@ jobs: uses: ./.github/actions/run-tests Linux-32-bit: - if: false runs-on: ubuntu-22.04 container: image: quay.io/pypa/manylinux2014_i686 From 92bb29e3398cce2900bae452cb36cd8c4a0457cb Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 1 May 2023 18:40:04 -0700 Subject: [PATCH 14/18] Change bath to json_url --- 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 3d373e1724929..42cbcea59971a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,7 +244,7 @@ "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "switcher": { - "json_url": "/versions.json", + "json_url": "https://pandas.pydata.org/docs/_static/version_switcher.json", "version_match": switcher_version, }, "icon_links": [ From d0aea289231a04f1a97b1f78da0696ebfdf253cc Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 2 May 2023 10:15:11 -0700 Subject: [PATCH 15/18] Change back to path --- doc/source/conf.py | 2 +- doc/source/{_static => }/versions.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/source/{_static => }/versions.json (100%) diff --git a/doc/source/conf.py b/doc/source/conf.py index 42cbcea59971a..3d373e1724929 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,7 +244,7 @@ "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "switcher": { - "json_url": "https://pandas.pydata.org/docs/_static/version_switcher.json", + "json_url": "/versions.json", "version_match": switcher_version, }, "icon_links": [ diff --git a/doc/source/_static/versions.json b/doc/source/versions.json similarity index 100% rename from doc/source/_static/versions.json rename to doc/source/versions.json From c7a1eff1a770c6df9e28e28b53742afef71761d0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 2 May 2023 12:53:31 -0700 Subject: [PATCH 16/18] No / --- 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 3d373e1724929..376235e0d49eb 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,7 +244,7 @@ "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "switcher": { - "json_url": "/versions.json", + "json_url": "versions.json", "version_match": switcher_version, }, "icon_links": [ From be96762949f4aae61f52a69e44de47284086822f Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 3 May 2023 10:22:23 -0700 Subject: [PATCH 17/18] Change version --- doc/source/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/versions.json b/doc/source/versions.json index ef03a02713886..4be8f10a88334 100644 --- a/doc/source/versions.json +++ b/doc/source/versions.json @@ -1,42 +1,42 @@ [ { "name": "dev", - "version": "docs/dev", + "version": "dev", "url": "https://pandas.pydata.org/docs/dev/" }, { "name": "2.0 (stable)", - "version": "docs", + "version": "2.0", "url": "https://pandas.pydata.org/docs/" }, { "name": "1.5", - "version": "pandas-docs/version/1.5", + "version": "1.5", "url": "https://pandas.pydata.org/pandas-docs/version/1.5/" }, { "name": "1.4", - "version": "pandas-docs/version/1.4", + "version": "1.4", "url": "https://pandas.pydata.org/pandas-docs/version/1.4/" }, { "name": "1.3", - "version": "pandas-docs/version/1.3", + "version": "1.3", "url": "https://pandas.pydata.org/pandas-docs/version/1.3/" }, { "name": "1.2", - "version": "pandas-docs/version/1.2", + "version": "1.2", "url": "https://pandas.pydata.org/pandas-docs/version/1.2/" }, { "name": "1.1", - "version": "pandas-docs/version/1.1", + "version": "1.1", "url": "https://pandas.pydata.org/pandas-docs/version/1.1/" }, { "name": "1.0", - "version": "pandas-docs/version/1.0", + "version": "1.0", "url": "https://pandas.pydata.org/pandas-docs/version/1.0/" } ] From 3e9cbb039ccdea87dcd27df6db0b14dc542823d7 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 3 May 2023 16:38:02 -0700 Subject: [PATCH 18/18] 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 376235e0d49eb..d2245dd476c20 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -244,7 +244,7 @@ "logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"}, "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "switcher": { - "json_url": "versions.json", + "json_url": "https://pandas.pydata.org/versions.json", "version_match": switcher_version, }, "icon_links": [