diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index ccb45df..5de9ce5 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -199,5 +199,6 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_API_TOKEN }} + skip-existing: true env: GITHUB_WORKFLOW_REF: 1.10.1 diff --git a/.gitmodules b/.gitmodules index a425167..6fb5dd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "image-registration"] path = image-registration url = https://git.pomppervova.nl/wim/image-registration.git -[submodule "libczirw-sys"] - path = libczirw-sys - url = https://git.pomppervova.nl/wim/libczirw-sys.git diff --git a/Cargo.toml b/Cargo.toml index 860601d..c984541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,22 +17,9 @@ categories = ["multimedia::images", "science"] [profile.test] inherits = "release" -# Full debug info goes in the TEST profile only (readable cargo-test -# backtraces). It must NOT be in the release profile: on ELF targets -# (Linux/musl wheels) the DWARF gets embedded in the .so (~160 MB, over -# PyPI's 100 MB limit) - MSVC puts it in a sidecar .pdb and the -# apple/zig link path drops it, which is why only the Linux wheels were -# bloated. debug = true [profile.release] [profile.dev.package.backtrace] opt-level = 3 - -# Build against the libczirw-sys checkout in the submodule of that name: -# its fixes (self-contained cmake build via vendored Eigen, msvc C runtime -# alignment for xwin, bindgen flags for zig's libc++) are not yet published -# to crates.io; drop this patch once a release containing them is available -[patch.crates-io] -libczirw-sys = { path = "libczirw-sys" } diff --git a/libczirw-sys b/libczirw-sys deleted file mode 160000 index 4d366d1..0000000 --- a/libczirw-sys +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d366d1272068bccbef9d559dc4165f2fa732c83 diff --git a/ndbioimage/Cargo.toml b/ndbioimage/Cargo.toml index 892411e..26870b8 100644 --- a/ndbioimage/Cargo.toml +++ b/ndbioimage/Cargo.toml @@ -28,7 +28,7 @@ image-registration = { path = "../image-registration", version = "0.1", optional indexmap = { version = "2", features = ["serde"] } indicatif = { version = "0.18", features = ["rayon"], optional = true } j4rs = { version = "0.25", optional = true } -libczirw-sys = { version = "0.5", optional = true } +libczirw-sys = { version = "0.5.2", optional = true } ndarray = { version = "0.17", features = ["serde"] } num = "0.4" numpy = { version = "0.29", optional = true }