Merge branch 'main' into offsets-week-doc

Author: akshay-babbar

.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 .

.devcontainer.json

@@ -9,8 +9,7 @@
 	// You can edit these settings after create using File > Preferences > Settings > Remote.
 	"settings": {
 		"terminal.integrated.shell.linux": "/bin/bash",
-		"python.condaPath": "/opt/conda/bin/conda",
-		"python.pythonPath": "/opt/conda/bin/python",
+		"python.pythonPath": "/usr/local/bin/python",
 		"python.formatting.provider": "black",
 		"python.linting.enabled": true,
 		"python.linting.flake8Enabled": true,

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -68,5 +68,5 @@ body:
     attributes:
       label: Additional Context
       description: >
-        Please provide any relevant Github issues, code examples or references that help describe and support
+        Please provide any relevant GitHub issues, code examples or references that help describe and support
         the feature request.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-- [ ] closes #xxxx (Replace xxxx with the Github issue number)
+- [ ] closes #xxxx (Replace xxxx with the GitHub issue number)
 - [ ] [Tests added and passed](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#writing-tests) if fixing a bug or adding a new feature
 - [ ] All [code checks passed](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#pre-commit).
 - [ ] Added [type annotations](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#type-hints) to new arguments/methods/functions.

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

@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - 1.4.x
+      - 1.5.x
   pull_request:
     branches:
       - main
-      - 1.4.x
+      - 1.5.x
     paths-ignore:
       - "doc/**"
 
@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   pytest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -38,9 +38,11 @@ jobs:
           /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
           . ~/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 -m pip install versioneer[toml] && \
+          python -m pip install cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.34.2 && \
+          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/assign.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - if: github.event.comment.body == 'take'
       run: |

.github/workflows/asv-bot.yml

@@ -21,7 +21,7 @@ jobs:
     name: "Run benchmarks"
     # TODO: Support more benchmarking options later, against different branches, against self, etc
     if: startsWith(github.event.comment.body, '@github-actions benchmark')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -el {0}

.github/workflows/autoupdate-pre-commit-config.yml

@@ -15,10 +15,10 @@ jobs:
       pull-requests: write  # for technote-space/create-pr-action to create a PR
     if: github.repository_owner == 'pandas-dev'
     name: Autoupdate pre-commit config
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
       - name: Cache multiple paths
         uses: actions/cache@v3
         with:

.github/workflows/code-checks.yml

@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - 1.4.x
+      - 1.5.x
   pull_request:
     branches:
       - main
-      - 1.4.x
+      - 1.5.x
 
 env:
   ENV_FILE: environment.yml
@@ -20,7 +20,7 @@ permissions:
 jobs:
   pre_commit:
     name: pre-commit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
       group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-pre-commit
@@ -30,16 +30,18 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.9.7'
+        python-version: '3.9'
 
     - name: Run pre-commit
       uses: pre-commit/[email protected]
+      with:
+        extra_args: --verbose --all-files
 
-  typing_and_docstring_validation:
-    name: Docstring and typing validation
-    runs-on: ubuntu-latest
+  docstring_typing_manual_hooks:
+    name: Docstring validation, typing, and other manual pre-commit hooks
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -el {0}
@@ -79,17 +81,21 @@ jobs:
       run: ci/code_checks.sh docstrings
       if: ${{ steps.build.outcome == 'success' && always() }}
 
+    - name: Run check of documentation notebooks
+      run: ci/code_checks.sh notebooks
+      if: ${{ steps.build.outcome == 'success' && always() }}
+
     - name: Use existing environment for type checking
       run: |
         echo $PATH >> $GITHUB_PATH
         echo "PYTHONHOME=$PYTHONHOME" >> $GITHUB_ENV
         echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
       if: ${{ steps.build.outcome == 'success' && always() }}
 
-    - name: Typing
+    - name: Typing + pylint
       uses: pre-commit/[email protected]
       with:
-        extra_args: --hook-stage manual --all-files
+        extra_args: --verbose --hook-stage manual --all-files
       if: ${{ steps.build.outcome == 'success' && always() }}
 
     - name: Run docstring validation script tests
@@ -98,7 +104,7 @@ jobs:
 
   asv-benchmarks:
     name: ASV Benchmarks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -el {0}
@@ -129,7 +135,7 @@ jobs:
 
   build_docker_dev_environment:
     name: Build Docker Dev Environment
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash -el {0}
@@ -151,9 +157,12 @@ jobs:
       - name: Build image
         run: docker build --pull --no-cache --tag pandas-dev-env .
 
+      - name: Show environment
+        run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())"
+
   requirements-dev-text-installable:
     name: Test install requirements-dev.txt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     concurrency:
       # https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -168,7 +177,7 @@ jobs:
 
       - name: Setup Python
         id: setup_python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
           cache: 'pip'

.github/workflows/codeql.yml

@@ -8,9 +8,12 @@ concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read