Merge branch 'master' into enh-masked-2d

Author: jbrockmendel

.github/workflows/ci.yml

@@ -2,11 +2,13 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
+      - 1.3.x
   pull_request:
     branches:
       - master
-      - 1.2.x
+      - 1.3.x
 
 env:
   ENV_FILE: environment.yml
@@ -20,9 +22,15 @@ jobs:
       run:
         shell: bash -l {0}
 
+    concurrency:
+      group: ${{ github.ref }}-checks
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Looking for unwanted patterns
       run: ci/code_checks.sh patterns
@@ -91,10 +99,16 @@ jobs:
   web_and_docs:
     name: Web and docs
     runs-on: ubuntu-latest
-    steps:
 
+    concurrency:
+      group: ${{ github.ref }}-web-docs
+      cancel-in-progress: true
+
+    steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Set up pandas
       uses: ./.github/actions/setup
@@ -119,15 +133,15 @@ 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'
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Upload web
       run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' --exclude='Pandas_Cheat_Sheet*' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
-      if: github.event_name == 'push'
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Upload dev docs
       run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
-      if: github.event_name == 'push'
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Move docs into site directory
       run: mv doc/build/html web/build/docs
@@ -144,10 +158,15 @@ jobs:
     strategy:
       matrix:
         pattern: ["not slow and not network and not clipboard", "slow"]
-    steps:
+    concurrency:
+      group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
+      cancel-in-progress: true
 
+    steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Set up pandas
       uses: ./.github/actions/setup

.github/workflows/database.yml

@@ -2,11 +2,14 @@ name: Database
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
   pull_request:
     branches:
       - master
-      - 1.2.x
+      - 1.3.x
+    paths-ignore:
+      - "doc/**"
 
 env:
   PYTEST_WORKERS: "auto"
@@ -15,17 +18,21 @@ env:
   COVERAGE: true
 
 jobs:
-  Linux_py37_IO:
+  Linux_py38_IO:
     runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash -l {0}
 
     strategy:
       matrix:
-        ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
+        ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
       fail-fast: false
 
+    concurrency:
+      group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
     services:
       mysql:
         image: mysql
@@ -56,10 +63,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Cache conda
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       env:
         CACHE_NUMBER: 0
       with:
@@ -95,7 +104,7 @@ jobs:
       run: python ci/print_skipped.py
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
       with:
         flags: unittests
         name: codecov-pandas

.github/workflows/posix.yml

@@ -2,11 +2,15 @@ name: Posix
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
+      - 1.3.x
   pull_request:
     branches:
       - master
-      - 1.2.x
+      - 1.3.x
+    paths-ignore:
+      - "doc/**"
 
 env:
   PYTEST_WORKERS: "auto"
@@ -21,14 +25,13 @@ jobs:
     strategy:
       matrix:
         settings: [
-          [actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
-          [actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
-          [actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
-          [actions-37-slow.yaml, "slow", "", "", "", "", ""],
+          [actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
+          [actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
           [actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
           [actions-38-slow.yaml, "slow", "", "", "", "", ""],
           [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
-          [actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
+          [actions-39-slow.yaml, "slow", "", "", "", "", ""],
+          [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
           [actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
         ]
       fail-fast: false
@@ -41,13 +44,18 @@ jobs:
       LC_ALL: ${{ matrix.settings[4] }}
       PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
       TEST_ARGS: ${{ matrix.settings[6] }}
+    concurrency:
+      group: ${{ github.ref }}-${{ matrix.settings[0] }}
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Cache conda
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       env:
         CACHE_NUMBER: 0
       with:
@@ -86,7 +94,7 @@ jobs:
       run: python ci/print_skipped.py
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
       with:
         flags: unittests
         name: codecov-pandas

.github/workflows/pre-commit.yml

@@ -3,11 +3,16 @@ name: pre-commit
 on:
   pull_request:
   push:
-    branches: [master]
+    branches:
+      - master
+      - 1.3.x
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.ref }}-pre-commit
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

.github/workflows/python-dev.yml

@@ -4,16 +4,30 @@ on:
   push:
     branches:
       - master
+      - 1.3.x
   pull_request:
     branches:
       - master
+      - 1.3.x
+    paths-ignore:
+      - "doc/**"
+
+env:
+  PYTEST_WORKERS: "auto"
+  PANDAS_CI: 1
+  PATTERN: "not slow and not network and not clipboard"
+  COVERAGE: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
     name: actions-310-dev
     timeout-minutes: 60
 
+    concurrency:
+      group: ${{ github.ref }}-dev
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
     steps:
     - uses: actions/checkout@v2
       with:
@@ -30,7 +44,7 @@ jobs:
         pip install git+https://github.com/numpy/numpy.git
         pip install git+https://github.com/pytest-dev/pytest.git
         pip install git+https://github.com/nedbat/coveragepy.git
-        pip install cython python-dateutil pytz hypothesis pytest-xdist
+        pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
         pip list
 
     - name: Build Pandas
@@ -44,7 +58,8 @@ jobs:
 
     - name: Test with pytest
       run: |
-        coverage run -m pytest -m 'not slow and not network and not clipboard' pandas
+        ci/run_tests.sh
+      # GH 41935
       continue-on-error: true
 
     - name: Publish test results
@@ -63,7 +78,7 @@ jobs:
         coverage report -m
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
       with:
         flags: unittests
         name: codecov-pandas

.github/workflows/sdist.yml

@@ -0,0 +1,67 @@
+name: sdist
+
+on:
+  push:
+    branches:
+      - master
+      - 1.3.x
+  pull_request:
+    branches:
+      - master
+      - 1.3.x
+    paths-ignore:
+      - "doc/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9"]
+    concurrency:
+      group: ${{github.ref}}-${{matrix.python-version}}-sdist
+      cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+
+        # GH 39416
+        pip install numpy
+
+    - name: Build pandas sdist
+      run: |
+        pip list
+        python setup.py sdist --formats=gztar
+
+    - uses: conda-incubator/setup-miniconda@v2
+      with:
+        activate-environment: pandas-sdist
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install pandas from sdist
+      run: |
+        conda list
+        python -m pip install dist/*.gz
+
+    - name: Import pandas
+      run: |
+        cd ..
+        conda list
+        python -c "import pandas; pandas.show_versions();"