Merge branch 'main' into fix-merge-suffixes-61402

Author: Farsidetfs

Dockerfile

@@ -1,16 +1,20 @@
 FROM python:3.10.8
 WORKDIR /home/pandas
 
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y build-essential bash-completion
+RUN apt-get update && \
+    apt-get --no-install-recommends -y upgrade && \
+    apt-get --no-install-recommends -y install \
+    build-essential \
+    bash-completion \
+    # hdf5 needed for pytables installation
+    libhdf5-dev \
+    # libgles2-mesa needed for pytest-qt
+    libgles2-mesa-dev && \
+    rm -rf /var/lib/apt/lists/*
 
-# hdf5 needed for pytables installation
-# libgles2-mesa needed for pytest-qt
-RUN apt-get install -y libhdf5-dev libgles2-mesa-dev
-
-RUN python -m pip install --upgrade pip
 COPY requirements-dev.txt /tmp
-RUN python -m pip install -r /tmp/requirements-dev.txt
+RUN python -m pip install --no-cache-dir --upgrade pip && \
+    python -m pip install --no-cache-dir -r /tmp/requirements-dev.txt
 RUN git config --global --add safe.directory /home/pandas
 
 ENV SHELL="/bin/bash"

ci/deps/actions-310-minimum_versions.yaml

@@ -26,7 +26,6 @@ dependencies:
 
   # optional dependencies
   - beautifulsoup4=4.12.3
-  - blosc=1.21.3
   - bottleneck=1.3.6
   - fastparquet=2024.2.0
   - fsspec=2024.2.0

ci/deps/actions-310.yaml

@@ -24,7 +24,6 @@ dependencies:
 
   # optional dependencies
   - beautifulsoup4>=4.12.3
-  - blosc>=1.21.3
   - bottleneck>=1.3.6
   - fastparquet>=2024.2.0
   - fsspec>=2024.2.0
@@ -52,7 +51,7 @@ dependencies:
   - scipy>=1.12.0
   - sqlalchemy>=2.0.0
   - tabulate>=0.9.0
-  - xarray>=2024.1.1, <=2024.9.0
+  - xarray>=2024.1.1
   - xlrd>=2.0.1
   - xlsxwriter>=3.2.0
   - zstandard>=0.22.0

ci/deps/actions-311-downstream_compat.yaml

@@ -25,7 +25,6 @@ dependencies:
 
   # optional dependencies
   - beautifulsoup4>=4.12.3
-  - blosc>=1.21.3
   - bottleneck>=1.3.6
   - fastparquet>=2024.2.0
   - fsspec>=2024.2.0
@@ -53,7 +52,7 @@ dependencies:
   - scipy>=1.12.0
   - sqlalchemy>=2.0.0
   - tabulate>=0.9.0
-  - xarray>=2024.1.1, <=2024.9.0
+  - xarray>=2024.1.1
   - xlrd>=2.0.1
   - xlsxwriter>=3.2.0
   - zstandard>=0.22.0
@@ -63,14 +62,12 @@ dependencies:
   - cftime
   - dask
   - ipython
-  - geopandas-base
   - seaborn
   - scikit-learn
   - statsmodels
   - coverage
   - pandas-datareader
   - pyyaml
-  - py
   - pip:
     - adbc-driver-postgresql>=0.10.0
     - adbc-driver-sqlite>=0.8.0

ci/deps/actions-311.yaml

@@ -24,7 +24,6 @@ dependencies:
 
   # optional dependencies
   - beautifulsoup4>=4.12.3
-  - blosc>=1.21.3
   - bottleneck>=1.3.6
   - fastparquet>=2024.2.0
   - fsspec>=2024.2.0
@@ -52,7 +51,7 @@ dependencies:
   - scipy>=1.12.0
   - sqlalchemy>=2.0.0
   - tabulate>=0.9.0
-  - xarray>=2024.1.1, <=2024.9.0
+  - xarray>=2024.1.1
   - xlrd>=2.0.1
   - xlsxwriter>=3.2.0
   - zstandard>=0.22.0

ci/deps/actions-312.yaml

@@ -24,7 +24,6 @@ dependencies:
 
   # optional dependencies
   - beautifulsoup4>=4.12.3
-  - blosc>=1.21.3
   - bottleneck>=1.3.6
   - fastparquet>=2024.2.0
   - fsspec>=2024.2.0
@@ -52,7 +51,7 @@ dependencies:
   - scipy>=1.12.0
   - sqlalchemy>=2.0.0
   - tabulate>=0.9.0
-  - xarray>=2024.1.1, <=2024.9.0
+  - xarray>=2024.1.1
   - xlrd>=2.0.1
   - xlsxwriter>=3.2.0
   - zstandard>=0.22.0

ci/deps/actions-313.yaml

@@ -52,7 +52,7 @@ dependencies:
   - scipy>=1.12.0
   - sqlalchemy>=2.0.0
   - tabulate>=0.9.0
-  - xarray>=2024.1.1, <=2024.9.0
+  - xarray>=2024.1.1
   - xlrd>=2.0.1
   - xlsxwriter>=3.2.0
   - zstandard>=0.22.0

doc/cheatsheet/Pandas_Cheat_Sheet.pdf

@@ -12,7 +12,7 @@ This cheat sheet, originally written by Irv Lustig, [Princeton Consultants](http
 | Pandas_Cheat_Sheet_JA  | Japanese    | <a href="https://github.com/pandas-dev/pandas/blob/main/doc/cheatsheet/Pandas_Cheat_Sheet_JA.pdf" target="_parent"><img src="https://img.shields.io/badge/Open in PDF-%23FF0000.svg?style=flat-square&logo=adobe&logoColor=white"/></a> | <a href="https://github.com/pandas-dev/pandas/blob/main/doc/cheatsheet/Pandas_Cheat_Sheet_JA.pptx" target="_parent"><img  src="https://img.shields.io/badge/Open in PPT-B7472A?style=flat-square&logo=microsoft-powerpoint&logoColor=white"/></a> |
 | Pandas_Cheat_Sheet_FA  | Persian     | <a href="https://github.com/pandas-dev/pandas/blob/main/doc/cheatsheet/Pandas_Cheat_Sheet_FA.pdf" target="_parent"><img src="https://img.shields.io/badge/Open in PDF-%23FF0000.svg?style=flat-square&logo=adobe&logoColor=white"/></a> | <a href="https://github.com/pandas-dev/pandas/blob/main/doc/cheatsheet/Pandas_Cheat_Sheet_FA.pptx" target="_parent"><img  src="https://img.shields.io/badge/Open in PPT-B7472A?style=flat-square&logo=microsoft-powerpoint&logoColor=white"/></a> |
 
-
+The English version has additional material that is not in the versions in other languages.
 
 **Alternative**