Merge branch 'v0.8.0' into v0.8.0

.github/workflows/ci-bcf-pypi.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2 # https://github.com/actions/checkout
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
       - run: echo ${{ env.DATE }}
       - name: Get current date

.github/workflows/ci-bonsai-daily.yml

@@ -142,6 +142,12 @@ jobs:
           sverchok_zip="$(pwd)/dist/$(ls dist)"
           blender --command extension install-file -r user_default $sverchok_zip
 
+          # Install Sun Position extension.
+          blender --online-mode --command extension sync
+          blender --online-mode --background --python-expr "import bpy; \
+          bpy.ops.extensions.package_install(repo_index=0, pkg_id='sun_position'); \
+          bpy.ops.preferences.addon_enable(module='bl_ext.blender_org.sun_position'); bpy.ops.wm.save_userpref()"
+
           cd ../bonsai
           pip install pytest-blender
           blender --background --python scripts/setup_pytest.py

.github/workflows/ci-bonsai.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312]
+        pyver: [py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -32,15 +32,15 @@ jobs:
           }
           - {
             name: "Linux Build",
-            short_name: linux
+            short_name: linux,
           }
           - {
             name: "MacOS Build",
-            short_name: macos
+            short_name: macos,
           }
           - {
             name: "MacOS ARM Build",
-            short_name: macosm1
+            short_name: macosm1,
           }
     steps:
       - uses: actions/checkout@v2
@@ -53,8 +53,7 @@ jobs:
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
-          cd src/bonsai &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
       - name: Find zip file name
         id: find_zip
         run: |

.github/workflows/ci-ifcopenshell-docker.yml

@@ -93,7 +93,7 @@ jobs:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4.1.7
       with:
         # Artifact name
         name: ifcos-artifacts

README.md

@@ -12,7 +12,7 @@ is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending
 is possible at compile-time when using C++ and at run-time when using Python.
 
 In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), Bonsai (an add-on to Blender providing a graphical IFC authoring platform),
 and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
 
 For more information, see:
@@ -24,8 +24,8 @@ For more information, see:
   * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
 * [Bonsai Website](https://bonsaibim.org)
 * [Bonsai Documentation](https://docs.bonsaibim.org/index.html)
-  * [Add-on Installation](https://docs.bonsaibim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.bonsaibim.org/users/exploring_an_ifc_model.html)
+  * [Add-on Installation](https://docs.bonsaibim.org/quickstart/installation.html)
+  * [Exploring an IFC model](https://docs.bonsaibim.org/quickstart/explore_model.html)
  
 Development is sponsored through your generous donations!
 
@@ -37,7 +37,7 @@ Contents
 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
 | bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) |
-| blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=blenderbim-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| bonsai                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
 | bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
 | ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
 | ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |

VERSION

@@ -1 +1 @@
-0.7.11
+0.8.1

cmake/CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
-cmake_policy(SET CMP0078 OLD)
+cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0086 NEW)
 if (POLICY CMP0144)
     cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
@@ -730,6 +730,10 @@ if(MSVC)
     # endif()
 
 	add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
+	# See #5158.
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.40)
+		add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+	endif()
 else()
     add_definitions(-Wall -Wextra)
 

nix/build-all.py

@@ -81,7 +81,7 @@ ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
-OCCT_VERSION = "7.5.3"
+OCCT_VERSION = "7.8.1"
 BOOST_VERSION = "1.80.0"
 PCRE_VERSION = "8.41"
 LIBXML2_VERSION = "2.9.11"
@@ -351,6 +351,8 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
         run([git, "pull", clone_url], cwd=target_dir)
 
     if revision != None:
+        run([git, "reset", "--hard"], cwd=target_dir)
+        run([git, "fetch", "--all"], cwd=target_dir)
         run([git, "checkout", revision], cwd=target_dir)
 
 
@@ -588,6 +590,12 @@ if USE_OCCT and "occ" in targets:
     if OCCT_VERSION == "7.7.1":
         patches.append("./patches/occt/no_ExpToCasExe.patch")
     
+    if OCCT_VERSION == "7.7.2":
+        patches.append("./patches/occt/no_ExpToCasExe_7_7_2.patch")
+
+    if OCCT_VERSION == "7.8.1":
+        patches.append("./patches/occt/no_ExpToCasExe_7_8_1.patch")
+    
     if "wasm" in flags:
         patches.append("./patches/occt/no_em_js.patch")
 
@@ -963,7 +971,7 @@ if "IfcOpenShell-Python" in targets:
 
         logger.info(f"\rBuilding python {python_version} wrapper...   ")
 
-        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "_ifcopenshell_wrapper"], cwd=python_dir)
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper"], cwd=python_dir)
         run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))
 
         if python_executable:

nix/patches/occt/no_ExpToCasExe_7_7_2.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bacca1a48..11f931ad39 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -820,6 +820,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
++
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

nix/patches/occt/no_ExpToCasExe_7_8_1.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86905287dc..9d0bce984c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -828,6 +828,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
++
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

pyproject.toml

@@ -4,7 +4,7 @@ include = '''
     src/(
         bcf
         |bcfserver
-        |blenderbim
+        |bonsai
         |bsdd
         |foundationserver
         |ifc2ca

src/bonsai/Makefile

@@ -66,7 +66,11 @@ BLENDER_PLATFORM:=linux-x64
 endif
 
 ifeq ($(PLATFORM), macos)
+ifeq ($(PYVERSION), py311)
 PYPI_PLATFORM:=--platform macosx_10_10_x86_64
+else
+PYPI_PLATFORM:=--platform macosx_10_13_x86_64
+endif
 BLENDER_PLATFORM:=macos-x64
 endif
 
@@ -81,9 +85,12 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=d51fa2c
+OLD:=a51ed6e
 .PHONY: bump
 bump:
+ifndef NEW
+	$(error ERROR: 'NEW' variable is not set (should be set with new commmit hash). Example use for 'bump' command: 'make bump NEW=0123456'.)
+endif
 	cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 	cd ../ifcopenshell-python/ && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 
@@ -278,7 +285,7 @@ ifeq ($(PLATFORM), macosm1)
 	mv "$$prev_whl_name" "$$whl_name";
 
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
 	# Has only universal build.
@@ -288,7 +295,7 @@ ifeq ($(PLATFORM), macosm1)
 endif
 ifeq ($(PLATFORM), macos)
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
 	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \

src/bonsai/bonsai/__init__.py

@@ -56,7 +56,7 @@ bbim_semver: dict[str, Any] = {}
 
 # Accessed from bonsai dependency:
 last_error = None
-last_actions: deque = deque(maxlen=10)
+last_actions: deque = deque(maxlen=20)
 FIRST_INSTALLED_BBIM_VERSION: Union[str, None] = None
 REINSTALLED_BBIM_VERSION: Union[str, None] = None
 REGISTERED_BBIM_PACKAGE: str
@@ -329,7 +329,7 @@ if IN_BLENDER:
 
                 layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
                 op = layout.operator("bim.open_uri", text="How Can I Fix This?")
-                op.uri = "https://docs.bonsaibim.org/users/troubleshooting.html#installation-issues"
+                op.uri = "https://docs.bonsaibim.org/guides/troubleshooting.html#installation-issues"
 
                 layout.label(text="Try Reinstalling:", icon="IMPORT")
                 op = layout.operator("bim.open_uri", text="Re-download Add-on")

src/bonsai/bonsai/bim/__init__.py

@@ -144,7 +144,7 @@ classes = [
     # Project overview
     ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_spatial_decomposition,
+    ui.BIM_PT_tab_spatial,
     ui.BIM_PT_tab_project_setup,
     ui.BIM_PT_tab_geometry,
     ui.BIM_PT_tab_stakeholders,

src/bonsai/bonsai/bim/data/cache/.gitignore

@@ -1,2 +1,3 @@
 *
 !.gitignore
+!README.md

src/bonsai/bonsai/bim/data/cache/README.md

@@ -0,0 +1 @@
+This cache folder contains .h5 files. These files cache IFC geometry for performance only. You may safely clear the contents of this cache folder without losing data.