From a505ba897816fc91435d0ede0dbc73122b7424cf Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:40:48 +0000 Subject: [PATCH 01/11] bump upload-artifact@v3 to v4 --- .github/workflows/release_python.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index 7199eaad1..130c77dd5 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -49,9 +49,9 @@ jobs: command: sdist args: -o dist - name: Upload sdist - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-sdist path: bindings/python/dist wheels: @@ -84,9 +84,9 @@ jobs: # Workaround ring 0.17 build issue CFLAGS_aarch64_unknown_linux_gnu: "-D__ARM_ARCH=8" - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.os }} path: bindings/python/dist pypi-publish: @@ -105,9 +105,10 @@ jobs: steps: - name: Download all the dists - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-* + merge-multiple: true path: bindings/python/dist - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -132,7 +133,7 @@ jobs: steps: - name: Download all the dists - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels path: bindings/python/dist From e57dfec0c71aac1fbec6de385ec3a2822319761c Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:48:37 +0000 Subject: [PATCH 02/11] set pyiceberg_core version to 0.1.0 --- bindings/python/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml index c2769d8c3..64c992c9d 100644 --- a/bindings/python/Cargo.toml +++ b/bindings/python/Cargo.toml @@ -17,7 +17,7 @@ [package] name = "pyiceberg_core_rust" -version = "0.0.1" +version = "0.1.0" edition = "2021" homepage = "https://rust.iceberg.apache.org" rust-version = "1.77.1" From 1287a6d32d87e7d0853366415319743c8ef5103e Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:16:53 +0000 Subject: [PATCH 03/11] fix --- .github/workflows/release_python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index 130c77dd5..4fc6d3eaa 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -136,6 +136,7 @@ jobs: uses: actions/download-artifact@v4 with: name: wheels + merge-multiple: true path: bindings/python/dist - name: Publish to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 From 9e96f82bb9371ce7baf42255683b8404b1ab45f1 Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:26:05 +0000 Subject: [PATCH 04/11] test publishing to pypi --- .github/workflows/release_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index 4fc6d3eaa..def369c51 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -122,7 +122,7 @@ jobs: needs: [ sdist, linux ] runs-on: ubuntu-latest # Only publish to TestPyPi if the tag is a pre-release - if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} + # if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} environment: name: testpypi From 4294cf02d016f42bc1242d81b1ce21821348b9af Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:32:29 +0000 Subject: [PATCH 05/11] fix --- .github/workflows/release_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index def369c51..37413ea97 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -119,7 +119,7 @@ jobs: testpypi-publish: name: Publish Python 🐍 distribution 📦 to TestPypi - needs: [ sdist, linux ] + needs: [ sdist, wheels ] runs-on: ubuntu-latest # Only publish to TestPyPi if the tag is a pre-release # if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} From 31058a0ee7935f07d12b27a8add8827a4595f9cd Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:39:59 +0000 Subject: [PATCH 06/11] fix --- .github/workflows/release_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index 37413ea97..495bfa70e 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -86,7 +86,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-${{ matrix.os }} + name: wheels-${{ matrix.os }}-${{ matrix.target }} path: bindings/python/dist pypi-publish: From 6157b41045e923719a5cb1f30e035d3a737c38bc Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:52:37 +0000 Subject: [PATCH 07/11] fix --- .github/workflows/release_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index 495bfa70e..ac1a9dae0 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -135,7 +135,7 @@ jobs: - name: Download all the dists uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-* merge-multiple: true path: bindings/python/dist - name: Publish to TestPyPI From abc8d0dc4e34dbb6d94efade938c9e5f399e55cd Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:04:50 +0000 Subject: [PATCH 08/11] use pattern --- .github/workflows/release_python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index ac1a9dae0..ecedfb8a5 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -107,7 +107,7 @@ jobs: - name: Download all the dists uses: actions/download-artifact@v4 with: - name: wheels-* + pattern: wheels-* merge-multiple: true path: bindings/python/dist - name: Publish to PyPI @@ -135,7 +135,7 @@ jobs: - name: Download all the dists uses: actions/download-artifact@v4 with: - name: wheels-* + pattern: wheels-* merge-multiple: true path: bindings/python/dist - name: Publish to TestPyPI From 9867dd2fdeb0239abf1239064973fccb6a37ddc4 Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:23:37 +0000 Subject: [PATCH 09/11] test trigger event on fork --- .github/workflows/release_python.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index ecedfb8a5..d77df48f7 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -21,6 +21,8 @@ on: push: tags: - '*' + branches: + - bump-version-upload-artifact pull_request: branches: - main @@ -123,7 +125,7 @@ jobs: runs-on: ubuntu-latest # Only publish to TestPyPi if the tag is a pre-release # if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} - + if: github.event_name == 'push' environment: name: testpypi url: https://test.pypi.org/p/pyiceberg_core From c4a17b99c271c555468d42bc9d469e74e53ec830 Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:34:35 +0000 Subject: [PATCH 10/11] use 0.1.0 --- bindings/python/pyproject.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index 058415a1b..c0ade9398 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -21,7 +21,7 @@ build-backend = "maturin" [project] name = "pyiceberg_core" -version = "0.0.1" +version = "0.1.0" readme = "project-description.md" classifiers = [ "Development Status :: 4 - Beta", @@ -43,11 +43,7 @@ module-name = "pyiceberg_core.pyiceberg_core_rust" ignore = ["F403", "F405"] [tool.hatch.envs.dev] -dependencies = [ - "maturin>=1.0,<2.0", - "pytest>=8.3.2", - "pyarrow>=17.0.0", -] +dependencies = ["maturin>=1.0,<2.0", "pytest>=8.3.2", "pyarrow>=17.0.0"] [tool.hatch.envs.dev.scripts] develop = "maturin develop" From 654997b7962472f5c8169a35289551b4e78f7da4 Mon Sep 17 00:00:00 2001 From: Sung Yun <107272191+sungwy@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:47:16 +0000 Subject: [PATCH 11/11] remove temporary hacks for publishing from fork --- .github/workflows/release_python.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_python.yml b/.github/workflows/release_python.yml index d77df48f7..cf606f611 100644 --- a/.github/workflows/release_python.yml +++ b/.github/workflows/release_python.yml @@ -21,8 +21,6 @@ on: push: tags: - '*' - branches: - - bump-version-upload-artifact pull_request: branches: - main @@ -124,8 +122,8 @@ jobs: needs: [ sdist, wheels ] runs-on: ubuntu-latest # Only publish to TestPyPi if the tag is a pre-release - # if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} - if: github.event_name == 'push' + if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')}} + environment: name: testpypi url: https://test.pypi.org/p/pyiceberg_core