From 17c7250be0f2a835d968a236163e7f7bb09f5dff Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 20 Sep 2021 17:21:19 -0700 Subject: [PATCH 01/11] Update database.yml --- .github/workflows/database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index cedc2b85c2794..5840a5066b184 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -79,7 +79,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: flexible + channel-priority: strict environment-file: ${{ matrix.ENV_FILE }} use-only-tar-bz2: true From 05d96b82bf0faf9aaa4bfc033919ebf55991681f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 20 Sep 2021 17:21:57 -0700 Subject: [PATCH 02/11] Update posix.yml --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index f37f31686ef69..4cab67b3831fc 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -70,7 +70,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: flexible + channel-priority: strict environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true From 4a1c017a6db6ac0a6277182a618d762a0df03361 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 20 Sep 2021 17:22:31 -0700 Subject: [PATCH 03/11] Update database.yml --- .github/workflows/database.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 5840a5066b184..6da47c86026ed 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - 1.3.x pull_request: branches: - master From 2be3ccf9563d13d7a5aff5e9b8f5c0596a7f57af Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 07:22:16 -0700 Subject: [PATCH 04/11] Update actions-38-minimum_versions.yaml --- ci/deps/actions-38-minimum_versions.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index d666bc3b555f5..4535a3df93b98 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -1,6 +1,7 @@ name: pandas-dev channels: - conda-forge + - defaults dependencies: - python=3.8.0 From c3bbabb9ba170b09339aaf7657fa350b58e1a2db Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 07:38:28 -0700 Subject: [PATCH 05/11] Update actions-38-minimum_versions.yaml --- ci/deps/actions-38-minimum_versions.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index 4535a3df93b98..d666bc3b555f5 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -1,7 +1,6 @@ name: pandas-dev channels: - conda-forge - - defaults dependencies: - python=3.8.0 From f435e4c3a337701bbb8f2992480116b4e5c0c3b3 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 07:42:49 -0700 Subject: [PATCH 06/11] Update posix.yml --- .github/workflows/posix.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 4cab67b3831fc..66c67f1620902 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -70,10 +70,19 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: strict + channel-priority: flexible environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true + - name: Export env file + run: conda env export -n pandas-dev > myenv.yml + + - name: Upload env file + uses: actions/upload-artifact@master + with: + name: Env file + path: myenv.yml + - name: Build Pandas uses: ./.github/actions/build_pandas From 57697039fb1f0b9d6387c1d21f39e36b2cfa08ad Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 19:54:18 -0700 Subject: [PATCH 07/11] Update posix.yml --- .github/workflows/posix.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 66c67f1620902..ee912a45f1141 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -70,18 +70,9 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: flexible + channel-priority: strict environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true - - - name: Export env file - run: conda env export -n pandas-dev > myenv.yml - - - name: Upload env file - uses: actions/upload-artifact@master - with: - name: Env file - path: myenv.yml - name: Build Pandas uses: ./.github/actions/build_pandas From 2db60b82cc21d6cb2b2f16091bed8e302e4bad50 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 19:54:55 -0700 Subject: [PATCH 08/11] Update posix.yml --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index ee912a45f1141..4cab67b3831fc 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -73,7 +73,7 @@ jobs: channel-priority: strict environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true - + - name: Build Pandas uses: ./.github/actions/build_pandas From f756bb5262be5605e2c1613894a3820d9e3c2058 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 19:57:33 -0700 Subject: [PATCH 09/11] Update actions-38-minimum_versions.yaml --- ci/deps/actions-38-minimum_versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index d666bc3b555f5..f4cf39a34f7a6 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -2,7 +2,7 @@ name: pandas-dev channels: - conda-forge dependencies: - - python=3.8.0 + - python=3.8 # tools - cython=0.29.21 From 09ae08eac067e67aa00f1a9d2a656fab8f477d26 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 20:14:31 -0700 Subject: [PATCH 10/11] Update actions-38-minimum_versions.yaml --- ci/deps/actions-38-minimum_versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index f4cf39a34f7a6..d666bc3b555f5 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -2,7 +2,7 @@ name: pandas-dev channels: - conda-forge dependencies: - - python=3.8 + - python=3.8.0 # tools - cython=0.29.21 From 607e6d51d884f7869b4a9299eea2708f96b5f363 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 21 Sep 2021 20:14:58 -0700 Subject: [PATCH 11/11] Update posix.yml --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 4cab67b3831fc..f37f31686ef69 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -70,7 +70,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: strict + channel-priority: flexible environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true