From f9e0d0bb30cdbc0ce900fb4fea08a28c14e0ab54 Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Fri, 11 Oct 2024 22:17:57 +0000 Subject: [PATCH 1/6] Bumpy numpy version to support `numpy>2` --- Cargo.toml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b5624ca..0820973 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,8 @@ name = "dmap" crate-type = ["cdylib", "rlib"] [dependencies] -pyo3 = { version = "0.21.0", features = ["extension-module", "indexmap", "abi3-py38"] } -numpy = "0.21.0" +pyo3 = { version = "0.22.3", features = ["extension-module", "indexmap", "abi3-py38"] } +numpy = "0.22.0" indexmap = "2.3.0" itertools = "0.13.0" rayon = "1.10.0" diff --git a/pyproject.toml b/pyproject.toml index f5f0660..6674e97 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Rust" ] -dependencies = ["numpy<2"] +dependencies = ["numpy<3"] [tool.maturin] bindings = "pyo3" From f1b9439ba6b8250e4a265371900a22f1f9e70f76 Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Fri, 11 Oct 2024 22:23:30 +0000 Subject: [PATCH 2/6] Patch for broken maturin-action. * See https://github.com/PyO3/maturin-action/issues/291 --- .github/workflows/CI.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 39fbcf2..30aaeb4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -146,6 +146,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.x - name: Build sdist uses: PyO3/maturin-action@v1 with: @@ -167,6 +170,9 @@ jobs: environment: release steps: - uses: actions/download-artifact@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.x - name: Publish to PyPI uses: PyO3/maturin-action@v1 with: From fde8984d89f3f655e2878b8a9f29654632bd7bd0 Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Fri, 11 Oct 2024 22:29:36 +0000 Subject: [PATCH 3/6] Attempting CI fix using solution of https://github.com/sfackler/rust-openssl/issues/2036#issuecomment-1724324145 --- .github/workflows/CI.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 30aaeb4..14ba8e7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,8 +47,22 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist --zig -# sccache: 'true' + sccache: 'true' manylinux: auto + before-script-linux: | + # If we're running on rhel centos, install needed packages. + if command -v yum &> /dev/null; then + yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic + + # If we're running on i686 we need to symlink libatomic + # in order to build openssl with -latomic flag. + if [[ ! -d "/usr/lib64" ]]; then + ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so + fi + else + # If we're running on debian-based system. + apt update -y && apt-get install -y libssl-dev openssl pkg-config + fi - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -79,7 +93,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'true' manylinux: musllinux_1_2 - name: Upload wheels uses: actions/upload-artifact@v4 @@ -108,7 +122,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -135,7 +149,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v4 with: From 5f6c5b940d8d0cce2ae389ffddd9deb01108e972 Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Tue, 15 Oct 2024 13:02:10 -0600 Subject: [PATCH 4/6] Another crack at Github actions failure --- .github/workflows/CI.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 14ba8e7..f53a3c2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,19 +50,7 @@ jobs: sccache: 'true' manylinux: auto before-script-linux: | - # If we're running on rhel centos, install needed packages. - if command -v yum &> /dev/null; then - yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic - - # If we're running on i686 we need to symlink libatomic - # in order to build openssl with -latomic flag. - if [[ ! -d "/usr/lib64" ]]; then - ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so - fi - else - # If we're running on debian-based system. - apt update -y && apt-get install -y libssl-dev openssl pkg-config - fi + sudo apt update -y && sudo apt-get install -y libssl-dev openssl pkg-config - name: Upload wheels uses: actions/upload-artifact@v4 with: From f3f8a8ffc0d84dab44ad1fb460c1b56414d29b9b Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Tue, 15 Oct 2024 13:05:59 -0600 Subject: [PATCH 5/6] Disable sccache in CI.yml --- .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 f53a3c2..a5c46fe 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist --zig - sccache: 'true' +# sccache: 'true' manylinux: auto before-script-linux: | sudo apt update -y && sudo apt-get install -y libssl-dev openssl pkg-config @@ -81,7 +81,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist - sccache: 'true' +# sccache: 'true' manylinux: musllinux_1_2 - name: Upload wheels uses: actions/upload-artifact@v4 @@ -110,7 +110,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist - sccache: 'true' +# sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -137,7 +137,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist - sccache: 'true' +# sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v4 with: From ab933bd6777a2ede2ae01e9ebc022662be5bd840 Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Tue, 15 Oct 2024 13:18:18 -0600 Subject: [PATCH 6/6] sccache still failed - another attempt at disabling --- .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 a5c46fe..4c2321f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist --zig -# sccache: 'true' + sccache: 'false' manylinux: auto before-script-linux: | sudo apt update -y && sudo apt-get install -y libssl-dev openssl pkg-config @@ -81,7 +81,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'false' manylinux: musllinux_1_2 - name: Upload wheels uses: actions/upload-artifact@v4 @@ -110,7 +110,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'false' - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -137,7 +137,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist -# sccache: 'true' + sccache: 'false' - name: Upload wheels uses: actions/upload-artifact@v4 with: