Merge pull request #171 from pandas-dev/master

Sync Fork from Upstream Repo

Author: sthagen

.pre-commit-config.yaml

@@ -69,6 +69,7 @@ repos:
     rev: v1.2.2
     hooks:
     -   id: yesqa
+        additional_dependencies: [flake8==3.9.0]
 -   repo: local
     hooks:
     -   id: flake8-rst
@@ -164,6 +165,13 @@ repos:
         files: ^(environment.yml|requirements-dev.txt)$
         pass_filenames: false
         additional_dependencies: [pyyaml]
+    -   id: sync-flake8-versions
+        name: Check flake8 version is synced across flake8, yesqa, and environment.yml
+        language: python
+        entry: python scripts/sync_flake8_versions.py
+        files: ^(\.pre-commit-config\.yaml|environment\.yml)$
+        pass_filenames: false
+        additional_dependencies: [pyyaml]
     -   id: title-capitalization
         name: Validate correct capitalization among titles in documentation
         entry: python scripts/validate_rst_title_capitalization.py

MANIFEST.in

@@ -17,8 +17,10 @@ global-exclude *.h5
 global-exclude *.html
 global-exclude *.json
 global-exclude *.jsonl
+global-exclude *.pdf
 global-exclude *.pickle
 global-exclude *.png
+global-exclude *.pptx
 global-exclude *.pyc
 global-exclude *.pyd
 global-exclude *.ods

ci/deps/actions-37-db.yaml

@@ -32,7 +32,7 @@ dependencies:
   - google-cloud-bigquery>=1.27.2 # GH 36436
   - psycopg2
   - pyarrow>=0.15.0
-  - pymysql<0.10.0 # temporary pin, GH 36465
+  - pymysql
   - pytables
   - python-snappy
   - python-dateutil

doc/source/_static/css/getting_started.css

@@ -131,20 +131,30 @@ ul.task-bullet > li > p:first-child {
 
 /* Getting started index page */
 
-.intro-card {
+.comparison-card {
   background:#FFF;
   border-radius:0;
   padding: 30px 10px 10px 10px;
   margin: 10px 0px;
 }
 
-.intro-card .card-text {
-  margin:20px 0px;
-  /*min-height: 150px; */
+.comparison-card p.card-text {
+  margin: 0px;
 }
 
-.intro-card .card-img-top {
+.comparison-card .card-img-top {
   margin: 10px;
+  margin-bottom: 20px;
+  height: 72px;
+}
+
+.comparison-card-excel .card-img-top, .comparison-card-stata .card-img-top, .comparison-card-sas .card-img-top {
+  height: 52px;
+}
+
+.comparison-card .card-footer {
+  border: none;
+  background-color:white;
 }
 
 .install-block {
@@ -154,10 +164,13 @@ ul.task-bullet > li > p:first-child {
 .install-card .card-header {
   border: none;
   background-color:white;
+  padding: 1rem 1rem 0rem 1rem;
+}
+
+.install-card .card-header p.card-text {
   color: #150458;
   font-size: 1.1rem;
   font-weight: bold;
-  padding: 1rem 1rem 0rem 1rem;
 }
 
 .install-card .card-footer {

doc/source/_static/css/pandas.css

@@ -5,39 +5,40 @@
   --pst-color-info: 23, 162, 184;
 }
 
-/* Getting started index page */
+/* Main index page overview cards */
 
 .intro-card {
   background: #fff;
   border-radius: 0;
-  padding: 30px 10px 10px 10px;
+  padding: 30px 10px 20px 10px;
   margin: 10px 0px;
 }
 
-.intro-card .card-text {
-  margin: 20px 0px;
-  /*min-height: 150px; */
+.intro-card p.card-text {
+  margin: 0px;
 }
 
-.custom-button {
-  background-color: #dcdcdc;
+.intro-card .card-img-top {
+  margin: 10px;
+  height: 52px;
+}
+
+.intro-card .card-header {
   border: none;
-  color: #484848;
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  font-size: 0.9rem;
-  border-radius: 0.5rem;
-  max-width: 220px;
-  padding: 0.5rem 0rem;
+  background-color:white;
+  color: #150458 !important;
+  font-size: var(--pst-font-size-h5);
+  font-weight: bold;
+  padding: 2.5rem 0rem 0.5rem 0rem;
 }
 
-.custom-button a {
-  color: #484848;
+.intro-card .card-footer {
+  border: none;
+  background-color:white;
 }
 
-.custom-button p {
-  margin-top: 0;
-  margin-bottom: 0rem;
-  color: #484848;
+.intro-card .card-footer p.card-text{
+  max-width: 220px;
+  margin-left: auto;
+  margin-right: auto;
 }

doc/source/_static/style/bg_ax0.png

@@ -65,6 +65,7 @@
     "sphinx.ext.ifconfig",
     "sphinx.ext.linkcode",
     "nbsphinx",
+    "sphinx_panels",
     "contributors",  # custom pandas extension
 ]
 
@@ -139,6 +140,10 @@
 # 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
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["../_templates"]