Merge branch 'main' of https://github.com/pandas-dev/pandas into feature/46319_locale_strftime_period

� Conflicts:
�	.github/workflows/ubuntu.yml

Author: Sylvain MARIE

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   test-arm:
     machine:
       image: ubuntu-2004:202101-01
-    resource_class: arm.medium
+    resource_class: arm.large
     environment:
       ENV_FILE: ci/deps/circle-38-arm64.yaml
       PYTEST_WORKERS: auto

.circleci/setup_env.sh

@@ -1,47 +1,16 @@
 #!/bin/bash -e
 
-# edit the locale file if needed
-if [[ "$(uname)" == "Linux" && -n "$LC_ALL" ]]; then
-    echo "Adding locale to the first line of pandas/__init__.py"
-    rm -f pandas/__init__.pyc
-    SEDC="3iimport locale\nlocale.setlocale(locale.LC_ALL, '$LC_ALL')\n"
-    sed -i "$SEDC" pandas/__init__.py
-
-    echo "[head -4 pandas/__init__.py]"
-    head -4 pandas/__init__.py
-    echo
-fi
+echo "Install Mambaforge"
+MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-Linux-aarch64.sh"
+echo "Downloading $MAMBA_URL"
+wget -q $MAMBA_URL -O minimamba.sh
+chmod +x minimamba.sh
 
+MAMBA_DIR="$HOME/miniconda3"
+rm -rf $MAMBA_DIR
+./minimamba.sh -b -p $MAMBA_DIR
 
-MINICONDA_DIR=/usr/local/miniconda
-if [ -e $MINICONDA_DIR ] && [ "$BITS32" != yes ]; then
-    echo "Found Miniconda installation at $MINICONDA_DIR"
-else
-    echo "Install Miniconda"
-    DEFAULT_CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest"
-    if [[ "$(uname -m)" == 'aarch64' ]]; then
-        CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.10.1-4/Miniforge3-4.10.1-4-Linux-aarch64.sh"
-    elif [[ "$(uname)" == 'Linux' ]]; then
-        if [[ "$BITS32" == "yes" ]]; then
-            CONDA_URL="$DEFAULT_CONDA_URL-Linux-x86.sh"
-        else
-            CONDA_URL="$DEFAULT_CONDA_URL-Linux-x86_64.sh"
-        fi
-    elif [[ "$(uname)" == 'Darwin' ]]; then
-        CONDA_URL="$DEFAULT_CONDA_URL-MacOSX-x86_64.sh"
-    else
-      echo "OS $(uname) not supported"
-      exit 1
-    fi
-    echo "Downloading $CONDA_URL"
-    wget -q $CONDA_URL -O miniconda.sh
-    chmod +x miniconda.sh
-
-    MINICONDA_DIR="$HOME/miniconda3"
-    rm -rf $MINICONDA_DIR
-    ./miniconda.sh -b -p $MINICONDA_DIR
-fi
-export PATH=$MINICONDA_DIR/bin:$PATH
+export PATH=$MAMBA_DIR/bin:$PATH
 
 echo
 echo "which conda"
@@ -51,7 +20,7 @@ echo
 echo "update conda"
 conda config --set ssl_verify false
 conda config --set quiet true --set always_yes true --set changeps1 false
-conda install -y -c conda-forge -n base 'mamba>=0.21.2' pip setuptools
+mamba install -y -c conda-forge -n base pip setuptools
 
 echo "conda info -a"
 conda info -a
@@ -70,11 +39,6 @@ time mamba env update -n pandas-dev --file="${ENV_FILE}"
 echo "conda list -n pandas-dev"
 conda list -n pandas-dev
 
-if [[ "$BITS32" == "yes" ]]; then
-    # activate 32-bit compiler
-    export CONDA_BUILD=1
-fi
-
 echo "activate pandas-dev"
 source activate pandas-dev
 
@@ -90,15 +54,9 @@ if pip list | grep -q ^pandas; then
     pip uninstall -y pandas || true
 fi
 
-if [ "$(conda list -f qt --json)" != [] ]; then
-    echo
-    echo "remove qt"
-    echo "causes problems with the clipboard, we use xsel for that"
-    conda remove qt -y --force || true
-fi
-
 echo "Build extensions"
-python setup.py build_ext -q -j3
+# GH 47305: Parallel build can causes flaky ImportError from pandas/_libs/tslibs
+python setup.py build_ext -q -j1
 
 echo "Install pandas"
 python -m pip install --no-build-isolation --no-use-pep517 -e .

.github/workflows/32-bit-linux.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
     paths-ignore:
       - "doc/**"
@@ -39,8 +41,9 @@ jobs:
           . ~/virtualenvs/pandas-dev/bin/activate && \
           python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
           pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
-          python setup.py build_ext -q -j2 && \
+          python setup.py build_ext -q -j1 && \
           python -m pip install --no-build-isolation --no-use-pep517 -e . && \
+          python -m pip list && \
           export PANDAS_CI=1 && \
           pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml"
 

.github/workflows/code-checks.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
 
 env:

.github/workflows/codeql.yml

@@ -0,0 +1,31 @@
+name: CodeQL
+on:
+  schedule:
+    # every day at midnight
+    - cron: "0 0 * * *"
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language:
+          - python
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/analyze@v2

.github/workflows/docbuild-and-upload.yml

@@ -4,10 +4,14 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
+    tags:
+      - '*'
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
 
 env:
@@ -49,6 +53,9 @@ jobs:
     - name: Build documentation
       run: doc/make.py --warnings-are-errors
 
+    - name: Build documentation zip
+      run: doc/make.py zip_html
+
     - name: Build the interactive terminal
       run: |
         cd web/interactive_terminal
@@ -60,7 +67,7 @@ jobs:
         echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa
         echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
-      if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+      if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
 
     - name: Copy cheatsheets into site directory
       run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/
@@ -73,6 +80,10 @@ jobs:
       run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
       if: github.event_name == 'push' && github.ref == 'refs/heads/main'
 
+    - name: Upload prod docs
+      run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/version/${GITHUB_REF_NAME}
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+
     - name: Move docs into site directory
       run: mv doc/build/html web/build/docs
 

.github/workflows/macos-windows.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
     paths-ignore:
       - "doc/**"

.github/workflows/python-dev.yml

@@ -1,9 +1,21 @@
-# This file is purposely frozen(does not run). DO NOT DELETE IT
-# Unfreeze(by commentingthe if: false() condition) once the
-# next Python Dev version has released beta 1 and both Cython and numpy support it
-# After that Python has released, migrate the workflows to the
-# posix GHA workflows and "freeze" this file by
-# uncommenting the if: false() condition
+# This workflow may or may not run depending on the state of the next
+# unreleased Python version. DO NOT DELETE IT.
+#
+# In general, this file will remain frozen(present, but not running) until:
+#    - The next unreleased Python version has released beta 1
+#      - This version should be available on Github Actions.
+#    - Our required build/runtime dependencies(numpy, pytz, Cython, python-dateutil)
+#      support that unreleased Python version.
+#    To unfreeze, comment out the ``if: false`` condition, and make sure you update
+#    the name of the workflow and Python version in actions/setup-python to: '3.12-dev'
+#
+# After it has been unfrozen, this file should remain unfrozen(present, and running) until:
+#    - The next Python version has been officially released.
+#    OR
+#    - Most/All of our optional dependencies support Python 3.11 AND
+#    - The next Python version has released a rc(we are guaranteed a stable ABI).
+#    To freeze this file, uncomment out the ``if: false`` condition, and migrate the jobs
+#    to the corresponding posix/windows-macos/sdist etc. workflows.
 # Feel free to modify this comment as necessary.
 
 name: Python Dev
@@ -12,10 +24,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
     paths-ignore:
       - "doc/**"
@@ -32,7 +46,7 @@ permissions:
 
 jobs:
   build:
-    if: false # Comment this line out to "unfreeze"
+    # if: false # Uncomment this to freeze the workflow, comment it to unfreeze
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -53,27 +67,27 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python Dev Version
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: '3.11-dev'
 
     - name: Install dependencies
-      shell: bash -el {0}
       run: |
-        python3 -m pip install --upgrade pip setuptools wheel
-        python3 -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
-        python3 -m pip install git+https://github.com/nedbat/coveragepy.git
-        python3 -m pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
-        python3 -m pip list
+        python --version
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install git+https://github.com/numpy/numpy.git
+        python -m pip install git+https://github.com/nedbat/coveragepy.git
+        python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
+        python -m pip list
 
     - name: Build Pandas
       run: |
-        python3 setup.py build_ext -q -j2
-        python3 -m pip install -e . --no-build-isolation --no-use-pep517
+        python setup.py build_ext -q -j2
+        python -m pip install -e . --no-build-isolation --no-use-pep517
 
     - name: Build Version
       run: |
-        python3 -c "import pandas; pandas.show_versions();"
+        python -c "import pandas; pandas.show_versions();"
 
     - name: Test
       uses: ./.github/actions/run-tests

.github/workflows/sdist.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
     types: [labeled, opened, synchronize, reopened]
     paths-ignore:
@@ -79,9 +81,9 @@ jobs:
       run: |
         case "${{matrix.python-version}}" in
         3.8)
-          pip install numpy==1.19.5 ;;
+          pip install numpy==1.20.3 ;;
         3.9)
-          pip install numpy==1.19.5 ;;
+          pip install numpy==1.20.3 ;;
         3.10)
           pip install numpy==1.21.2 ;;
         esac

.github/workflows/ubuntu.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
   pull_request:
     branches:
       - main
+      - 1.5.x
       - 1.4.x
     paths-ignore:
       - "doc/**"
@@ -60,6 +62,10 @@ jobs:
             # Also install zh_CN (its encoding is gb2312) but do not activate it.
             # It will be temporarily activated during tests with locale.setlocale
             extra_loc: "zh_CN"
+          - name: "Copy-on-Write"
+            env_file: actions-310.yaml
+            pattern: "not slow and not network and not single_cpu"
+            pandas_copy_on_write: "1"
           - name: "Data Manager"
             env_file: actions-38.yaml
             pattern: "not slow and not network and not single_cpu"
@@ -72,7 +78,7 @@ jobs:
             env_file: actions-310-numpydev.yaml
             pattern: "not slow and not network and not single_cpu"
             pandas_testing_mode: "deprecate"
-            test_args: "-W error::DeprecationWarning:numpy"
+            test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
         exclude:
           - env_file: actions-39.yaml
             pyarrow_version: "6"
@@ -92,6 +98,7 @@ jobs:
       LC_ALL: ${{ matrix.lc_all || '' }}
       PANDAS_TESTING_MODE: ${{ matrix.pandas_testing_mode || '' }}
       PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}
+      PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
       TEST_ARGS: ${{ matrix.test_args || '' }}
       PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }}
       PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}