From fa8755df26fe21953c4424453120afd5215fa324 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 4 Nov 2022 20:51:34 -0400 Subject: [PATCH 1/7] CI: Fix wheel builder uploading --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f41d6eebef302..0719b52fefc08 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp38", "pp39"] env: IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} - IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + IS_SCHEDULE_DISPATCH: true #${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} steps: - name: Checkout pandas uses: actions/checkout@v3 From da375e7163f3aa993b3a1103eb1060ce01d859ad Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 06:42:02 -0400 Subject: [PATCH 2/7] Maybe fix? --- .github/workflows/wheels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 0719b52fefc08..9e799dde3ea7b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -97,7 +97,8 @@ jobs: # Really doesn't matter what version we upload with # just the version we test with python-version: '3.8' - channels: conda-forge + activate-environment: test + channels: conda-forge, anaconda channel-priority: true mamba-version: "*" From 149c9817a26839f8ac56797590e30d8c7a7773c2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 07:15:34 -0400 Subject: [PATCH 3/7] Update wheels.yml --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9e799dde3ea7b..07e7f9760152d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -104,6 +104,7 @@ jobs: - name: Install anaconda client if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} + shell: bash -el {0} run: conda install -q -y anaconda-client @@ -181,6 +182,7 @@ jobs: - name: Install anaconda client if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} + shell: bash -el {0} run: | conda install -q -y anaconda-client From 83598be06947b106bdbf1038539d75cdd99f4942 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 07:56:33 -0400 Subject: [PATCH 4/7] Update wheels.yml --- .github/workflows/wheels.yml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 07e7f9760152d..b585a24f2ea36 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp38", "pp39"] env: IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} - IS_SCHEDULE_DISPATCH: true #${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} steps: - name: Checkout pandas uses: actions/checkout@v3 @@ -72,10 +72,20 @@ jobs: env: CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }} - # Used to test the built wheels - - uses: actions/setup-python@v4 + # Used to test(Windows-only) and push the built wheels + # You might need to use setup-python separately + # if the new Python-dev version + # is unavailable on conda-forge. + - uses: conda-incubator/setup-miniconda@v2 with: + auto-update-conda: true + # Really doesn't matter what version we upload with + # just the version we test with python-version: ${{ matrix.python[1] }} + activate-environment: test + channels: conda-forge, anaconda + channel-priority: true + mamba-version: "*" - name: Test wheels (Windows 64-bit only) if: ${{ matrix.buildplat[1] == 'win_amd64' }} @@ -88,20 +98,6 @@ jobs: name: ${{ matrix.python[0] }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} path: ./wheelhouse/*.whl - # Used to push the built wheels - # TODO: once Python 3.11 is available on conda, de-dup with - # setup python above - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - # Really doesn't matter what version we upload with - # just the version we test with - python-version: '3.8' - activate-environment: test - channels: conda-forge, anaconda - channel-priority: true - mamba-version: "*" - - name: Install anaconda client if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} shell: bash -el {0} From 0a2a038f943283700fdb80650b27a4f4fa5799bd Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 08:02:10 -0400 Subject: [PATCH 5/7] restrict upload conditions --- .github/workflows/wheels.yml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b585a24f2ea36..36c02d7b4b334 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp38", "pp39"] env: IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} - IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + IS_SCHEDULE_DISPATCH: true #${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} steps: - name: Checkout pandas uses: actions/checkout@v3 @@ -72,20 +72,10 @@ jobs: env: CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }} - # Used to test(Windows-only) and push the built wheels - # You might need to use setup-python separately - # if the new Python-dev version - # is unavailable on conda-forge. - - uses: conda-incubator/setup-miniconda@v2 + # Used to test the built wheels + - uses: actions/setup-python@v4 with: - auto-update-conda: true - # Really doesn't matter what version we upload with - # just the version we test with python-version: ${{ matrix.python[1] }} - activate-environment: test - channels: conda-forge, anaconda - channel-priority: true - mamba-version: "*" - name: Test wheels (Windows 64-bit only) if: ${{ matrix.buildplat[1] == 'win_amd64' }} @@ -98,6 +88,20 @@ jobs: name: ${{ matrix.python[0] }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} path: ./wheelhouse/*.whl + # Used to push the built wheels + # TODO: once Python 3.11 is available on conda, de-dup with + # setup python above + - uses: conda-incubator/setup-miniconda@v2 + with: + auto-update-conda: true + # Really doesn't matter what version we upload with + # just the version we test with + python-version: '3.8' + activate-environment: test + channels: conda-forge, anaconda + channel-priority: true + mamba-version: "*" + - name: Install anaconda client if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} shell: bash -el {0} @@ -105,7 +109,7 @@ jobs: - name: Upload wheels - if: success() + if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} shell: bash -el {0} env: PANDAS_STAGING_UPLOAD_TOKEN: ${{ secrets.PANDAS_STAGING_UPLOAD_TOKEN }} @@ -183,7 +187,7 @@ jobs: conda install -q -y anaconda-client - name: Upload sdist - if: success() + if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} shell: bash -el {0} env: PANDAS_STAGING_UPLOAD_TOKEN: ${{ secrets.PANDAS_STAGING_UPLOAD_TOKEN }} From 4d36171f6b932262fcedbed0563c0ecd49177900 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 08:04:08 -0400 Subject: [PATCH 6/7] Update wheels.yml --- .github/workflows/wheels.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 36c02d7b4b334..09b75e46bcaa8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -71,11 +71,21 @@ jobs: uses: pypa/cibuildwheel@v2.9.0 env: CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }} - - # Used to test the built wheels - - uses: actions/setup-python@v4 + + # Used to test(Windows-only) and push the built wheels + # You might need to use setup-python separately + # if the new Python-dev version + # is unavailable on conda-forge. + - uses: conda-incubator/setup-miniconda@v2 with: + auto-update-conda: true + # Really doesn't matter what version we upload with + # just the version we test with python-version: ${{ matrix.python[1] }} + activate-environment: test + channels: conda-forge, anaconda + channel-priority: true + mamba-version: "*" - name: Test wheels (Windows 64-bit only) if: ${{ matrix.buildplat[1] == 'win_amd64' }} @@ -88,19 +98,6 @@ jobs: name: ${{ matrix.python[0] }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} path: ./wheelhouse/*.whl - # Used to push the built wheels - # TODO: once Python 3.11 is available on conda, de-dup with - # setup python above - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - # Really doesn't matter what version we upload with - # just the version we test with - python-version: '3.8' - activate-environment: test - channels: conda-forge, anaconda - channel-priority: true - mamba-version: "*" - name: Install anaconda client if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }} From 71b2b0063f2fcb7b98ff8f766c84455a667d19ab Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sat, 5 Nov 2022 09:42:38 -0400 Subject: [PATCH 7/7] Update wheels.yml --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 09b75e46bcaa8..0ece7a11fa2bb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]# "pp38", "pp39"] env: IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} - IS_SCHEDULE_DISPATCH: true #${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} steps: - name: Checkout pandas uses: actions/checkout@v3