v3.3.2 (#1428)

* try and fix build_wheels

* bump oneTBB version

* prod SDist

Author: elalish

.github/workflows/build_wheels.yml

@@ -39,7 +39,7 @@ jobs:
       run: |
         # FIXME: why doesn't scikit_build_core automatically download ninja?
         sudo apt-get update
-        sudo apt-get install ninja-build
+        sudo apt-get install ninja-build libtbb-dev
         pip wheel dist/*.tar.gz
     - uses: actions/upload-artifact@v4
       with:

CMakeLists.txt

@@ -30,7 +30,7 @@ include(CMakeDependentOption)
 # Define Manifold version
 set(MANIFOLD_VERSION_MAJOR 3)
 set(MANIFOLD_VERSION_MINOR 3)
-set(MANIFOLD_VERSION_PATCH 1)
+set(MANIFOLD_VERSION_PATCH 2)
 set(
   MANIFOLD_VERSION
   "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}"

RELEASE_CHECKLIST.md

@@ -6,7 +6,7 @@
 1. Make a new branch called the version, e.g. v2.3.0.
 1. Use VSCode to search and replace the old version with the new - so far in test-cmake.sh, flake.nix, pyproject.toml, and package.json.
 1. Also update CMakeLists.txt version by searching for "set(MANIFOLD_VERSION_".
-1. Commit, push, open a PR, verify tests pass, manually trigger PyPI CI, merge.
+1. Commit, push, open a PR, verify tests pass, manually trigger build_wheels CI, merge.
 1. On Github, draft a new release, make a new tag with the version number, add release notes, and publish.
 1. Check the Actions and verify that both PyPI and npm publishing actions ran successfully.
 1. Verify the npm [package](https://www.npmjs.com/package/manifold-3d?activeTab=code) looks good - unpacked size should be close to 1MB.

bindings/wasm/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "manifold-3d",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Geometry library for topological robustness",
   "main": "manifold.js",
   "bin": {

bindings/wasm/package.json

@@ -72,7 +72,7 @@ if(MANIFOLD_PAR)
     FetchContent_Declare(
       TBB
       GIT_REPOSITORY https://github.com/oneapi-src/oneTBB.git
-      GIT_TAG v2022.0.0
+      GIT_TAG v2022.3.0
       GIT_PROGRESS TRUE
     )
     FetchContent_MakeAvailable(TBB)

cmake/manifoldDeps.cmake

@@ -29,7 +29,7 @@
     flake-utils.lib.eachDefaultSystem
       (system:
       let
-        manifold-version = "3.3.1";
+        manifold-version = "3.3.2";
         pkgs = import nixpkgs {
           inherit system;
           overlays = [

flake.nix

@@ -1,6 +1,6 @@
 [project]
 name = "manifold3d"
-version = "3.3.1"
+version = "3.3.2"
 authors = [
   { name="Emmett Lalish", email="elalish@gmail.com" },
 ]
@@ -58,10 +58,10 @@ musllinux-x86_64-image = "musllinux_1_2"
 skip = ["*-win32", "*_i686", "pp*", "*-musllinux*"]
 
 # only clone TBB once
-before-all = "git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-src/oneTBB.git"
+before-all = "git clone --depth 1 --branch v2022.3.0 https://github.com/oneapi-src/oneTBB.git"
 [tool.cibuildwheel.config-settings]
 "cmake.define.FETCHCONTENT_SOURCE_DIR_TBB" = "./oneTBB"
-"cmake.define.MANIFOLD_DOWNLOADS" = "OFF"
+"cmake.define.MANIFOLD_USE_BUILTIN_TBB" = "ON"
 
 [tool.cibuildwheel.macos]
 environment = "MACOSX_DEPLOYMENT_TARGET=10.14"

pyproject.toml

@@ -5,7 +5,7 @@ cd cmake-consumer
 cat <<EOT > CMakeLists.txt
 cmake_minimum_required(VERSION 3.18)
 project(testing LANGUAGES CXX)
-find_package(manifold "3.3.1" REQUIRED)
+find_package(manifold "3.3.2" REQUIRED)
 add_executable(testing test.cpp)
 target_link_libraries(testing PRIVATE manifold::manifold)
 EOT
@@ -14,7 +14,7 @@ cat <<EOT > test.cpp
 #include <manifold/manifold.h>
 #include <manifold/version.h>
 
-#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 3, 1)
+#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 3, 2)
 # error "Unexpected: minimum version number not available"
 #endif