From 7eaca3fdc3f2e98f2bc9748b37d8ab86d4f6ee2a Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Tue, 4 May 2021 18:59:47 +0300 Subject: [PATCH 01/17] CI: skip tests when only files in doc/web changes (github) --- .github/workflows/ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca0c75f9de94f..33dc27f662f68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,14 +99,29 @@ jobs: - name: Set up pandas uses: ./.github/actions/setup + # Github workflows built-in path filters + # don't work on a level of individual jobs or steps. + # So, we use this. + - uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + doc: + - 'doc/**' + web: + - 'web/**' + - name: Build website run: | source activate pandas-dev python web/pandas_web.py web/pandas --target-path=web/build + if: steps.changes.outputs.web == 'true' + - name: Build documentation run: | source activate pandas-dev doc/make.py --warnings-are-errors | tee sphinx.log ; exit ${PIPESTATUS[0]} + if: steps.changes.outputs.doc == 'true' # This can be removed when the ipython directive fails when there are errors, # including the `tee sphinx.log` in te previous step (https://github.com/ipython/ipython/issues/11547) @@ -123,14 +138,15 @@ jobs: - 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' && steps.changes.outputs.web == 'true' }} - 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' && steps.changes.outputs.doc == 'true' }} - name: Move docs into site directory run: mv doc/build/html web/build/docs + - name: Save website as an artifact uses: actions/upload-artifact@v2 with: From ed4882932d0d25c8472ad466572f94cc28898aa0 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Tue, 4 May 2021 19:12:42 +0300 Subject: [PATCH 02/17] Fixed yaml file indent --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33dc27f662f68..9bb108a3c191d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,10 +106,10 @@ jobs: id: changes with: filters: | - doc: - - 'doc/**' - web: - - 'web/**' + doc: + - 'doc/**' + web: + - 'web/**' - name: Build website run: | From 644989c84bdb142db0b6be5ef7fb80a2cc1fb751 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 15:22:55 +0300 Subject: [PATCH 03/17] Revert "CI: skip tests when only files in doc/web changes (github)" This reverts commit 7eaca3fdc3f2e98f2bc9748b37d8ab86d4f6ee2a. --- .github/workflows/ci.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bb108a3c191d..ca0c75f9de94f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,29 +99,14 @@ jobs: - name: Set up pandas uses: ./.github/actions/setup - # Github workflows built-in path filters - # don't work on a level of individual jobs or steps. - # So, we use this. - - uses: dorny/paths-filter@v2 - id: changes - with: - filters: | - doc: - - 'doc/**' - web: - - 'web/**' - - name: Build website run: | source activate pandas-dev python web/pandas_web.py web/pandas --target-path=web/build - if: steps.changes.outputs.web == 'true' - - name: Build documentation run: | source activate pandas-dev doc/make.py --warnings-are-errors | tee sphinx.log ; exit ${PIPESTATUS[0]} - if: steps.changes.outputs.doc == 'true' # This can be removed when the ipython directive fails when there are errors, # including the `tee sphinx.log` in te previous step (https://github.com/ipython/ipython/issues/11547) @@ -138,15 +123,14 @@ jobs: - 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' && steps.changes.outputs.web == 'true' }} + if: github.event_name == 'push' - 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' && steps.changes.outputs.doc == 'true' }} + if: github.event_name == 'push' - name: Move docs into site directory run: mv doc/build/html web/build/docs - - name: Save website as an artifact uses: actions/upload-artifact@v2 with: From 719a524cfa20779dc85d4224321ae41184cc37a5 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 15:50:51 +0300 Subject: [PATCH 04/17] CI: Don't run lint if only doc changes (github worklow) --- .github/workflows/ci.yml | 4 ++++ .github/workflows/database.yml | 4 ++++ .github/workflows/posix.yml | 4 ++++ .github/workflows/pre-commit.yml | 7 +++++++ .github/workflows/python-dev.yml | 4 ++++ 5 files changed, 23 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca0c75f9de94f..72218bc03aff3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,14 @@ name: CI on: push: branches: [master] + paths-ignore: + - "doc/**" pull_request: branches: - master - 1.2.x + paths-ignore: + - "doc/**" env: ENV_FILE: environment.yml diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index a5aef7825c770..bd6f662f0de2e 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -3,10 +3,14 @@ name: Database on: push: branches: [master] + paths-ignore: + - "doc/**" pull_request: branches: - master - 1.2.x + paths-ignore: + - "doc/**" env: PYTEST_WORKERS: "auto" diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 34e6c2c9d94ce..a7dbbe85d32db 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -3,10 +3,14 @@ name: Posix on: push: branches: [master] + paths-ignore: + - "doc/**" pull_request: branches: - master - 1.2.x + paths-ignore: + - "doc/**" env: PYTEST_WORKERS: "auto" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 723347913ac38..9d1fd2e2d8d6f 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,8 +2,15 @@ name: pre-commit on: pull_request: + paths-ignore: + - "doc/**" push: branches: [master] + # NOTE: Is this really needed? + # The pre-commit also checks "rst" files, + # and also the checks are very fast. + paths-ignore: + - "doc/**" jobs: pre-commit: diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 221501ae028f3..07a76b3ddf0f3 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -4,9 +4,13 @@ on: push: branches: - master + paths-ignore: + - "doc/**" pull_request: branches: - master + paths-ignore: + - "doc/**" jobs: build: From 2fa1f9ad70dd9e489b4cbfae6f22113457ecac88 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 16:06:43 +0300 Subject: [PATCH 05/17] CI: Don't run lint if only doc changes (azure) --- ci/azure/posix.yml | 9 +++++++++ ci/azure/windows.yml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 2caacf3a07290..041d39f2b3652 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -1,3 +1,12 @@ +trigger: + branches: + include: + - master + - 1.2.* + paths: + include: + - doc + parameters: name: '' vmImage: '' diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 5644ad46714d5..4569b368ef13a 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -1,3 +1,12 @@ +trigger: + branches: + include: + - master + - 1.2.* + paths: + include: + - doc + parameters: name: '' vmImage: '' From 9c2fc06428b18553f86ef4ee44fcf281024fd23e Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 16:19:24 +0300 Subject: [PATCH 06/17] Fix (ex|in)clude logic in azure templates --- ci/azure/posix.yml | 4 +++- ci/azure/windows.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 041d39f2b3652..1b1f917ef97f2 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -5,7 +5,9 @@ trigger: - 1.2.* paths: include: - - doc + - '*' # same as '/' for the repository root + exclude: + - 'doc/*' parameters: name: '' diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 4569b368ef13a..299f294dd9cc4 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -5,7 +5,9 @@ trigger: - 1.2.* paths: include: - - doc + - '*' # same as '/' for the repository root + exclude: + - 'doc/*' parameters: name: '' From e459da3c66add931cbf40e60390f9c5f9c7d746d Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 16:22:24 +0300 Subject: [PATCH 07/17] Fixed small "typo" --- ci/azure/posix.yml | 2 +- ci/azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 1b1f917ef97f2..4fc34f0a461c0 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -2,7 +2,7 @@ trigger: branches: include: - master - - 1.2.* + - 1.2.x paths: include: - '*' # same as '/' for the repository root diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 299f294dd9cc4..122ffadc4051a 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -2,7 +2,7 @@ trigger: branches: include: - master - - 1.2.* + - 1.2.x paths: include: - '*' # same as '/' for the repository root From e193ca16016cb37c31c50c44088bc5a1afbf2b48 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 16:25:37 +0300 Subject: [PATCH 08/17] Fix location of the "path" parameter --- azure-pipelines.yml | 12 ++++++++++-- ci/azure/posix.yml | 11 ----------- ci/azure/windows.yml | 11 ----------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 56da4e87f2709..cf98645f5ac03 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,16 @@ # Adapted from https://github.com/numba/numba/blob/master/azure-pipelines.yml trigger: -- master -- 1.2.x + branches: + include: + - master + - 1.2.x + paths: + include: + - '*' # same as '/' for the repository root + exclude: + - 'doc/*' +trigger: pr: - master - 1.2.x diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 4fc34f0a461c0..2caacf3a07290 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -1,14 +1,3 @@ -trigger: - branches: - include: - - master - - 1.2.x - paths: - include: - - '*' # same as '/' for the repository root - exclude: - - 'doc/*' - parameters: name: '' vmImage: '' diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 122ffadc4051a..5644ad46714d5 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -1,14 +1,3 @@ -trigger: - branches: - include: - - master - - 1.2.x - paths: - include: - - '*' # same as '/' for the repository root - exclude: - - 'doc/*' - parameters: name: '' vmImage: '' From 0c27427e2c01a24b7570352f6bd78c336278550e Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 5 May 2021 16:27:50 +0300 Subject: [PATCH 09/17] Removed extra "trigger" --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf98645f5ac03..91cd48151dc4b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,6 @@ trigger: exclude: - 'doc/*' -trigger: pr: - master - 1.2.x From 2bc89aa1432540b6d55a5b150c8e6fdec1c04e52 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 14:06:43 +0300 Subject: [PATCH 10/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310/files#r629288230 --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72218bc03aff3..56b7616948117 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,6 @@ on: branches: - master - 1.2.x - paths-ignore: - - "doc/**" env: ENV_FILE: environment.yml From d5d531ae08e50263299cd30eb6567bcda1318ff9 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 14:09:11 +0300 Subject: [PATCH 11/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310/files#r629289631 --- .github/workflows/pre-commit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9d1fd2e2d8d6f..9ed7527c804e5 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -6,9 +6,6 @@ on: - "doc/**" push: branches: [master] - # NOTE: Is this really needed? - # The pre-commit also checks "rst" files, - # and also the checks are very fast. paths-ignore: - "doc/**" From 0637ecb5b2bd835b2185984b61b141cc152e4cfd Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 14:09:52 +0300 Subject: [PATCH 12/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310/files#r628420098 --- azure-pipelines.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 91cd48151dc4b..956feaef5f83e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,8 +5,6 @@ trigger: - master - 1.2.x paths: - include: - - '*' # same as '/' for the repository root exclude: - 'doc/*' From e28345330c39712e3f1eecbe13aeb4925dbe0a05 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 15:47:11 +0300 Subject: [PATCH 13/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310#discussion_r630998670 --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56b7616948117..ca0c75f9de94f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ name: CI on: push: branches: [master] - paths-ignore: - - "doc/**" pull_request: branches: - master From 3529f7d92951034c9a51ceceade48815d3117371 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 15:47:59 +0300 Subject: [PATCH 14/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310#discussion_r630999072 --- .github/workflows/database.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index bd6f662f0de2e..e2edfe04853ff 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -3,8 +3,6 @@ name: Database on: push: branches: [master] - paths-ignore: - - "doc/**" pull_request: branches: - master From 25ca63dd61059278dfbc9907eb008e9c8846b948 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 15:48:42 +0300 Subject: [PATCH 15/17] Fix for comment https://github.com/pandas-dev/pandas/pull/41310#discussion_r630999256 --- .github/workflows/posix.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index a7dbbe85d32db..e66bc6ed57073 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -3,8 +3,6 @@ name: Posix on: push: branches: [master] - paths-ignore: - - "doc/**" pull_request: branches: - master From ffd9d7ef61404fa90b42305c034e228a6e2caef4 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Wed, 12 May 2021 15:51:04 +0300 Subject: [PATCH 16/17] Only ignore on "pull_request" not on "push" --- .github/workflows/pre-commit.yml | 2 -- .github/workflows/python-dev.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9ed7527c804e5..429833d1652aa 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -6,8 +6,6 @@ on: - "doc/**" push: branches: [master] - paths-ignore: - - "doc/**" jobs: pre-commit: diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 9429b96ef8ee9..38b1aa9ae7047 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -4,8 +4,6 @@ on: push: branches: - master - paths-ignore: - - "doc/**" pull_request: branches: - master From 4fed5680baf8968ba2c8ff5b85fa87eb17a0f265 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <> Date: Thu, 3 Jun 2021 20:24:39 +0300 Subject: [PATCH 17/17] Addresing comments Ref: https://github.com/pandas-dev/pandas/pull/41310#discussion_r644939668 --- .github/workflows/pre-commit.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 429833d1652aa..723347913ac38 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,8 +2,6 @@ name: pre-commit on: pull_request: - paths-ignore: - - "doc/**" push: branches: [master]