From b225ad5c844be1d10aa2bf0160b0753454ef57dd Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Feb 2025 19:19:48 +0200 Subject: [PATCH 1/8] Fixed typo in HashConcatStr --- polars_hash/Cargo.toml | 2 +- polars_hash/polars_hash/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/polars_hash/Cargo.toml b/polars_hash/Cargo.toml index fd77407..192bd5d 100644 --- a/polars_hash/Cargo.toml +++ b/polars_hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polars_hash" -version = "0.5.2" +version = "0.5.3" edition = "2021" [lib] diff --git a/polars_hash/polars_hash/__init__.py b/polars_hash/polars_hash/__init__.py index 756a80f..bc7e1b1 100644 --- a/polars_hash/polars_hash/__init__.py +++ b/polars_hash/polars_hash/__init__.py @@ -299,7 +299,7 @@ def __call__( self, exprs: IntoExpr | Iterable[IntoExpr], *more_exprs: IntoExpr, - seperator: str = "", + separator: str = "", ) -> HExpr: ... def __getattr__(self, name: str) -> pl.Expr: ... From 501912d95c3e8a0b64eca190cbce6be7bfb67244 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Feb 2025 19:35:29 +0200 Subject: [PATCH 2/8] Added ignore_nulls argument to HashConcatStr.__call__ --- polars_hash/polars_hash/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/polars_hash/polars_hash/__init__.py b/polars_hash/polars_hash/__init__.py index bc7e1b1..dec2158 100644 --- a/polars_hash/polars_hash/__init__.py +++ b/polars_hash/polars_hash/__init__.py @@ -300,6 +300,7 @@ def __call__( exprs: IntoExpr | Iterable[IntoExpr], *more_exprs: IntoExpr, separator: str = "", + ignore_nulls: bool = False, ) -> HExpr: ... def __getattr__(self, name: str) -> pl.Expr: ... From c061697800d036f238810330dc173f1b8701cfc2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 Feb 2025 20:14:50 +0200 Subject: [PATCH 3/8] Try to solve CI problem --- polars_hash/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/polars_hash/pyproject.toml b/polars_hash/pyproject.toml index 1cbdf0a..e877bec 100644 --- a/polars_hash/pyproject.toml +++ b/polars_hash/pyproject.toml @@ -18,6 +18,7 @@ authors = [ ] description = "Stable non-cryptographic and cryptographic hashing functions for Polars" readme = "README.md" +dynamic = ["version"] [project.urls] "Homepage" = "https://github.com/ion-elgreco/polars-hash" From a4ec9c8c0b7cc344176ade2e1aa77153af21e0c1 Mon Sep 17 00:00:00 2001 From: Ion Koutsouris <15728914+ion-elgreco@users.noreply.github.com> Date: Fri, 7 Feb 2025 09:00:51 +0100 Subject: [PATCH 4/8] Update CI.yml --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b52f0f4..e070ae1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -109,7 +109,7 @@ jobs: args: --release --out dist --find-interpreter --manifest-path polars_hash/Cargo.toml sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v44 with: name: wheels path: dist @@ -135,7 +135,7 @@ jobs: if: "startsWith(github.ref, 'refs/tags/')" needs: [linux_tests, linux, macos, windows, sdist] steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: wheels - name: Publish to PyPI @@ -144,4 +144,4 @@ jobs: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} with: command: upload - args: --non-interactive --skip-existing * \ No newline at end of file + args: --non-interactive --skip-existing * From 7e0b57d5888dc03eb6261f0d8c8308586864080b Mon Sep 17 00:00:00 2001 From: Ion Koutsouris <15728914+ion-elgreco@users.noreply.github.com> Date: Fri, 7 Feb 2025 09:02:26 +0100 Subject: [PATCH 5/8] Update CI.yml --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e070ae1..670f3c8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -64,7 +64,7 @@ jobs: sccache: 'true' manylinux: auto - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -87,7 +87,7 @@ jobs: args: --release --out dist --find-interpreter --manifest-path polars_hash/Cargo.toml sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -124,7 +124,7 @@ jobs: command: sdist args: --out dist --manifest-path polars_hash/Cargo.toml - name: Upload sdist - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist From e231bbf843d64f5c4cc3d481e8503145ef834549 Mon Sep 17 00:00:00 2001 From: Ion Koutsouris <15728914+ion-elgreco@users.noreply.github.com> Date: Fri, 7 Feb 2025 09:03:26 +0100 Subject: [PATCH 6/8] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 670f3c8..380aea3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -109,7 +109,7 @@ jobs: args: --release --out dist --find-interpreter --manifest-path polars_hash/Cargo.toml sccache: 'true' - name: Upload wheels - uses: actions/upload-artifact@v44 + uses: actions/upload-artifact@v4 with: name: wheels path: dist From ab79c6156285c4b40f98fb5e11b81003b3844910 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 10 Feb 2025 18:37:49 +0200 Subject: [PATCH 7/8] Try to solve CI problem, following upload-artifact's MIGRATION.md --- .github/workflows/CI.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 380aea3..8b4c004 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -66,7 +66,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-linux-${{ matrix.target }} path: dist windows: @@ -89,7 +89,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-windows-${{ matrix.target }} path: dist macos: @@ -111,7 +111,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-macos-${{ matrix.target }} path: dist sdist: @@ -126,14 +126,24 @@ jobs: - name: Upload sdist uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-sdist path: dist + merge_wheels: + runs-on: ubuntu-latest + needs: [linux_tests, linux, macos, windows, sdist] + steps: + - name: Merge wheels + uses: actions/upload-artifacts/merge@v4 + with: + name: wheels + pattern: wheels-* + release: name: Release runs-on: ubuntu-latest if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux_tests, linux, macos, windows, sdist] + needs: [linux_tests, linux, macos, windows, sdist, merge_wheels] steps: - uses: actions/download-artifact@v4 with: From 44c94e5213c32a42473d29ed9e5e94e2e0d103ae Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 10 Feb 2025 18:53:28 +0200 Subject: [PATCH 8/8] actions typo --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8b4c004..232c3c2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -134,7 +134,7 @@ jobs: needs: [linux_tests, linux, macos, windows, sdist] steps: - name: Merge wheels - uses: actions/upload-artifacts/merge@v4 + uses: actions/upload-artifact/merge@v4 with: name: wheels pattern: wheels-*