try to catch bug in assign_product

2026-08-06 16:01:36 +00:00 · 2025-11-14 19:28:04 +05:00
2014 changed files with 61368 additions and 182012 deletions
@@ -1,12 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/0.24.0/gersemi/configuration.schema.json
-
-# Gersemi doesn't support autodetection of macros/functions from other files or from the current one
-# and requires to explicitly list directories/cmake files that define them.
-definitions: ["./cmake", "./src"]
-disable_formatting: false
-extensions: []
-indent: 4
-line_length: 120
-list_expansion: favour-inlining
-unsafe: false
-warn_about_unknown_commands: true
@@ -1,12 +0,0 @@
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"
@@ -1,95 +0,0 @@
-#!/usr/bin/env -S uv run
-# /// script
-# dependencies = [
-#     "PyGithub",
-#     "requests",
-# ]
-# ///
-
-import os
-from pathlib import Path
-
-import requests
-from github import Github
-from github.GitReleaseAsset import GitReleaseAsset
-
-EXTENSION_ID = "bonsai"
-CURRENT_PYTHON_VERSION = "py313"
-CURRENT_PLATFORMS = ["linux-x64", "macos-arm64", "windows-x64"]
-
-
-def publish_asset(asset: GitReleaseAsset, token: str, repo_root: Path) -> None:
-    """
-    Publish an asset to Blender Extensions.
-    Reference: https://extensions.blender.org/api/v1/swagger
-    """
-    temp_path = repo_root / asset.name
-
-    response = requests.get(asset.browser_download_url)
-    response.raise_for_status()
-    temp_path.write_bytes(response.content)
-
-    url = f"https://extensions.blender.org/api/v1/extensions/{EXTENSION_ID}/versions/upload/"
-    headers = {"Authorization": f"Bearer {token}"}
-
-    files = {"version_file": temp_path.read_bytes()}
-    response = requests.post(url, headers=headers, files=files)
-    response.raise_for_status()
-
-    temp_path.unlink()
-
-    print(f"✓ Published {asset.name}")
-
-
-def main() -> None:
-    token = os.getenv("BLENDER_EXTENSIONS_TOKEN")
-    if not token:
-        raise Exception("BLENDER_EXTENSIONS_TOKEN environment variable not set")
-
-    # Get the repository root
-    repo_root = Path(__file__).parent.parent.parent
-
-    # Read VERSION file
-    version_file = repo_root / "VERSION"
-    version = version_file.read_text().strip()
-
-    print(f"Current VERSION: {version}")
-
-    tag_name = f"bonsai-{version}"
-
-    # Get release from GitHub
-    gh = Github()
-    gh_repo = gh.get_repo("IfcOpenShell/IfcOpenShell")
-    release = gh_repo.get_release(tag_name)
-
-    assets = release.get_assets()
-
-    asset_platform_map: dict[str, tuple[GitReleaseAsset, str]] = {}
-    for asset in assets:
-        if CURRENT_PYTHON_VERSION not in asset.name:
-            continue
-        for platform in CURRENT_PLATFORMS:
-            if platform in asset.name:
-                asset_platform_map[asset.name] = (asset, platform)
-                break
-
-    if len(asset_platform_map) != len(CURRENT_PLATFORMS):
-        found_platforms = {platform for _, (_, platform) in asset_platform_map.items()}
-        missing_platforms = set(CURRENT_PLATFORMS) - found_platforms
-        raise Exception(
-            f"Expected {len(CURRENT_PLATFORMS)} assets but found {len(asset_platform_map)}. "
-            f"Missing: {', '.join(sorted(missing_platforms))}"
-        )
-
-    print("\nRelease assets:")
-    for asset_name in sorted(asset_platform_map.keys()):
-        print(f"- {asset_name}")
-
-    # https://extensions.blender.org/api/v1/swagger
-    print("\nPublishing assets to Blender Extensions:")
-    for asset_name, (asset, platform) in asset_platform_map.items():
-        publish_asset(asset, token, repo_root)
-
-
-if __name__ == "__main__":
-    main()
@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-import json
-import os
-import sys
-from typing import TypedDict
-
-import github_action_utils as gha_utils
-
-
-class Entry(TypedDict):
-    location: Location
-
-
-class Location(TypedDict):
-    path: str
-    lines: Lines
-
-
-class Lines(TypedDict):
-    begin: int
-    end: int
-
-
-json_data: list[Entry] = json.load(sys.stdin)
-
-if os.getenv("RUNNER_DEBUG"):
-    print("Debug: Black formatting JSON data:")
-    print(json.dumps(json_data, indent=2))
-
-for change in json_data:
-    location = change["location"]
-    path = location["path"]
-    lines = location["lines"]
-    gha_utils.error(
-        f"Black formatting issue in {path}",
-        title="Black Format Issue",
-        file=path,
-        line=lines["begin"],
-        end_line=lines["end"],
-    )
@@ -21,12 +21,12 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
@@ -40,8 +40,6 @@ jobs:
          # preinstalled: xz, cmake
          brew install git bison autoconf automake libffi findutils
          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-          # Mac is using bison 2.5 by default, but we need 3.5+ for swig.
-          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH

      - name: Install aws cli
        run: |
@@ -49,11 +47,11 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          cd build
-          python ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: mac-${{ matrix.arch }}

@@ -83,7 +81,7 @@ jobs:

      - name: Upload Build Logs
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
        with:
          name: build-logs-osx-${{ matrix.arch }}
          path: |
@@ -95,7 +93,9 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd build
-          python ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -139,7 +139,7 @@ jobs:
          cd ..

      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -9,13 +9,13 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          submodules: recursive
          path: IfcOpenShell

      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
          path: ifcopenshell_build
@@ -26,10 +26,10 @@ jobs:
      - name: Unpack Dependencies
        run: |
          cd ifcopenshell_build
-          python ../IfcOpenShell/nix/cache_dependencies.py unpack
+          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: ubuntu-22.04-${{ runner.arch }}

@@ -42,7 +42,7 @@ jobs:

      - name: Upload Build Logs
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
        with:
          name: build-logs-pyodide
          path: |
@@ -65,7 +65,7 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd ifcopenshell_build
-          python ../IfcOpenShell/nix/cache_dependencies.py pack
+          python ../IfcOpenShell/pyodide/cache_dependencies.py pack

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -77,7 +77,7 @@ jobs:
          git push || echo "Push failed"

      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -6,24 +6,18 @@ on:
 jobs:
  build_ifcopenshell:
    runs-on: ubuntu-22.04
-    container: rockylinux:9
+    container: rockylinux:8

    steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
      - name: Install Dependencies
        run: |
-          dnf update -y
-          dnf install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -35,38 +29,39 @@ jobs:
          aws --version

      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
-          ref: rockylinux9-x64
+          ref: rockylinux8-x64
          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}

      - name: Unpack Dependencies
        run: |
-          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
+        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8

      - name: Run Build Script
        shell: bash
        run: |
          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release uv run ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log

      - name: Upload Build Logs
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
        with:
          name: build-logs-rocky
          path: |
@@ -77,7 +72,9 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -121,7 +118,7 @@ jobs:
          cd ..

      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -6,24 +6,18 @@ on:
 jobs:
  build_ifcopenshell:
    runs-on: ubuntu-22.04-arm
-    container: arm64v8/rockylinux:9
+    container: arm64v8/rockylinux:8

    steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
      - name: Install Dependencies
        run: |
-          dnf update -y
-          dnf install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -35,38 +29,39 @@ jobs:
          aws --version

      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
-          ref: rockylinux9-arm64
+          ref: rockylinux8-arm64
          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}

      - name: Unpack Dependencies
        run: |
-          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
+        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8

      - name: Run Build Script
        shell: bash
        run: |
          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release uv run ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log

      - name: Upload Build Logs
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
        with:
          name: build-logs-rocky-arm64
          path: |
@@ -77,7 +72,9 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -121,7 +118,7 @@ jobs:
          cd ..

      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -5,38 +5,23 @@ on:

 jobs:
  build_ifcopenshell:
+    runs-on: windows-2022
    strategy:
      fail-fast: false
      matrix:
-        include:
-          - arch: x64
-            runs_on: windows-2022
-            deps_dir: _deps-vs2022-x64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
-            build_branch: windows-x64
-            zip_suffix: win64
-
-          - arch: ARM64
-            runs_on: windows-11-arm
-            deps_dir: _deps-vs2022-ARM64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"'
-            build_branch: windows-arm64
-            zip_suffix: win-arm64
-
-    runs-on: ${{ matrix.runs_on }}
-
+        arch: ['x64']
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
-          path: ${{ matrix.deps_dir }}
-          ref: ${{ matrix.build_branch }}
+          path: _deps-vs2022-x64-installed
+          ref: windows-${{ matrix.arch }}
          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}

@@ -46,13 +31,14 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
            7z x $_.FullName
          }

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # Use fork to resolve cache misses / duplicated cache entries on Windows.
+        uses: Andrej730/ccache-action@main
        with:
          key: win-${{ matrix.arch }}
          # Windows ccache needs ~1GB
@@ -61,16 +47,14 @@ jobs:

      - name: Run Build Script And Pack .zip Archives
        shell: cmd
-        env:
-          TARGET_ARCH: ${{ matrix.arch }}  # lets the Python script know which arch to target (optional override)
        run: |
-          call ${{ matrix.vcvars }}
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
          cd win
          python build-all-win.py

      - name: Pack Dependencies
        run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
          Get-ChildItem -Path . -Directory | ForEach-Object {
            $cacheFile = "cache-$($_.Name).zip"
            echo $cacheFile
@@ -81,16 +65,15 @@ jobs:

      - name: Commit and Push Changes to Build Repository
        run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
          git config user.name "IfcOpenBot"
          git config user.email "ifcopenbot@ifcopenshell.org"
-          git checkout -B ${{ matrix.build_branch }}
          git add *.zip
          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push --set-upstream origin ${{ matrix.build_branch }} || echo "Push failed"
+          git push || echo "Push failed"

      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -1,9 +1,9 @@
-import os
 import pathlib
 import shutil
-import zipfile

 import requests
+import zipfile
+import os

 # To test this locally, set these environment variables
 REPO_OWNER = os.environ.get("REPO_OWNER", "IfcOpenShell/IfcOpenShell")
@@ -19,8 +19,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          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
@@ -0,0 +1,68 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Action - checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Action - install python
+        uses: actions/setup-python@v5.3.0
+        with:
+          python-version: "3.9"
+
+      - name: Action - install python
+        uses: actions/setup-python@v5.3.0
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          uv tool install ruff
+          uv tool install black
+          uv tool install poethepoet
+
+      # black doesn't catch all syntax errors, so we check them explicitly.
+      - name: Check syntax errors
+        id: syntax-errors
+        run: |
+          ERROR=0
+          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
+          exit $ERROR
+        continue-on-error: true
+
+      - name: Black formatter
+        id: black
+        run: |
+          black --diff --check .
+        continue-on-error: true
+
+      - name: Ruff check
+        id: ruff
+        run: |
+          ERROR=0
+          poe ruff-main || ERROR=1
+          poe ruff-old || ERROR=1
+          exit $ERROR
+        continue-on-error: true
+
+      - name: Final check
+        run: |
+          ERROR=0
+          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
+            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.black.outcome }}" != "success" ]; then
+            echo "::error::Black formatting check failed, see 'black' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
+            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
+          fi
+          exit $ERROR
@@ -34,7 +34,7 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          fetch-tags: true
          fetch-depth: 0
@@ -24,15 +24,9 @@ jobs:
    runs-on: ubuntu-latest
    if: |
      github.repository == 'IfcOpenShell/IfcOpenShell'
-    outputs:
-      timestamp: ${{ steps.timestamp.outputs.timestamp }}
    steps:
-    - name: Get current timestamp
-      id: timestamp
-      # Include hours and minutes to release tag
-      # to avoid possibility of unstable repo's index.json
-      # pointing to the new file when index.json itself wasn't yet updated.
-      run: echo "timestamp=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
+    - name: Set env
+      run: echo ok go

  build:
    needs: activate
@@ -41,7 +35,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
        config:
          - {
            name: "Windows Build",
@@ -59,20 +53,21 @@ jobs:
            name: "MacOS ARM Build",
            short_name: macosm1,
          }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
      - name: Get current version
        id: version
        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - name: Get current date
+        id: date
+        # Include hours and minutes to release tag
+        # to avoid possibility of unstable repo's index.json
+        # pointing to the new file when index.json itself wasn't yet updated.
+        run: echo "date=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
      - name: Compile
        run: |
          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
@@ -88,8 +83,8 @@ jobs:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
          file: ${{ steps.find_zip.outputs.filepath }}
          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }} (unstable)"
-          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }}"
+          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
          overwrite: true
          body: "See README in https://github.com/IfcOpenShell/bonsai_unstable_repo/ on how to setup autoupdates for daily Bonsai builds."

@@ -98,7 +93,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
        with:
          repository: IfcOpenShell/bonsai_unstable_repo
          token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -109,7 +104,7 @@ jobs:
          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.

          # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender5.1/blender-5.1.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
          tar -xf blender.tar.xz

          # Setup Blender.
@@ -122,7 +117,7 @@ jobs:
          pip install -r requirements.txt
          python setup_extensions_repo.py --last-tag
          cd ..
-          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py313*-linux-x64.zip)"
+          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"

          # Install Bonsai.
          blender --command extension install-file -r user_default -e $bonsai_zip
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
        config:
          - {
            name: "Windows Build",
@@ -42,14 +42,9 @@ jobs:
            name: "MacOS ARM Build",
            short_name: macosm1,
          }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -37,8 +37,8 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -1,35 +0,0 @@
-name: ci-ifcedit-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcedit &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcedit/dist
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -1,36 +0,0 @@
-name: ci-ifcmcp-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcmcp &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcmcp/dist
-          verbose: true
@@ -24,7 +24,7 @@ jobs:
    if: |
      github.repository == 'IfcOpenShell/IfcOpenShell'
    steps:
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
        with:
          environment-name: test-env
          create-args: >-
@@ -21,7 +21,7 @@ jobs:
      date: ${{ steps.date.outputs.date }}
      verdate: ${{ steps.verdate.outputs.verdate }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - name: Set env
        run: echo ok go
      
@@ -54,7 +54,8 @@ jobs:
        platform: [
          { name: win, distver: windows-latest, pkg_dir: 'win-64' },
          { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' }
+          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' },
+          { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' }
        ]
    steps:
      - name: Set Swap Space
@@ -75,7 +76,7 @@ jobs:
            echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
          fi
      
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          submodules: recursive

@@ -84,7 +85,7 @@ jobs:
        run: |
          curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/

-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
        with:
          environment-name: test-env
          create-args: >-
@@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-22.04
    needs: activate
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
      with:
        submodules: recursive

@@ -35,13 +35,16 @@ jobs:

    -
      name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.23
+      uses: hendrikmuhs/ccache-action@v1.2

    - 
      name: Build ifcopenshell
      run: |
        mkdir build && cd build
        cmake \
+         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_STANDARD=17 \
         -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_PREFIX_PATH=/usr \
@@ -73,7 +76,7 @@ jobs:
        make package
      working-directory: build
    - name: Upload 
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
      with:
        # Artifact name
        name: ifcos-artifacts
@@ -86,31 +89,31 @@ jobs:
    name: Docker Build, Tag, Push

    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
      with:
        lfs: true
    
    - name: Download 
-      uses: actions/download-artifact@v8.0.1
+      uses: actions/download-artifact@v4.1.7
      with:
        # Artifact name
        name: ifcos-artifacts
        path: artifacts/
    -
      name: Set up QEMU
-      uses: docker/setup-qemu-action@v4
+      uses: docker/setup-qemu-action@v1
    -
      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4        
+      uses: docker/setup-buildx-action@v1        
    - 
      name: Login to Dockerhub
-      uses: docker/login-action@v4 
+      uses: docker/login-action@v1 
      with:
        username: aecgeeks
        password: ${{ secrets.DOCKER_HUB_TOKEN }}
    - 
      name: Build container image
-      uses: docker/build-push-action@v7
+      uses: docker/build-push-action@v2
      with: 
        context: artifacts
        repository: aecgeeks/ifcopenshell
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -47,10 +47,10 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
        with:
          submodules: recursive
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          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
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -38,10 +38,10 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
        with:
          submodules: recursive
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -1,35 +0,0 @@
-name: ci-ifcquery-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcquery &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcquery/dist
@@ -25,8 +25,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -19,8 +19,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -10,9 +10,9 @@ jobs:
  publish_website:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
      - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          repository: IfcOpenShell/ifctester_org_static_html
          token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
      - name: Compile
@@ -1,155 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-name: ci-ifcwrap-standalone
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - ".github/workflows/ci-ifcwrap-standalone.yml"
-      - "cmake/**"
-      - "src/ifcwrap/**"
-      - "src/ifcparse/**"
-      - "src/ifcgeom/**"
-      - "src/serializers/**"
-      - "src/ifcconvert/**"
-      - "src/ifcopenshell-python/**"
-      - "src/svgfill/**"
-  push:
-    paths:
-      - ".github/workflows/ci-ifcwrap-standalone.yml"
-      - "cmake/**"
-      - "src/ifcwrap/**"
-      - "src/ifcparse/**"
-      - "src/ifcgeom/**"
-      - "src/serializers/**"
-      - "src/ifcconvert/**"
-      - "src/ifcopenshell-python/**"
-      - "src/svgfill/**"
-
-env:
-  IFCOPENSHELL_PREFIX: ${{ github.workspace }}/ifcopenshell-install
-
-jobs:
-  build-ifcopenshell:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-
-      - name: Install C++ dependencies
-        run: |
-          sudo apt update
-          sudo apt-get install --no-install-recommends -y \
-            cmake \
-            gcc \
-            g++ \
-            libboost-date-time-dev \
-            libboost-filesystem-dev \
-            libboost-iostreams-dev \
-            libboost-program-options-dev \
-            libboost-regex-dev \
-            libboost-system-dev \
-            libboost-thread-dev \
-            libeigen3-dev \
-            libocct-data-exchange-dev \
-            libocct-draw-dev \
-            libocct-foundation-dev \
-            libocct-modeling-algorithms-dev \
-            libocct-modeling-data-dev \
-            libocct-ocaf-dev \
-            libocct-visualization-dev \
-            libpcre3-dev \
-            libtbb-dev \
-            libxml2-dev \
-            libxi-dev \
-            occt-misc \
-            tcl-dev \
-            tk-dev \
-            swig
-
-      - name: Configure minimal IfcOpenShell
-        run: |
-          cmake -S cmake -B build-ifcopenshell \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX="${IFCOPENSHELL_PREFIX}" \
-            -DCMAKE_PREFIX_PATH=/usr \
-            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
-            -DMINIMAL_BUILD=ON \
-            -DBUILD_IFCPYTHON=OFF \
-            "-DSCHEMA_VERSIONS=4x3_add2"
-
-      - name: Build and install minimal IfcOpenShell
-        run: |
-          cmake --build build-ifcopenshell --target install -j "$(nproc)"
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3.11
-
-      - name: Install Python import dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install numpy typing_extensions
-
-      - name: Configure standalone IfcPython
-        run: |
-          PYTHON_EXECUTABLE="$(python -c 'import sys; print(sys.executable)')"
-          PYTHON_INCLUDE_DIR="$(python -c 'import sysconfig; print(sysconfig.get_path("include"))')"
-
-          cmake -S src/ifcwrap -B "build-ifcwrap-311" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH="${IFCOPENSHELL_PREFIX};/usr" \
-            -DPython_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPython_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}" \
-            -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPYTHON_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}"
-
-      - name: Build and install standalone IfcPython
-        run: |
-          cmake --build "build-ifcwrap-311" --target install -j "$(nproc)"
-
-      - name: Import installed IfcPython
-        run: |
-          PYTHONPATH="${RUNNER_TEMP}/ifcopenshell-python" python - <<'PY'
-          import ifcopenshell
-
-          print("IfcOpenShell import ok:", ifcopenshell.version)
-          PY
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3.12
-
-      - name: Install Python import dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install numpy typing_extensions
-
-      - name: Configure standalone IfcPython
-        run: |
-          PYTHON_EXECUTABLE="$(python -c 'import sys; print(sys.executable)')"
-          PYTHON_INCLUDE_DIR="$(python -c 'import sysconfig; print(sysconfig.get_path("include"))')"
-
-          cmake -S src/ifcwrap -B "build-ifcwrap-312" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH="${IFCOPENSHELL_PREFIX};/usr" \
-            -DPython_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPython_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}" \
-            -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPYTHON_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}"
-
-      - name: Build and install standalone IfcPython
-        run: |
-          cmake --build "build-ifcwrap-312" --target install -j "$(nproc)"
-
-      - name: Import installed IfcPython
-        run: |
-          PYTHONPATH="${RUNNER_TEMP}/ifcopenshell-python" python - <<'PY'
-          import ifcopenshell
-
-          print("IfcOpenShell import ok:", ifcopenshell.version)
-          PY
@@ -1,118 +0,0 @@
-name: ci-lint
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    env:
-      MIN_IOS_PY_VERSION: "3.10"
-      MIN_BLENDER_PY_VERSION: "3.11"
-    steps:
-      - name: Action - checkout repository
-        uses: actions/checkout@v6
-
-      - name: Action - install python
-        uses: actions/setup-python@v6
-        with:
-          python-version: ${{ env.MIN_IOS_PY_VERSION }}
-
-      - name: Action - install python
-        uses: actions/setup-python@v6
-        with:
-          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}
-
-      - name: Install dependencies
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          uv tool install ruff
-          uv tool install black
-          uv tool install poethepoet
-          uv tool install ty==0.0.34
-
-      # black doesn't catch all syntax errors, so we check them explicitly.
-      - name: Check syntax errors
-        id: syntax-errors
-        run: |
-          ERROR=0
-          # Using 2 Python versions - one minimum required for IfcOpenShell
-          # and other that's used by Blender currently.
-          python${{ env.MIN_IOS_PY_VERSION }} -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python${{ env.MIN_BLENDER_PY_VERSION }} -W error -m compileall -q src/bonsai || ERROR=1
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Black formatter
-        id: black
-        uses: psf/black@stable
-        continue-on-error: true
-
-      # Same check as above, but just for creating github annotations.
-      - name: Black formatter annotations
-        id: black-annotations
-        run: |
-          uv tool install black-codeclimate
-          pip install github_action_utils
-          black --diff --check . | black-codeclimate | python .github/workflows/black_to_github_annotations.py
-        continue-on-error: true
-
-      - name: ty check
-        id: ty
-        run: |
-          poe ty-venv
-          poe ty
-        continue-on-error: true
-
-      - name: Ruff check
-        id: ruff
-        run: |
-          # Ensure execution continues, since we need to cache the output.
-          set +e
-
-          ERROR=0
-          # Keep colored output inside action logs, strip it from color codes for summary.
-          uv tool install ansi2txt
-          # `ruff` disables color output in CI by default.
-          export FORCE_COLOR="1"
-
-          run_check() {
-            local out
-            out="$("$@" 2>&1)"
-            local exit_code=$?
-
-            if [ "$exit_code" -ne 0 ]; then
-              ERROR=1
-            fi
-
-            # Rerun just for GitHub annotations.
-            "$@" --output-format=github || true
-
-            echo "$out"
-            echo "\`\`\`python" >> $GITHUB_STEP_SUMMARY
-            echo "$out" | ansi2txt >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          }
-
-          run_check poe ruff
-
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Final check
-        run: |
-          ERROR=0
-          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
-            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.black.outcome }}" != "success" ]; then
-            echo "::error::Black formatting check failed, see Summary or 'black' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
-            echo "::error::Ruff check failed, see Summary or 'ruff' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ty.outcome }}" != "success" ]; then
-            echo "::error::ty check failed, see 'ty check' step for the details." && ERROR=1
-          fi
-          exit $ERROR
@@ -1,46 +0,0 @@
-name: Release Pyodide WASM Wheel
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout IfcOpenShell
-        uses: actions/checkout@v6
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Build wheel
-        working-directory: pyodide
-        run: uv run pack_wheel.py --build
-
-      - name: Find wheel
-        id: wheel
-        run: |
-          WHEEL=$(ls pyodide/dist/ifcopenshell-*.whl)
-          echo "path=$WHEEL" >> $GITHUB_OUTPUT
-          echo "name=$(basename $WHEEL)" >> $GITHUB_OUTPUT
-
-      - name: Checkout wasm-wheels
-        uses: actions/checkout@v6
-        with:
-          repository: IfcOpenShell/wasm-wheels
-          path: wasm-wheels
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Commit and push wheel to wasm-wheels
-        run: |
-          WHEEL_NAME="${{ steps.wheel.outputs.name }}"
-          cp "${{ steps.wheel.outputs.path }}" "wasm-wheels/$WHEEL_NAME"
-          cd wasm-wheels
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$WHEEL_NAME"
-          git commit -m "Add $WHEEL_NAME"
-          VERSION=$(cat ../VERSION)
-          git tag "v${VERSION}"
-          git push origin main
-          git push origin "v${VERSION}"
@@ -10,13 +10,9 @@ on:
      - 'src/ifcgeomserver/**'
      - 'src/ifcjni/**'
      - 'src/ifcmax/**'
-      - 'src/ifc5d/**'
-      - 'src/ifcedit/**'
-      - 'src/ifcmcp/**'
      - 'src/ifcopenshell-python/**'
      - '!src/ifcopenshell-python/docs/**'
      - 'src/ifcparse/**'
-      - 'src/ifcquery/**'
      - 'src/ifcwrap/**'
      - 'src/qtviewer/**'
      - 'src/svgfill/**'
@@ -38,35 +34,27 @@ jobs:
  compile-and-test:
    runs-on: ubuntu-22.04
    needs: activate
-    env:
-      # Colored output for cmake.
-      CLICOLOR_FORCE: "1"
-      CMAKE_COLOR_DIAGNOSTICS: "ON"
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
            submodules: recursive

      - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
        with:
          python-version: 3.11

      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely pyparsing psutil
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
          pip install src/bcf --no-deps
+          pip install git+https://github.com/zdhoward/aud
          pip install pytest-xdist==3.8.0

      - name: Install C++ dependencies
        run: |
          sudo apt update
-          # `occt-misc` is only needed for 22.04, since it has cmake configs.
-          # In 24.04+, the needed files were moved `libocct-foundation-dev` and `occt-misc` can be removed.
-          # Other libs in `OCCT_CMAKE_DEPS` are needed only for cmake config to work properly, they're not used directly.
-          OCCT_CMAKE_DEPS="occt-misc libocct-draw-dev tcl-dev tk-dev libxi-dev"
-
          sudo apt-get install --no-install-recommends \
          git cmake gcc g++ \
          libboost-date-time-dev \
@@ -76,14 +64,13 @@ jobs:
          libboost-regex-dev \
          libboost-system-dev \
          libboost-thread-dev \
-          libpcre3-dev libxml2-dev \
+          swig libpcre3-dev libxml2-dev \
          libtbb-dev nlohmann-json3-dev \
          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          ${OCCT_CMAKE_DEPS} \
          libhdf5-dev libcgal-dev libeigen3-dev
          
      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: ubuntu-22.04-${{ runner.arch }}

@@ -110,82 +97,28 @@ jobs:
            ..
          sudo make -j$(nproc) install

-      # OpenCOLLADA is ancient, but we still have it in the main build.
-      # So adding it to CI to catch any breakages.
-      - name: build OpenCOLLADA
-        run: |
-          git clone https://github.com/KhronosGroup/OpenCOLLADA
-          cd OpenCOLLADA
-          git checkout v1.6.68
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/pr622_and_disable_subdirs.patch
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/allow_static_libraries_config_on_unix.patch
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_FLAGS_INIT="-fPIC"
-          sudo make -j$(nproc) install
-
-      # We need zstd and libxml2 just for cmake config files to test the examples build.
-      # zslibzstd-dev has cmake config only on Ubuntu 24.04+.
-      - name : Build zstd
-        run: |
-          git clone https://github.com/facebook/zstd --depth 1 --branch v1.5.7
-          cd zstd
-          # `build` already exists.
-          mkdir build_ && cd build_
-          cmake ../build/cmake -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
-      # libxml2-dev doesn't have cmake configs even on Ubuntu 24.04+.
-      - name: Build libxml2
-        run: |
-          git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch v2.13.8 --depth 1
-          cd libxml2
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
-      # Ubuntu has `swig` package, but we build it to match the version we use in the main build.
-      # To avoid failing tests when checking stub generation.
-      - name: build swig
-        run: |
-          # Remove default swig to avoid conflicts.
-          sudo apt remove --purge swig swig4.0
-          sudo apt-get install -y libpcre2-dev bison
-          git clone https://github.com/swig/swig --branch v4.1.0 --depth 1
-          cd swig
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo make -j$(nproc) install
-
      - name: Build ifcopenshell
        run: |
          echo $Python3_ROOT_DIR
          echo ${{ env.pythonLocation }}
          
          mkdir build && cd build
+          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
+          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
          cmake \
+               -DCMAKE_CXX_STANDARD=17 \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
+               -DCOLLADA_SUPPORT=Off \
               -DUSE_MMAP=On \
               "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
               -DGLTF_SUPPORT=On \
               -DWITH_ROCKSDB=On \
-               -DBUILD_EXAMPLES=ON \
             ../cmake
          sudo make -j $(nproc)
          sudo make install
@@ -208,39 +141,6 @@ jobs:
        run: |
          IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj

-      - name: Build standalone examples to test cmake package
-        run: |
-          set -x
-          cd src/examples
-          mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build .
-          ./arbitrary_open_profile_def  && test -f arbitrary_open_profile_def.ifc
-          ./composite_profile_def       && test -f composite_profile_def.ifc
-          ./csg_primitive               && test -f csg_primitive.ifc
-          ./ellipse_pies                && test -f ellipse_pies.ifc
-          ./faces                       && test -f faces.ifc
-          ./ifc_curve_rebar             && test -f ifc_curve_rebar.ifc
-          ./profiles
-          test -f IfcUShapeProfileDef.ifc
-          test -f IfcTShapeProfileDef.ifc
-          test -f IfcZShapeProfileDef.ifc
-          test -f IfcEllipseProfileDef.ifc
-          test -f IfcIShapeProfileDef.ifc
-          test -f IfcLShapeProfileDef.ifc
-          test -f IfcCShapeProfileDef.ifc
-          test -f IfcCircleProfileDef.ifc
-          test -f IfcRectangleProfileDef.ifc
-          test -f IfcTrapeziumProfileDef.ifc
-          ./IfcParseExamples "../IfcParseExamples_test.ifc"
-          ./IfcOpenHouse                && test -f IfcOpenHouse.ifc
-          ./IfcAdvancedHouse            && test -f IfcAdvancedHouse.ifc 
-          ./IfcAlignment                && test -f IfcAlignment.ifc 
-          ./IfcSimplifiedAlignment      && test -f IfcSimplifiedAlignment.ifc
-          ./triangulated_faceset        && test -f triangulated_faceset.ifc 
-
      - name: Test ifcopenshell-python
        run: |
          cd test
@@ -256,26 +156,12 @@ jobs:
          pip install deepdiff
          cd ../ifcdiff && make test || ERROR=1
          cd ../ifcpatch && make test || ERROR=1
-          pip install -e ../ifc5d --no-deps
-          pip install odfpy xlsxwriter
-          cd ../ifc5d && make test || ERROR=1
-          pip install -e ../ifcquery --no-deps
-          cd ../ifcquery && make test || ERROR=1
-          pip install -e ../ifcedit --no-deps
-          cd ../ifcedit && make test || ERROR=1
-          pip install mcp
-          pip install -e ../ifcmcp --no-deps
-          cd ../ifcmcp && make test || ERROR=1
          pip install -e ../ifctester --no-deps
          cd ../ifctester && make test || ERROR=1
-          make build-ids-docs || ERROR=1
          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
-          # mathutils only has pre-built wheels for Python 3.13+; skip on older versions.
          cd ../ifcopenshell-python
-          if python -c "import sys; sys.exit(0 if sys.version_info >= (3, 13) else 1)"; then
-            pip install mathutils
-            make test-mathutils || ERROR=1
-          fi
+          pip install mathutils
+          make test-mathutils || ERROR=1
          if [ $ERROR -ne 0 ]; then
            echo "One or more tests failed";
            exit 1;
@@ -11,10 +11,10 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2

      - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
        with:
          python-version: '3.x'

@@ -0,0 +1,36 @@
+name: Build and Deploy Stable Documentation
+
+on:
+  workflow_dispatch:  # Manual trigger
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs
+          pip install -r requirements.txt  # Run pip install from the docs directory
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs
+          make html
+
+      - name: Deploy to GitHub Pages (Stable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          external_repository: IfcOpenShell/bonsaibim_org_docs
+          publish_branch: main
+          cname: docs.bonsaibim.org
+          publish_dir: src/bonsai/docs/_build/html
@@ -1,65 +0,0 @@
-name: Deploy AI chat App to static page repo
-
-permissions:
-  id-token: write
-  pages: write
-
-on:
-  push:
-    paths:
-      - 'src/ifcchat/**'
-      - '.github/workflows/publish-aichat-app.yaml'
-    branches:
-      - v0.8.0
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-      
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout (recursive)
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v6
-        with:
-          repository: IfcOpenShell/aichat_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/ifcchat/ output/
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
-      - name: Download wheels
-        working-directory: output/
-        run: |
-          pip download ifcquery==0.8.5 ifcopenshell-mcp==0.8.5 ifcedit==0.8.5 lark==1.3.1 isodate==0.7.2 --no-deps -d ./dist
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-
-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit  -m "$(git log --oneline -1)"
-          git push origin gh-pages
@@ -1,16 +0,0 @@
-name: Publish Bonsai Releases
-
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: astral-sh/setup-uv@v7
-
-      - run: uv run .github/scripts/publish-bonsai-releases.py
-        env:
-          BLENDER_EXTENSIONS_TOKEN: ${{ secrets.BLENDER_EXTENSIONS_TOKEN }}
@@ -1,4 +1,4 @@
-name: Deploy Pyodide Demo App to static page repo
+name: Deploy Pyodide Demo App to GitHub Pages

 permissions:
  id-token: write
@@ -11,7 +11,6 @@ on:
      - '.github/workflows/publish-pyodide-demo-app.yml'
    branches:
      - v0.8.0
-  workflow_dispatch:

 jobs:
  activate:
@@ -27,31 +26,25 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout (recursive)
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          submodules: recursive
          fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v6
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
        with:
-          repository: IfcOpenShell/wasm_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/pyodide/demo-app/ output/
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          path: src/pyodide/demo-app/

-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit -m "$(git log --oneline -1)"
-          git push origin gh-pages
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
        with:
          submodules: recursive
      - name: Install C++ dependencies
@@ -46,6 +46,7 @@ jobs:
          mkdir build && cd build
          cmake \
           -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
+           -DCMAKE_CXX_STANDARD=17 \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_PREFIX_PATH=/usr \
           -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -4,9 +4,6 @@
 /_deps-vs*-x*-installed/
 /_installed-vs*-x*/
 /build/
-/src/examples/build/
-# ifctester docs output
-/src/ifctester/test/build/

 # output directories
 /cmake/out/
@@ -14,21 +11,16 @@
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/
-/src/ifctester/webapp/public/pyodide/

 /win/BuildDepsCache*.txt

 # General Python residue
 __pycache__
 *.py.bak
-venv

 # Visual Studio Code files
 .vscode
-!.vscode/launch.json
-!.vscode/tasks.json
 .vs
-/*.code-workspace

 # PyCharm files
 .idea
@@ -84,14 +76,10 @@ src/ifcopenshell-python/test/build
 # bonsai i18n
 src/bonsai/bonsai/translations.py

-# bonsai external dependencies (cloned for just ty checks)
-src/bonsai/external_dependencies/
-
-# bonsai test temp/cache files
+# bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/*.cache.blend
-src/bonsai/test/files/*.cache.json
-src/bonsai/test/files/*.cache.sqlite
+src/bonsai/test/files/basic.ifc.cache.blend
+src/bonsai/test/files/basic.ifc.cache.sqlite

 # bonsai data
 src/bonsai/bonsai/bim/data/build/
@@ -99,7 +87,6 @@ src/bonsai/bonsai/bim/data/gantt/index.html
 src/bonsai/bonsai/bim/data/gantt/jsgantt.js
 src/bonsai/bonsai/bim/data/gantt/jsgantt.css
 src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js
-src/bonsai/bonsai/bim/data/webui/running_pid.json

 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
@@ -123,10 +110,3 @@ dev_environment.bat

 src/ifcopenshell-python/ifcopenshell/express/*.exp
 src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
-
-
-# temp files from AI coding tools
-*.claude
-*.py.tmp*
-*.json.tmp*
-
@@ -5,9 +5,15 @@
 [submodule "src/ifcopenshell-python/ifcopenshell/mvd"]
 	path = src/ifcopenshell-python/ifcopenshell/mvd
 	url = https://github.com/opensourceBIM/python-mvdxml/
+[submodule "src/svgfill"]
+	path = src/svgfill
+	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
 	url = https://github.com/IfcOpenShell/ids-test-files
+[submodule "src/ifcconvert/cityjson"]
+	path = src/ifcconvert/cityjson
+	url = https://github.com/IfcOpenShell/ifc-to-cityjson
 [submodule "docs/cpp-api/assets/doxygen-awesome-css"]
 	path = docs/cpp-api/assets/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
@@ -17,6 +23,3 @@
 [submodule "src/pyodide/demo-app/wheels"]
 	path = src/pyodide/demo-app/wheels
 	url = https://github.com/IfcOpenShell/wasm-wheels
-[submodule "src/svgfill/3rdparty/svgpp"]
-	path = src/svgfill/3rdparty/svgpp
-	url = https://github.com/svgpp/svgpp
@@ -1,24 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "name": "Python Debugger: Remote Attach",
-            "type": "debugpy",
-            "request": "attach",
-            "connect": {
-                "host": "localhost",
-                "port": 5678
-            },
-            "pathMappings": [
-                {
-                    "localRoot": "${config:bonsai.localRoot}",
-                    "remoteRoot": "${config:bonsai.remoteRoot}"
-                }
-            ]
-        }
-    ]
-}
@@ -1,53 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Configure bonsai/vscode development environment",
-            "type": "shell",
-            "command": "${input:blenderPath}",
-            "args": [
-                "--background",
-                "--python", "${workspaceFolder}/src/bonsai/scripts/dev_environment_vscode_config.py"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Launch blender with debugpy",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--python-expr",
-                "import debugpy; debugpy.listen(5678)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Install debugpy in Blender",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--background",
-                "--python-expr",
-                "import os, sys, subprocess; path=os.path.abspath(sys.executable); subprocess.call([path, '-m', 'ensurepip']); subprocess.call([path, '-m', 'pip', 'install', '--upgrade', 'debugpy'])"
-            ],
-            "problemMatcher": []
-        }
-         
-    ],
-    "inputs": [
-        {
-            "id": "blenderPath",
-            "type": "promptString",
-            "description": "Enter the path to the blender executable",
-            "default": "blender"
-        }
-    ]
-}
@@ -1,168 +0,0 @@
-<!-- This file was generated with the assistance of an AI coding tool. -->
-
-# AGENTS.md
-
-Guidelines for AI coding agents contributing to IfcOpenShell. This file is
-intended to be read by all AI agents regardless of platform (Claude Code,
-Copilot, Cursor, etc.) in addition to any tool-specific configuration files.
-
-Human contributors using AI tools should also read this document carefully,
-as they are responsible for ensuring their contributions comply with these
-guidelines.
-
-## Project Overview
-
-IfcOpenShell is an open source library for working with Industry Foundation
-Classes (IFC). It provides C++ and Python APIs, geometry processing, and an
-ecosystem of tools including IfcConvert and the Bonsai Blender add-on.
-
-## Licensing
-
-All contributions must be compatible with the project's licensing:
-
- **Library code** (everything except Bonsai): **LGPL-3.0-or-later**
- **Bonsai** (`src/bonsai/`): **GPL-3.0-or-later**
-
-There is no Contributor License Agreement (CLA). By submitting a pull request,
-you agree that your contribution is licensed under the applicable license above.
-
-## Indicating AI-Generated Code
-
-Contributors must clearly indicate when code has been generated or
-substantially written by an AI tool.
-
-### Commits
-
-Commits that modify existing code must include a note in the **body** of the
-commit message (not the subject line) indicating that the change was
-AI-generated. For example:
-
-```
-Fix off-by-one error in element iteration
-
-The loop termination condition was incorrect when processing
-IfcRelAggregates relationships.
-
-Generated with the assistance of an AI coding tool.
-```
-
-### New Files
-
-New files that are AI-generated must include a comment near the top of the
-file indicating this. Use the appropriate comment syntax for the language:
-
-```python
-# This file was generated with the assistance of an AI coding tool.
-```
-
-```cpp
-// This file was generated with the assistance of an AI coding tool.
-```
-
-### Pull Requests
-
-Pull requests containing AI-generated code must indicate in the PR description
-which parts of the contribution are AI-generated. If the entire PR is
-AI-generated, state that clearly. If only specific commits or files are
-AI-generated, identify them.
-
-## Pull Request Guidelines
-
-### Scope and Size
-
- Each pull request should address a **single issue or feature**.
- Do not mix unrelated changes (e.g., bug fixes with refactoring or style
-  changes) in the same PR.
- Large pull requests should be broken down into **multiple small, standalone
-  commits** that are each easy to review independently. Rewrite commit history
-  for this purpose if necessary.
- PRs that are minimal, focused solutions to a specific problem are much more
-  likely to be accepted.
-
-### What to Avoid
-
- **Over-engineering**: Do not add features, abstractions, or configurability
-  beyond what is needed to solve the immediate problem.
- **Scope creep**: Do not make changes to files or code that are not directly
-  related to the task at hand.
- **Unnecessary additions**: Do not add docstrings, comments, type annotations,
-  or error handling to code you did not otherwise need to change.
- **Cosmetic changes**: Do not reformat, rename, or reorganize code that is
-  unrelated to your change.
-
-## Commit Messages
-
- The **subject line** must be **50 characters or less**.
- Use the **imperative mood** (e.g., "Fix crash in geometry kernel", not
-  "Fixed crash" or "Fixes crash").
- A commit message can be a single line if the purpose is obvious from the
-  subject alone.
- Otherwise, add a blank line after the subject followed by a short explanation
-  of a few lines in the body.
-
-## Code Style
-
-### Python
-
- **Line length**: 120 characters
- **Formatter**: black
- **Linter**: ruff
- Configuration is in `pyproject.toml`
-
-### C++
-
- **Standard**: C++17 minimum
- **Formatter**: clang-format (configuration in `.clang-format`)
- **Linter**: clang-tidy (configuration in `.clang-tidy`)
-
-Run linters and formatters **before submitting** your pull request. Do not rely
-on CI to catch formatting issues.
-
-## Testing
-
- Pull requests with test coverage are **much more likely to be merged**.
- If tests are appropriate and feasible for your change, they should be
-  included.
- Tests are not required for every change (e.g., documentation-only changes),
-  but the expectation is that testable code changes come with tests.
- Python tests use **pytest** and are located in `test/` or `tests/` directories
-  within each package under `src/`.
- Run the existing test suite for the package you modified before submitting.
-
-## In-Progress Feature Notes
-
-Living design and working notes for unmerged feature branches live in
-[`docs/dev-notes/`](docs/dev-notes/), one Markdown file per feature, named after the
-branch. They capture the problem, the design decisions and the *why*, and what still
-needs testing — so collaborators (and their AI agents) can pick up the context behind a
-branch. Because the note is committed on the branch, it travels with the PR.
-
- Before working on a feature branch, read its note in `docs/dev-notes/` if one exists.
- Keep the note current as the PR is refined.
- These are not user documentation; at merge they are removed or their durable parts
-  promoted to code comments / permanent docs.
-
-See [`docs/dev-notes/README.md`](docs/dev-notes/README.md) for details.
-
-## Architecture Quick Reference
-
-### Directory Structure
-
- `src/ifcparse/` — C++ IFC file parsing
- `src/ifcgeom/` — C++ geometry processing (OpenCASCADE and CGAL kernels)
- `src/serializers/` — Output format serializers (glTF, Collada, SVG, etc.)
- `src/ifcwrap/` — SWIG Python bindings
- `src/ifcconvert/` — CLI conversion tool
- `src/ifcopenshell-python/` — Python API (`ifcopenshell` package)
- `src/bonsai/` — Blender add-on (GPL-3.0-or-later)
- `src/ifctester/` — IDS model auditing
- `src/ifcpatch/` — IFC file manipulation scripts
- `src/ifcdiff/` — IFC model comparison
- `src/ifcclash/` — Clash detection
- `src/ifccsv/` — Schedule import/export
-
-### IFC Schema Versions
-
-The library supports IFC2x3 TC1, IFC4 Add2 TC1, IFC4x1, IFC4x2, and
-IFC4x3 Add2. Schema-specific code is compiled conditionally. Be aware of
-which schema versions your change affects.
@@ -50,14 +50,11 @@ Contents
 | [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
 | [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
 | [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| [ifcedit](https://docs.ifcopenshell.org/ifcedit.html)                   | CLI wrapper for ifcopenshell.api IFC model mutation functions         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcedit?label=PyPI&color=006dad)](https://pypi.org/project/ifcedit/) |
 | [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
 | [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| [ifcmcp](https://docs.ifcopenshell.org/ifcmcp.html)                    | MCP server for querying and editing IFC building models               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcopenshell-mcp?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell-mcp/) |
-| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [![Pyodide WASM Wheels tag](https://img.shields.io/github/v/tag/ifcopenshell/wasm-wheels?sort=semver&label=pyodide-wasm-wheels)](https://github.com/IfcOpenShell/wasm-wheels) |
+| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [Pyodide WASM Wheels](https://github.com/IfcOpenShell/wasm-wheels#pyodide-test-wheels) |
 | [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [ifcquery](https://docs.ifcopenshell.org/ifcquery.html)                  | CLI tool for querying and inspecting IFC building models              | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcquery?label=PyPI&color=006dad)](https://pypi.org/project/ifcquery/) |
-| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
 | [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |

 The IfcOpenShell C++ codebase is split into multiple interal libraries:
@@ -1 +1 @@
-0.8.6
+0.8.4
@@ -1,6 +1,6 @@
-import boto3
 import ifcopenshell
 import ifcopenshell.util.element
+import boto3

 s3 = boto3.client('s3')

@@ -13,15 +13,13 @@ import hashlib
 import os
 import pathlib
 import re
-import subprocess
-from typing import NoReturn
 from urllib import request
-
 from github import Github
+from typing import NoReturn


 def get_repo_tag_names() -> list[str]:
-    git_return = subprocess.check_output("git tag -l", text=True)
+    git_return = os.popen("git tag -l").read()
    tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
    print(f"{len(tag_names)} tag_names found in repo")
    return tag_names
@@ -79,10 +77,6 @@ def get_release_zip(tag: str) -> tuple[str, str]:
    raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")


-def run(command: str) -> None:
-    subprocess.check_output(command)
-
-
 start = datetime.datetime.now()

 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
@@ -102,7 +96,7 @@ should_release = False
 target_release_tag = ""
 TARGET_OS = "windows-x64"

-git_status = subprocess.check_output("git status", text=True)
+git_status = os.popen("git status").read()
 print(git_status)

 for tag_name in get_repo_tag_names():
@@ -152,7 +146,7 @@ blenderbim_build_version = target_release_tag.replace("blenderbim-", "")

 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-subprocess.check_call(f"wget {url_blenderbim_py3x_win_zip} --no-verbose")
+os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()

 # sha256sum_blenderbim_py310_win_zip
 sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
@@ -206,13 +200,13 @@ print("[INFO] inserting dynamic chocolatey package parameters successful")
 print("\n_____ build choco.exe with mono")

 choco_version = "1.1.0"
-run(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet")
-run(f"tar -xzf {choco_version}.tar.gz")
+os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
+os.popen(f"tar -xzf {choco_version}.tar.gz").read()
 print("choco tar unpack successful")
 os.chdir("choco-1.1.0")
-run("./build.sh")
+os.popen("./build.sh").read()

-run("cp -r build_output/chocolatey /opt/chocolatey")
+os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
 os.chdir(BLENDERBIM_DIR)

 if pathlib.Path("/opt/chocolatey/choco.exe").exists():
@@ -220,15 +214,11 @@ if pathlib.Path("/opt/chocolatey/choco.exe").exists():

 print("\n_____ build choco pack")

-run("mono /opt/chocolatey/choco.exe pack --allow-unofficial")
-run(
-    'mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial'
-)
+os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
+os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()

 print("\n_____ build choco push")
-run(
-    'mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose'
-)
+os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()

 print(f"choco push of version: {target_release_tag} successful!")
 print(f"it took: {datetime.datetime.now() - start}")
@@ -1,5 +1,6 @@
 import bpy

+
 bpy.ops.preferences.addon_disable(module='blenderbim')
 bpy.ops.wm.save_userpref()

@@ -1,5 +1,6 @@
 import bpy

+
 bpy.ops.preferences.addon_enable(module='blenderbim')
 bpy.ops.wm.save_userpref()

@@ -17,6 +17,7 @@
        "IFCXML_SUPPORT": "ON",
        "HDF5_SUPPORT": "ON",
        "SCHEMA_VERSIONS": "4x3_add2",
+        "CITYJSON_SUPPORT": "OFF",
        "CMAKE_GENERATOR_PLATFORM": "",
        "CMAKE_GENERATOR_TOOLSET": ""
      }
@@ -1,68 +0,0 @@
-#
-# Input variables:
-# - `CGAL_INCLUDE_DIR`
-# - `CGAL_LIBRARY_DIR`
-# - `GMP_INCLUDE_DIR`
-# - `GMP_LIBRARY_DIR`
-# - `MPFR_INCLUDE_DIR`
-# - `MPFR_LIBRARY_DIR`
-# If input variables are not specified, try to find HDF5 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `IFCOPENSHELL_CGAL`
-#
-
-if(TARGET IFCOPENSHELL_CGAL)
-    return()
-endif()
-
-UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
-
-if(CGAL_INCLUDE_DIR)
-    find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-    find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
-    if(NOT libGMP)
-        message(FATAL_ERROR "Unable to find GMP library files, aborting")
-    endif()
-    if(NOT libMPFR)
-        message(FATAL_ERROR "Unable to find MPFR library files, aborting")
-    endif()
-
-    add_library(CGAL::CGAL INTERFACE IMPORTED)
-    target_include_directories(CGAL::CGAL INTERFACE "${CGAL_INCLUDE_DIR}")
-    target_include_directories(CGAL::CGAL INTERFACE "${GMP_INCLUDE_DIR}" "${MPFR_INCLUDE_DIR}")
-    target_link_libraries(CGAL::CGAL INTERFACE "${libMPFR}" "${libGMP}")
-else()
-    # CGAL is not respecting default Boost_USE_STATIC_LIBS value
-    # and sometiems it's getting in the way.
-    if(NOT DEFINED Boost_USE_STATIC_LIBS)
-        set(CGAL_Boost_USE_STATIC_LIBS OFF)
-    else()
-        set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
-    endif()
-    # Annoyingly this is producing CMP0167 boost warnings, because it's unsetting cmake policies
-    # and using FindBoost module. But there's nothing we can do about it,
-    # since everything happens in the scope of CGAL config. I guess it's be resolved in CGAL 6.1.0.
-    find_package(CGAL CONFIG)
-    if(NOT CGAL_FOUND)
-        message(
-            FATAL_ERROR
-            "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
-        )
-    endif()
-    message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
-endif()
-
-# Adding another `IFCOPENSHELL_CGAL` target, because we want to add compile definitions to it,
-# but in `CGALconfig.cmake` `CGAL::CGAL` is an alias, so you can't add properties to it.
-add_library(IFCOPENSHELL_CGAL INTERFACE)
-target_link_libraries(IFCOPENSHELL_CGAL INTERFACE CGAL::CGAL)
-target_compile_definitions(IFCOPENSHELL_CGAL INTERFACE IFOPSH_WITH_CGAL)
-set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
-install(TARGETS IFCOPENSHELL_CGAL EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
@@ -1,27 +0,0 @@
-#
-# Input variables:
-# - `EIGEN_DIR`
-# If input variables are not specified, try to find Eigen3 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `Eigen3::Eigen`
-
-UNIFY_ENVVARS_AND_CACHE(EIGEN_DIR)
-
-if(EXISTS "${EIGEN_DIR}")
-    # Mimic Eigen3Config.cmake target.
-    add_library(Eigen3::Eigen INTERFACE IMPORTED)
-    target_include_directories(Eigen3::Eigen INTERFACE "${EIGEN_DIR}")
-else()
-    find_package(Eigen3 CONFIG)
-    if(Eigen3_DIR)
-        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
-    else()
-        message(
-            FATAL_ERROR
-            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
-            "Also couldn't find Eigen3 as a package."
-        )
-    endif()
-endif()
@@ -1,131 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-include("${CMAKE_CURRENT_LIST_DIR}/utilities.cmake" OPTIONAL)
-
-set(_IfcOpenShell_find_args)
-if(IfcOpenShell_FIND_VERSION)
-    list(APPEND _IfcOpenShell_find_args "${IfcOpenShell_FIND_VERSION}")
-    if(IfcOpenShell_FIND_VERSION_EXACT)
-        list(APPEND _IfcOpenShell_find_args EXACT)
-    endif()
-endif()
-list(APPEND _IfcOpenShell_find_args CONFIG QUIET)
-if(IfcOpenShell_FIND_COMPONENTS)
-    list(APPEND _IfcOpenShell_find_args COMPONENTS ${IfcOpenShell_FIND_COMPONENTS})
-endif()
-
-set(_IfcOpenShell_saved_module_path "${CMAKE_MODULE_PATH}")
-list(REMOVE_ITEM CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-find_package(IfcOpenShell ${_IfcOpenShell_find_args})
-set(CMAKE_MODULE_PATH "${_IfcOpenShell_saved_module_path}")
-
-if(NOT IfcOpenShell_FOUND)
-    set(_IfcOpenShell_error "Could not find an IfcOpenShell CMake config package. Set IfcOpenShell_DIR or CMAKE_PREFIX_PATH.")
-    if(IfcOpenShell_FIND_REQUIRED)
-        message(FATAL_ERROR "${_IfcOpenShell_error}")
-    elseif(NOT IfcOpenShell_FIND_QUIETLY)
-        message(STATUS "${_IfcOpenShell_error}")
-    endif()
-    return()
-endif()
-
-set(_IfcOpenShell_required_targets IfcOpenShell::IfcParse IfcOpenShell::IfcGeom)
-set(_IfcOpenShell_missing_targets "")
-foreach(_IfcOpenShell_target IN LISTS _IfcOpenShell_required_targets)
-    if(NOT TARGET ${_IfcOpenShell_target})
-        list(APPEND _IfcOpenShell_missing_targets ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-if(_IfcOpenShell_missing_targets)
-    set(IfcOpenShell_FOUND FALSE)
-    string(REPLACE ";" ", " _IfcOpenShell_missing_targets_text "${_IfcOpenShell_missing_targets}")
-    set(_IfcOpenShell_error "IfcOpenShell config was found, but required targets are missing: ${_IfcOpenShell_missing_targets_text}.")
-    if(IfcOpenShell_FIND_REQUIRED)
-        message(FATAL_ERROR "${_IfcOpenShell_error}")
-    elseif(NOT IfcOpenShell_FIND_QUIETLY)
-        message(STATUS "${_IfcOpenShell_error}")
-    endif()
-    return()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_OPENCASCADE)
-    set(IFCOPENSHELL_WITH_OPENCASCADE OFF)
-    if(TARGET IfcOpenShell::geometry_kernel_opencascade)
-        set(IFCOPENSHELL_WITH_OPENCASCADE ON)
-    endif()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_CGAL)
-    set(IFCOPENSHELL_WITH_CGAL OFF)
-    if(TARGET IfcOpenShell::IFCOPENSHELL_CGAL)
-        set(IFCOPENSHELL_WITH_CGAL ON)
-    endif()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_IFCXML)
-    set(IFCOPENSHELL_IFCXML OFF)
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_ROCKSDB)
-    set(IFCOPENSHELL_WITH_ROCKSDB OFF)
-endif()
-
-set(IFCOPENSHELL_LIBRARIES IfcOpenShell::IfcParse)
-foreach(_IfcOpenShell_target IN ITEMS IfcOpenShell::geometry_serializer IfcOpenShell::Serializers)
-    if(TARGET ${_IfcOpenShell_target})
-        list(APPEND IFCOPENSHELL_LIBRARIES ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-set(IFCOPENSHELL_KERNEL_LIBRARIES "")
-foreach(_IfcOpenShell_target IN ITEMS
-    IfcOpenShell::geometry_kernel_opencascade
-    IfcOpenShell::geometry_kernel_cgal
-    IfcOpenShell::geometry_kernel_cgal_simple
-)
-    if(TARGET ${_IfcOpenShell_target})
-        list(APPEND IFCOPENSHELL_KERNEL_LIBRARIES ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-set(IFCOPENSHELL_GEOMETRY_LIBRARIES IfcOpenShell::IfcGeom ${IFCOPENSHELL_KERNEL_LIBRARIES})
-
-if(TARGET IfcOpenShell::OpenCASCADE_INTERFACE)
-    set(OpenCASCADE_LIBRARIES IfcOpenShell::OpenCASCADE_INTERFACE)
-endif()
-
-if(TARGET IfcOpenShell::IFCOPENSHELL_CGAL)
-    set(CGAL_LIBRARIES IfcOpenShell::IFCOPENSHELL_CGAL)
-endif()
-
-if(TARGET IfcOpenShell::svgfill)
-    set(IFCOPENSHELL_SVGFILL_LIBRARY IfcOpenShell::svgfill)
-endif()
-
-mark_as_advanced(IfcOpenShell_DIR)
-
-unset(_IfcOpenShell_error)
-unset(_IfcOpenShell_find_args)
-unset(_IfcOpenShell_missing_targets)
-unset(_IfcOpenShell_missing_targets_text)
-unset(_IfcOpenShell_required_targets)
-unset(_IfcOpenShell_target)
@@ -1,47 +0,0 @@
-#
-# Input variables:
-# - `LIBXML2_INCLUDE_DIR`
-# - `LIBXML2_LIBRARIES`
-# If input variables are not specified, try to find LibXml2 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `LibXml2::LibXml2`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
-
-if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
-    # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04)
-    # CONFIG is provided using root path, so no need to clear sysroot here.
-    find_package(LibXml2 QUIET CONFIG)
-
-    if(NOT LibXml2_FOUND)
-        # Fallback to CMake's builtin FindLibXml2 module (works on Ubuntu)
-        find_package(LibXml2 REQUIRED)
-    else()
-        message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
-    endif()
-else()
-    find_package(LibXml2 REQUIRED)
-    if(MSVC)
-        # Unset `IMPORTED_LOCATION` and set it manually.
-        set_property(TARGET LibXml2::LibXml2 PROPERTY IMPORTED_LOCATION)
-        get_release_variant(LIBXML2_RELEASE_LIB "${LIBXML2_LIBRARIES}" "d")
-        get_debug_variant(LIBXML2_DEBUG_LIB "${LIBXML2_LIBRARIES}" "d")
-        set_target_properties(
-            LibXml2::LibXml2
-            PROPERTIES
-                IMPORTED_CONFIGURATIONS "Release;Debug"
-                IMPORTED_LOCATION_RELEASE "${LIBXML2_RELEASE_LIB}"
-                IMPORTED_LOCATION_DEBUG "${LIBXML2_DEBUG_LIB}"
-        )
-    endif()
-endif()
-
-# Restore module path.
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
@@ -1,191 +0,0 @@
-#
-# Input variables:
-# - `OCC_INCLUDE_DIR`
-# - `OCC_LIBRARY_DIR`
-# If input variables are not specified, try to find OpenCASCADE config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables
-# - `OpenCASCADE_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
-
-if(OCC_INCLUDE_DIR)
-    set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
-    message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
-endif()
-
-if(OCC_LIBRARY_DIR)
-    set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
-    message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-endif()
-
-if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-    # OCE is not supported for find_package, because it's using a different name (`oce`)
-    # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
-    # find_package creates variables:
-    # - `OpenCASCADE_INCLUDE_DIR`
-    # - `OpenCASCADE_LIBRARIES`
-
-    # OpenCASCADE may be built with VTK support. Try to find VTK first to avoid
-    # CMake errors when OpenCASCADE's config references VTK targets.
-    find_package(VTK QUIET)
-    mark_as_advanced(VTK_DIR)
-
-    find_package(OpenCASCADE CONFIG REQUIRED)
-    mark_as_advanced(OpenCASCADE_DIR)
-    message(STATUS "Found OpenCASCADE config: ${OpenCASCADE_DIR}")
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-
-    if(
-        OpenCASCADE_VERSION VERSION_LESS "7.9.0"
-        AND CMAKE_VERSION GREATER_EQUAL "3.24"
-        AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-    )
-        # Before 7.9.0 targets in OCCT cmake configs are not linked to each other
-        # leading to missing symbols on Unix. Link them as a single group as a workaround.
-        # Only needed for gcc, because other compilers (e.g. Apple Clang, MSVC) do rescan automatically.
-        set(OpenCASCADE_LIBRARIES "$<LINK_GROUP:RESCAN,${OpenCASCADE_LIBRARIES}>")
-    endif()
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.9.0" AND WIN32)
-        # Bug in OCCT cmake configs < 7.9.0 - missing linked library.
-        list(APPEND OpenCASCADE_LIBRARIES WSOCK32.lib)
-    endif()
-
-    return()
-endif()
-
-# No specific paths specified, try to find package.
-if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
-    message(
-        STATUS
-        "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-        "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
-    )
-    # Parse OCC_VERSION_STRING.
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR REGEX "#define OCC_VERSION_MAJOR.*")
-    string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR REGEX "#define OCC_VERSION_MINOR.*")
-    string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT REGEX "#define OCC_VERSION_MAINTENANCE.*")
-    string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
-    set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-else()
-    message(
-        FATAL_ERROR
-        "Couldn't find Open CASCADE installation. "
-        "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-        "must be specified or OpenCASCADE package should be discoverable. "
-        "If you're using OCE, then providing a package is not available "
-        "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
-    )
-endif()
-
-set(OpenCASCADE_LIBRARIES
-    TKernel
-    TKMath
-    TKBRep
-    TKGeomBase
-    TKGeomAlgo
-    TKG3d
-    TKG2d
-    TKShHealing
-    TKTopAlgo
-    TKMesh
-    TKPrim
-    TKBool
-    TKBO
-    TKFillet
-    TKXSBase
-    TKOffset
-    TKHLR
-    # @todo investigate the exact conditions when this is necessary
-    TKBin
-)
-
-if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(
-        APPEND OpenCASCADE_LIBRARIES
-        TKIGES
-        TKSTEPBase
-        TKSTEPAttr
-        TKSTEP209
-        TKSTEP
-    )
-else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OpenCASCADE_LIBRARIES TKDESTEP TKDEIGES)
-endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-
-find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
-
-if(libTKernel)
-    message(STATUS "Required Open Cascade Library files found")
-else()
-    message(FATAL_ERROR "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting")
-endif()
-
-if(MSVC)
-    add_definitions(-DHAVE_NO_DLL)
-    add_debug_variants(OpenCASCADE_LIBRARIES "${OpenCASCADE_LIBRARIES}" d)
-endif()
-
-if(WIN32)
-    # OCC might require linking to Winsock depending on the version and build configuration
-    list(APPEND OpenCASCADE_LIBRARIES ws2_32.lib)
-endif()
-
-# Make sure cross-referenced symbols between static OCC libraries get
-# resolved. Also add thread and rt libraries.
-get_filename_component(libTKernelExt ${libTKernel} EXT)
-if("${libTKernelExt}" STREQUAL ".a")
-    set(OCCT_STATIC ON)
-endif()
-
-if(OCCT_STATIC)
-    find_package(Threads)
-
-    if(WASM_BUILD)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    else()
-        # OpenCASCADE_LIBRARIES repeated N times below in order to fix cyclic dependencies
-        # tfk: --start-group ... --end-group didn't work on the apple linker when last tested
-        if(APPLE)
-            set(OpenCASCADE_LIBRARIES
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
-        else()
-            set(OpenCASCADE_LIBRARIES
-                -Wl,--start-group
-                ${OpenCASCADE_LIBRARIES}
-                -Wl,--end-group
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
-        endif()
-    endif()
-
-    if(NOT APPLE AND NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "rt")
-    endif()
-    if(NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "dl")
-    endif()
-endif()
-
-add_library(OpenCASCADE_INTERFACE INTERFACE)
-target_include_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_INCLUDE_DIR}")
-target_link_libraries(OpenCASCADE_INTERFACE INTERFACE ${OpenCASCADE_LIBRARIES})
-target_link_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_LIBRARY_DIR}")
-set(OpenCASCADE_LIBRARIES OpenCASCADE_INTERFACE)
-install(TARGETS OpenCASCADE_INTERFACE EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
@@ -1,145 +0,0 @@
-#
-# Input variables:
-# - `OPENCOLLADA_INCLUDE_DIR`
-# - `OPENCOLLADA_LIBRARY_DIR`
-# - `PCRE_LIBRARY_DIR`
-# If input variables are not specified, try to find OpenCOLLADA config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `OPENCOLLADA_INCLUDE_DIR`
-# - `OPENCOLLADA_LIBRARY_DIR`
-# - `OPENCOLLADA_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR)
-
-if(NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR)
-    # If package is found, automatically sets
-    # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
-    find_package(OpenCOLLADA CONFIG)
-    mark_as_advanced(OpenCOLLADA_DIR)
-    if(OpenCOLLADA_DIR)
-        message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
-        set(OPENCOLLADA_FOUND TRUE)
-    else()
-        message(STATUS "OpenCOLLADA package not found, falling back to manual search.")
-    endif()
-endif()
-
-if(NOT OpenCOLLADA_DIR)
-    # Find OpenCOLLADA
-    if("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
-        message(STATUS "No OpenCOLLADA include directory specified")
-        set(OPENCOLLADA_INCLUDE_DIR "/usr/include/opencollada" CACHE FILEPATH "OpenCOLLADA header files")
-    else()
-        set(OPENCOLLADA_INCLUDE_DIR "${OPENCOLLADA_INCLUDE_DIR}" CACHE FILEPATH "OpenCOLLADA header files")
-    endif()
-
-    if("${OPENCOLLADA_LIBRARY_DIR}" STREQUAL "")
-        message(STATUS "No OpenCOLLADA library directory specified")
-        find_library(
-            OPENCOLLADA_FRAMEWORK_LIB
-            NAMES OpenCOLLADAFramework
-            PATHS /usr/lib64/opencollada /usr/lib/opencollada /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
-        )
-        get_filename_component(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_FRAMEWORK_LIB} PATH)
-    endif()
-
-    find_library(
-        OpenCOLLADAFramework
-        NAMES OpenCOLLADAFramework OpenCOLLADAFrameworkd
-        PATHS ${OPENCOLLADA_LIBRARY_DIR}
-        NO_DEFAULT_PATH
-    )
-
-    if(OpenCOLLADAFramework)
-        message(STATUS "OpenCOLLADA library files found")
-    else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA libraries. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
-    endif()
-
-    set(OPENCOLLADA_LIBRARY_DIR "${OPENCOLLADA_LIBRARY_DIR}" CACHE FILEPATH "OpenCOLLADA library files")
-
-    set(OPENCOLLADA_INCLUDE_DIRS
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils"
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter"
-    )
-
-    find_file(COLLADASWStreamWriter_h "COLLADASWStreamWriter.h" ${OPENCOLLADA_INCLUDE_DIRS})
-
-    if(COLLADASWStreamWriter_h)
-        message(STATUS "OpenCOLLADA header files found")
-        set(OPENCOLLADA_FOUND TRUE)
-
-        set(OPENCOLLADA_LIBRARY_NAMES
-            GeneratedSaxParser
-            MathMLSolver
-            OpenCOLLADABaseUtils
-            OpenCOLLADAFramework
-            OpenCOLLADASaxFrameworkLoader
-            OpenCOLLADAStreamWriter
-            UTF
-            buffer
-            ftoa
-        )
-
-        # Use the found OpenCOLLADAFramework as a template for all other OpenCOLLADA libraries
-        foreach(lib ${OPENCOLLADA_LIBRARY_NAMES})
-            # Make sure we'll handle the Windows/MSVC debug postfix convention too.
-            string(REPLACE OpenCOLLADAFrameworkd "${lib}" lib_path "${OpenCOLLADAFramework}")
-            string(REPLACE OpenCOLLADAFramework "${lib}" lib_path "${lib_path}")
-            list(APPEND OPENCOLLADA_LIBRARIES "${lib_path}")
-        endforeach()
-
-        if("${PCRE_LIBRARY_DIR}" STREQUAL "")
-            if(WIN32)
-                find_library(pcre_library NAMES pcre pcred PATHS ${OPENCOLLADA_LIBRARY_DIR} NO_DEFAULT_PATH)
-            else()
-                find_library(pcre_library NAMES pcre PATHS ${OPENCOLLADA_LIBRARY_DIR})
-            endif()
-
-            get_filename_component(PCRE_LIBRARY_DIR ${pcre_library} PATH)
-        else()
-            find_library(pcre_library NAMES pcre pcred PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH)
-        endif()
-
-        if(pcre_library)
-            set(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR})
-
-            if(MSVC)
-                # Add release lib regardless whether release or debug found. Debug version will be appended below.
-                list(APPEND OPENCOLLADA_LIBRARIES "${PCRE_LIBRARY_DIR}/pcre.lib")
-            else()
-                list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
-            endif()
-        else()
-            message(
-                FATAL_ERROR
-                "COLLADA_SUPPORT enabled, but unable to find PCRE. "
-                "Disable COLLADA_SUPPORT or fix PCRE_LIBRARY_DIR path to proceed."
-            )
-        endif()
-
-        if(MSVC)
-            add_debug_variants(OPENCOLLADA_LIBRARIES "${OPENCOLLADA_LIBRARIES}" d)
-        endif()
-    else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
-    endif()
-endif(NOT OpenCOLLADA_DIR)
-
-if(OPENCOLLADA_FOUND)
-    add_definitions(-DWITH_OPENCOLLADA)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
-endif()
@@ -1,56 +0,0 @@
-#
-# Input variables:
-# - `PROJ_INCLUDE_DIR`
-# - `PROJ_LIBRARIES`
-# If input variables are not specified, try to find PROJ config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `PROJ::proj`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(PROJ_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(PROJ_LIBRARIES)
-
-if((NOT PROJ_INCLUDE_DIR AND NOT PROJ_LIBRARIES))
-    find_package(PROJ QUIET CONFIG)
-
-    if(NOT PROJ_FOUND)
-        find_path(PROJ_INCLUDE_DIR proj.h PATHS /usr/include/proj REQUIRED)
-        if(PROJ_INCLUDE_DIR)
-            message(STATUS "Found PROJ include files in: ${PROJ_INCLUDE_DIR}")
-        else()
-            message(FATAL_ERROR "Unable to find PROJ include directory, specify PROJ_INCLUDE_DIR manually.")
-        endif()
-
-        find_library(PROJ_LIBRARY NAMES proj PATHS /usr/lib/x86_64-linux-gnu)
-        if(PROJ_LIBRARY)
-            message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-            set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-        else()
-            message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-        endif()
-
-        add_library(PROJ::proj INTERFACE IMPORTED)
-        target_include_directories(PROJ::proj INTERFACE "${PROJ_INCLUDE_DIR}")
-        target_link_libraries(PROJ::proj INTERFACE ${PROJ_LIBRARIES})
-        target_link_directories(PROJ::proj INTERFACE "${PROJ_LIBRARY}")
-    endif()
-else()
-    find_library(PROJ_LIBRARY NAMES proj PATHS ${PROJ_LIBRARY_DIR})
-    if(PROJ_LIBRARY)
-        message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-        set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-    else()
-        message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-    endif()
-
-    set(PROJ_INCLUDE_DIR ${PROJ_INCLUDE_DIR} CACHE FILEPATH "PROJ header files")
-    message(STATUS "Looking for PROJ include files in: ${PROJ_INCLUDE_DIR}")
-    include_directories(${PROJ_INCLUDE_DIR})
-endif()
-
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
@@ -1,86 +0,0 @@
-#
-# Input variables:
-# - `USD_INCLUDE_DIR`
-# - `USD_LIBRARY_DIR`
-# - `TBB_INCLUDE_DIR`
-# - `TBB_LIBRARY_DIR`
-# Input variables could also be provided as environment variables.
-# If `USD_INCLUDE_DIR` and `USD_LIBRARY_DIR` are not provided,
-# try to find USD by locating its config file.
-#
-# Output targets:
-# - `pxr::USD`
-
-UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_LIBRARY_DIR)
-
-if(NOT USD_LIBRARY_DIR AND NOT USD_INCLUDE_DIR)
-    find_package(pxr CONFIG)
-    if(pxr_FOUND)
-        add_library(pxr::USD INTERFACE IMPORTED)
-        target_link_libraries(pxr::USD INTERFACE ${PXR_LIBRARIES})
-        include(FindPackageHandleStandardArgs)
-        find_package_handle_standard_args(USD REQUIRED_VARS pxr_DIR)
-        return()
-    endif()
-endif()
-
-if(NOT USD_INCLUDE_DIR)
-    find_path(USD_INCLUDE_DIR pxr.h PATHS /usr/include/pxr /usr/local/include/pxr REQUIRED)
-    if(USD_INCLUDE_DIR)
-        message(STATUS "Found USD include files in: ${USD_INCLUDE_DIR}")
-    else()
-        message(FATAL_ERROR "Unable to find USD include directory, specify USD_INCLUDE_DIR manually.")
-    endif()
-else()
-    set(USD_INCLUDE_DIR ${USD_INCLUDE_DIR} CACHE FILEPATH "USD header files")
-    message(STATUS "Looking for USD include files in: ${USD_INCLUDE_DIR}")
-endif()
-
-set(USD_LIBRARIES
-    usd_usd
-    usd_usdGeom
-    usd_usdShade
-    usd_usdLux
-    usd_vt
-    usd_sdf
-    usd_tf
-    usd_gf
-    usd_kind
-    usd_pcp
-    usd_arch
-    usd_ar
-    usd_plug
-    usd_js
-    usd_sdr
-    usd_work
-    usd_trace
-    usd_ndr
-    usd_ts
-)
-
-find_library(USD_LIBRARY NAMES ${USD_LIBRARIES} PATHS ${USD_LIBRARY_DIR})
-if(USD_LIBRARY)
-    message(STATUS "USD libraries ${USD_LIBRARIES} found in: ${USD_LIBRARY_DIR}")
-    link_directories(${USD_LIBRARY_DIR})
-else()
-    message(FATAL_ERROR "Unable to find USD libraries in: ${USD_LIBRARY_DIR}")
-endif()
-
-add_library(pxr::USD INTERFACE IMPORTED)
-target_link_directories(pxr::USD INTERFACE ${USD_LIBRARY_DIR} ${TBB_LIBRARY_DIR})
-target_include_directories(pxr::USD INTERFACE ${USD_INCLUDE_DIR} ${TBB_INCLUDE_DIR})
-
-# We don't link TBB libraries - on Windows they're provided using `pragma(lib)`.
-# On Unix there's no `pragma(lib)`, so in theory it will break.
-target_link_libraries(pxr::USD INTERFACE ${USD_LIBRARIES})
-
-if(MSVC)
-    target_link_libraries(pxr::USD INTERFACE debug DbgHelp.lib)
-endif()
-
-target_compile_definitions(pxr::USD INTERFACE PXR_STATIC WITH_USD)
-
-set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
@@ -1,30 +0,0 @@
-#
-# Input variables:
-# - `JSON_INCLUDE_DIR`
-# If input variables are not specified, try to find nlohmann_json config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `nlohmann_json::nlohmann_json`
-
-UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-
-if(NOT JSON_INCLUDE_DIR)
-    find_package(nlohmann_json CONFIG)
-    mark_as_advanced(nlohmann_json)
-    if(nlohmann_json_DIR)
-        return()
-    endif()
-endif()
-
-find_path(json_header_path "nlohmann/json.hpp" HINTS "${JSON_INCLUDE_DIR}")
-mark_as_advanced(json_header_path)
-
-if(json_header_path)
-    message(STATUS "JSON for Modern C++ header file found in '${json_header_path}'.")
-    add_library(nlohmann_json::nlohmann_json INTERFACE IMPORTED)
-    target_include_directories(nlohmann_json::nlohmann_json INTERFACE ${json_header_path})
-    return()
-endif()
-
-message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
@@ -1,31 +1,13 @@
-#
-# Input variables:
-# - `HDF5_INCLUDE_DIR`
-# - `HDF5_LIBRARY_DIR`
-# - `HDF5_LIBRARIES`
-# If input variables are not specified, try to find HDF5 config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `HDF5_INCLUDE_DIR`
-# - `HDF5_LIBRARY_DIR`
-# - `HDF5_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
-
 # To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
+list(REMOVE_ITEM CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})

-if(NOT HDF5_INCLUDE_DIR)
+if("${HDF5_INCLUDE_DIR}" STREQUAL "")
    message(STATUS "No HDF5 include directory specified")
 else()
    set(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
 endif()

-if(NOT HDF5_LIBRARY_DIR)
+if("${HDF5_LIBRARY_DIR}" STREQUAL "")
    message(STATUS "No HDF5 library directory specified")
 else()
    set(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
@@ -35,7 +17,7 @@ if(HDF5_LIBRARY_DIR)
    # result of the HDF5 ctest package
    # Find zlib using cmake find_library. How should this be implemented?
    # FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
-    if(NOT DEFINED ENV{CONDA_BUILD})
+    if("$ENV{CONDA_BUILD}" STREQUAL "")
        # result of the HDF5 ctest package
        if(WIN32)
            set(zlib_post lib)
@@ -55,6 +37,7 @@ if(HDF5_LIBRARY_DIR)
            "${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
            "${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
        )
+
    else()
        message(STATUS "Packaging hdf5 and zlib for conda distribution")

@@ -85,18 +68,9 @@ endif()
 if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
    # First try to find it as a config.
    find_package(HDF5 CONFIG)
-    mark_as_advanced(HDF5_DIR)
    if(HDF5_DIR)
        message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
-        if(TARGET hdf5_cpp-static)
-            set(HDF5_LIBRARIES hdf5_cpp-static)
-        elseif(TARGET hdf5_cpp-shared)
-            set(HDF5_LIBRARIES hdf5_cpp-shared)
-        elseif(TARGET hdf5::hdf5_cpp-shared)
-            set(HDF5_LIBRARIES hdf5::hdf5_cpp-shared)
-        else()
-            find_package(HDF5 REQUIRED COMPONENTS CXX)
-        endif()
+        set(HDF5_LIBRARIES hdf5_cpp-static)
    else()
        # If it failed, still try to find as a module.
        # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
@@ -112,6 +86,3 @@ if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
        endif()
    endif()
 endif()
-
-# Restore module path.
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
@@ -1,97 +0,0 @@
-@PACKAGE_INIT@
-
-# Variable to inspect installed schema versions.
-set(IFCOPENSHELL_SCHEMA_VERSIONS @SCHEMA_VERSIONS@)
-
-set(IFCOPENSHELL_WITH_OPENCASCADE @WITH_OPENCASCADE@)
-set(IFCOPENSHELL_WITH_CGAL @WITH_CGAL@)
-set(IFCOPENSHELL_IFCXML @IFCXML_SUPPORT@)
-set(IFCOPENSHELL_WITH_ROCKSDB @WITH_ROCKSDB@)
-set(IFCOPENSHELL_COLLADA_SUPPORT @COLLADA_SUPPORT@)
-set(IFCOPENSHELL_GLTF_SUPPORT @GLTF_SUPPORT@)
-set(IFCOPENSHELL_HDF5_SUPPORT @HDF5_SUPPORT@)
-set(IFCOPENSHELL_WITH_PROJ @WITH_PROJ@)
-set(IFCOPENSHELL_USD_SUPPORT @USD_SUPPORT@)
-
-include(CMakeFindDependencyMacro)
-
-set(IFCOPENSHELL_BOOST_USE_STATIC_LIBS "@Boost_USE_STATIC_LIBS@")
-set(IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME "@Boost_USE_STATIC_RUNTIME@")
-set(IFCOPENSHELL_BOOST_USE_MULTITHREADED "@Boost_USE_MULTITHREADED@")
-if(NOT "${IFCOPENSHELL_BOOST_USE_STATIC_LIBS}" STREQUAL "")
-    set(Boost_USE_STATIC_LIBS ${IFCOPENSHELL_BOOST_USE_STATIC_LIBS})
-endif()
-if(NOT "${IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME}" STREQUAL "")
-    set(Boost_USE_STATIC_RUNTIME ${IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME})
-endif()
-if(NOT "${IFCOPENSHELL_BOOST_USE_MULTITHREADED}" STREQUAL "")
-    set(Boost_USE_MULTITHREADED ${IFCOPENSHELL_BOOST_USE_MULTITHREADED})
-endif()
-set(Boost_COMPONENTS
-    system
-    program_options
-    regex
-    thread
-    date_time
-    iostreams
-)
-find_dependency(Boost CONFIG COMPONENTS ${Boost_COMPONENTS})
-find_dependency(Eigen3 CONFIG)
-
-if(IFCOPENSHELL_WITH_ROCKSDB)
-    find_dependency(zstd CONFIG)
-
-    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
-    # find it's zstd dependency on Windows.
-    # Only do it on Windows, otherwise it might create problems as
-    # findzstd and zstd-config target names do not match.
-    # https://github.com/facebook/rocksdb/pull/13975
-    if(WIN32)
-        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-    endif()
-    find_dependency(RocksDB CONFIG)
-    if(WIN32)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
-    endif()
-endif()
-
-if(IFCOPENSHELL_IFCXML)
-    find_dependency(LibXml2)
-endif()
-
-if(IFCOPENSHELL_WITH_CGAL)
-    find_dependency(CGAL CONFIG)
-endif()
-
-if(IFCOPENSHELL_COLLADA_SUPPORT)
-    find_dependency(OpenCOLLADA)
-endif()
-
-if(IFCOPENSHELL_GLTF_SUPPORT)
-    find_dependency(nlohmann_json CONFIG)
-endif()
-
-if(IFCOPENSHELL_HDF5_SUPPORT)
-    find_dependency(HDF5 COMPONENTS C CXX)
-endif()
-
-if(IFCOPENSHELL_WITH_PROJ)
-    find_dependency(PROJ)
-endif()
-
-if(IFCOPENSHELL_USD_SUPPORT)
-    find_dependency(USD)
-endif()
-
-if(IFCOPENSHELL_WITH_OPENCASCADE)
-    find_dependency(OpenCASCADE CONFIG)
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/@CONFIG_TARGETS_FILENAME@")
-
-check_required_components("@PROJECT_NAME@")
@@ -25,12 +25,19 @@ file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")

 foreach(file ${files})
-    set(filepath "$ENV{DESTDIR}${file}")
-    message(STATUS "Uninstalling ${filepath}")
+    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")

-    if(IS_SYMLINK "${filepath}" OR EXISTS "${filepath}")
-        file(REMOVE "${filepath}")
-    else(NOT EXISTS "${filepath}")
-        message(STATUS "File ${filepath} does not exist.")
+    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        exec_program(
+            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+            OUTPUT_VARIABLE rm_out
+            RETURN_VALUE rm_retval
+        )
+
+        if(NOT "${rm_retval}" STREQUAL 0)
+            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+        endif()
+    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
    endif()
 endforeach()
@@ -1,22 +0,0 @@
-set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(CONFIG_NAMESPACE "${PROJECT_NAME}")
-set(CONFIG_TARGETS_FILENAME ${PROJECT_NAME}Targets.cmake)
-set(CONFIG_VERSION_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-set(CONFIG_PACKAGE_INPUT "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in")
-set(CONFIG_PACKAGE_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
-
-# Allow linking against build directory.
-export(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} FILE ${CONFIG_TARGETS_FILENAME} NAMESPACE ${CONFIG_NAMESPACE}::)
-
-install(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} NAMESPACE ${CONFIG_NAMESPACE}:: DESTINATION "${CONFIG_PACKAGE_LOCATION}")
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(${CONFIG_VERSION_OUTPUT} COMPATIBILITY ExactVersion)
-
-configure_package_config_file(
-    ${CONFIG_PACKAGE_INPUT}
-    ${CONFIG_PACKAGE_OUTPUT}
-    INSTALL_DESTINATION ${CONFIG_PACKAGE_LOCATION}
-)
-
-install(FILES "${CONFIG_PACKAGE_OUTPUT}" "${CONFIG_VERSION_OUTPUT}" DESTINATION ${CONFIG_PACKAGE_LOCATION})
@@ -19,9 +19,8 @@

 # Create a cache entry if absent for environment variables
 macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if(NOT DEFINED ${VAR} AND DEFINED ENV{${VAR}} AND NOT ENV{${VAR}} STREQUAL "")
+    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-        mark_as_advanced(${VAR})
    endif()
 endmacro()

@@ -114,30 +113,6 @@ function(add_debug_variants NAME LIBRARIES POSTFIX)
    set(${NAME} ${LIBRARIES} PARENT_SCOPE)
 endfunction()

-# E.g.
-# - `get_release_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylib.lib"`
-# - `get_release_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylib.lib"`
-function(get_release_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if("${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$")
-        string(REPLACE "${DEBUG_SUFFIX}" "${RELEASE_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
-# E.g.
-# - `get_debug_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylibd.lib"`
-# - `get_debug_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylibd.lib"`
-function(get_debug_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if(NOT "${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$" AND "${LIBRARY}" MATCHES "${RELEASE_SUFFIX}$")
-        string(REPLACE "${RELEASE_SUFFIX}" "${DEBUG_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
 function(files_for_ifc_version IFC_VERSION RESULT_NAME)
    set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
    set(${RESULT_NAME}
@@ -9,6 +9,7 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
 -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
 -D CMAKE_BUILD_TYPE:STRING=Release ^
+ -D CMAKE_CXX_STANDARD=17 ^
 -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -41,8 +42,9 @@ cmake -G "Ninja" ^
 -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
 -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
 -D Boost_USE_STATIC_LIBS:BOOL=OFF ^
+ -D CITYJSON_SUPPORT:BOOL=OFF ^
 ../cmake
-
+ 
 if errorlevel 1 exit 1

 ninja install -j 1
@@ -51,4 +53,4 @@ if errorlevel 1 exit 1

 python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py

-if errorlevel 1 exit 1
+if errorlevel 1 exit 1
@@ -16,6 +16,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
 -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DCMAKE_CXX_STANDARD=17 \
  ${CMAKE_PLATFORM_FLAGS[@]} \
 -DCMAKE_PREFIX_PATH=$PREFIX \
 -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -41,6 +42,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
 -DBUILD_IFCGEOM:BOOL=ON \
 -DBUILD_GEOMSERVER:BOOL=OFF \
 -DBOOST_USE_STATIC_LIBS:BOOL=OFF \
+ -DCITYJSON_SUPPORT:BOOL=OFF \
 ./cmake

 ninja
@@ -1,8 +1,7 @@
-import argparse
 import re
+import argparse
 from pathlib import Path

-
 def update_version(file_path: str, version: str) -> None:
    """Update the version string in the given __init__.py file."""
    file_path = Path(file_path)
@@ -1,5 +1,4 @@
 import textwrap
-
 # The `extensions` list should already be in here from `sphinx-quickstart`
 extensions = [
    # there may be others here already, e.g. 'sphinx.ext.mathjax'
@@ -1,10 +1,14 @@
 #Look for an executable called sphinx-build
-find_program(SPHINX_EXECUTABLE NAMES sphinx-build DOC "Path to sphinx-build executable")
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")

 include(FindPackageHandleStandardArgs)

 #Handle standard arguments to find_package like REQUIRED and QUIET
-find_package_handle_standard_args(Sphinx "Failed to find sphinx-build executable" SPHINX_EXECUTABLE)
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)

 find_package(Doxygen REQUIRED)
 #find_package(Sphinx REQUIRED)
@@ -12,24 +16,25 @@ find_package(Doxygen REQUIRED)
 set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
 set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/docs/sphinx)

-message(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
+MESSAGE(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")

 file(MAKE_DIRECTORY ./output/doxygen)

-if(DOXYGEN_FOUND)
-    add_custom_target(
-        Sphinx
-        ALL
-        COMMAND ${SPHINX_EXECUTABLE} -v -T -b html ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
-        COMMENT "Generating documentation with Sphinx"
-    )
+if (DOXYGEN_FOUND)

-    # add_custom_target(ifcopenshell_python_docs ALL
-    # COMMAND make html
-    # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
-    # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
-    # COMMENT "Generating documentation with Sphinx")
-else(DOXYGEN_FOUND)
-    message("Doxygen need to be installed to generate the doxygen documentation")
-endif(DOXYGEN_FOUND)
+add_custom_target(Sphinx ALL
+                  COMMAND
+                  ${SPHINX_EXECUTABLE} -v -T -b html
+				  ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
+				  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
+                  COMMENT "Generating documentation with Sphinx")
+					  
+# add_custom_target(ifcopenshell_python_docs ALL
+                  # COMMAND make html
+                  # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+				  # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+                  # COMMENT "Generating documentation with Sphinx")
+	
+else (DOXYGEN_FOUND)
+  message("Doxygen need to be installed to generate the doxygen documentation")
+endif (DOXYGEN_FOUND)
@@ -1,28 +0,0 @@
-<!-- This file was generated with the assistance of an AI coding tool. -->
-
-# Developer notes (in-progress features)
-
-This directory holds **living design/working notes for unmerged feature branches**,
-one Markdown file per feature, named after its branch (e.g.
-`opening-template-on-type.md`).
-
-## Purpose
-
-A shared scratchpad so collaborators — and the AI agents they work with — can pick up
-the context behind an in-progress branch: the problem, the design decisions and the
-*why*, dead ends already ruled out, and what still needs testing. Because the note is
-committed on the branch, it travels with the PR and shows up in the diff, so it is
-discoverable without anyone being told where to look.
-
-## How to use it (humans and agents)
-
- **Before working on a feature branch**, read its note here if one exists.
- **As the PR is refined**, keep the note current — append decisions, correct things
-  that changed, update the test checklist.
- **One file per feature**, named after the branch.
-
-## Lifecycle
-
-These are *not* permanent user documentation. When a PR merges, either remove its note
-or promote the durable parts (the load-bearing "why") into code comments or the regular
-docs, so stale notes do not accumulate on the default branch.
@@ -1,165 +0,0 @@
-<!-- This file was generated with the assistance of an AI coding tool. -->
-
-# Opening template on type — preserving custom openings across duplicate_type / append
-
-> **Living dev note** for the `opening-template-on-type` branch/PR. Read before working
-> on the feature; append decisions and findings as the PR is refined. This is *not* user
-> documentation — at merge it is removed or its durable parts promoted to code comments.
-> See [README.md](README.md) for the convention.
-
-## Problem
-
-`bpy.ops.bim.duplicate_type` and `bpy.ops.bim.append_library_element` lose a custom
-`IfcOpeningElement` body (e.g. an `IfcPolygonalFaceSet`/tessellation) and replace it
-with a generated extrusion. Root cause: the only mechanism that preserved a custom
-opening was "copy it from a sibling occurrence of the same type"
-(`get_existing_opening_occurrence_if_any`), which returns nothing for a brand-new
-type. `generate_opening_from_filling` then always builds an extrusion (profile or
-bbox), discarding the custom geometry.
-
-## Key facts established
-
- IFC-level `root.copy_class` already `copy_deep`s opening representations; the loss
-  happens on the Bonsai side (the `regenerate_from_type` listener on
-  `type.assign_type`, and placement-time generation).
- Opening occurrences of one type already **share** a single `IfcRepresentationMap`
-  via mapped representations — that is why editing one void edits them all
-  (see `tool.Model.unshare_opening_representation` docstring). Bonsai shares, it does
-  not copy. The shared map just has no durable home (it is hosted implicitly by
-  whichever occurrence exists), so it does not survive to a new type.
- IFC4 ADD2 TC1 `IfcShapeRepresentation`: identifier **`Reference`** = "3D
-  representation that is **not part of the Body representation** ... used, e.g., for
-  opening geometries ... excluded from an implicit Boolean operation." Schema-valid;
-  `IfcTypeProduct` has no uniqueness rule on `RepresentationMaps` (only
-  `ApplicableOccurrence`). So a `Reference` map can sit beside the `Body` map.
- The geometry kernel selects an opening's geometry **by context, not by
-  `RepresentationIdentifier`** (`mapping::representation_of`, `ifcgeom/mapping/mapping.cpp`).
-  So a `Reference`-identified opening in the Body context still booleans correctly.
-  Nothing in Bonsai reads `"Reference"` to *skip* applying an opening.
- Caveat: IFC has no type-level void (`IfcRelVoidsElement` is occurrence-only). The
-  "opening template on type" is therefore a Bonsai convention using a spec-valid
-  identifier; other tools see a harmless extra `Reference` rep they ignore. The
-  regeneration smarts are Bonsai-only by necessity.
-
-## Design
-
-Store the shared opening body on the **type** as a `Reference` representation map.
-Because `bim.duplicate_type` (`tool.Root.copy_representation`) and
-`append_type_product` both copy a type's `RepresentationMaps`, the template survives
-both. Occurrence openings map over the same map, so editing a void rewrites the
-shared map = updates the type template in one stroke (no separate write-back needed).
-
-`map_type_representations` must skip `Reference` maps so the window/door occurrence
-does not receive the opening shape as its own Body (the kernel would otherwise pick
-arbitrarily between the real Body and the opening rep). The skip is both required and
-spec-endorsed ("not part of the Body representation").
-
-### Body-context coexistence (Option A)
-
-The template lives in the **Body** subcontext (required: the instance opening that maps
-over it must resolve in Body context for the geometry kernel to subtract it). So the
-type holds two reps in one context: the `Body` window body and the `Reference` opening
-template. Per IFC, `Reference` is a *RepresentationIdentifier value used within the Body
-context*, not a separate context - so we keep it there and disambiguate elsewhere:
-
- The representations panel now shows `RepresentationIdentifier` as its own column
-  (`geometry/data.py`, `geometry/ui.py`) so the two Body-context reps are
-  distinguishable (`Model | Body | MODEL_VIEW | Reference | Tessellation`). The panel
-  column previously read "Body" because it shows `ContextOfItems.ContextIdentifier`,
-  not the representation's identifier.
- `Geometry.reimport_element_representations` type branch now renders the requested
-  `base_representation` instead of `get_representation(element, context)`, which matched
-  only by context and returned the window body when switching to the `Reference` rep.
-  This is what makes "switch to the Reference row" actually show the void on the type.
-
-### Precedence in `generate_opening_from_filling`
-type `Reference` template → (existing sibling occurrence, checked by callers) →
-type `Profile` extrusion → bbox extrusion.
-
-### Type switching (assign_type)
-
-On `type.assign_type` the opening is rebuilt to reflect the **assigned** type's void.
-Two listeners in `model/handler.py`:
-
- **pre** `Bonsai.Opening.PreserveOnTypeChange` → `preserve_opening_on_type_change`:
-  before the filling moves to the new type, `promote_opening_to_type(old_type)` anchors
-  the old type's custom void as a template, so it isn't lost when (possibly the last)
-  occurrence is regenerated. Idempotent; custom voids only.
- **post** `Bonsai.Opening.RegenerateFromType` → `regenerate_from_type` →
-  `_regenerate_from_type`: rebuilds from the new type's template / sibling / extrusion.
-  The old PR1 "preserve custom" guard was **removed** here — it kept the previous type's
-  void on a switch (wrong), and the template now makes preservation unnecessary.
-
-NOTE: upstream `v0.8.0` landed `assign_type` changes + new `test_assign_type_*` tests
-(merged under this branch's base). The listeners ride on top of that — re-test the
-switch/edit round-trips against the new `assign_type`.
-
-### Write-back on void edit
-
-Editing an occurrence's void writes the new geometry back to the type's `Reference`
-template via `update_type_template_from_opening` (creates the template if absent), then
-**re-maps every occurrence's opening onto the template** and reloads the affected host walls
-(`switch_representation`) so they re-boolean. The re-map (`_remap_opening_to_template`) is the
-key part: an earlier version only re-pointed a *pre-existing* shared map, so siblings whose
-openings were **independent** (their own `IfcRepresentationMap`, never sharing the template)
-didn't follow — the common real-world case. Now they do. Hooked at both commit paths:
-`UpdateRepresentation._execute` (the `edited_objs` path) and
-`OverrideModeSetObject` after `edit_representation_item` (the in-place item edit). The
-older `edit_openings`/`is_edited` path also calls it. `set_type_opening_representation`
-has replace semantics (one `Reference` map per type).
-
-### Preserving adjusted extrusions (duplicate_type)
-
-`is_opening_representation_custom` only flags *non-extrusion* geometry (tessellation, brep,
-CSG) as worth preserving — a proxy for "not regenerable". That mis-classifies a *manually
-adjusted* extrusion, which is still an `IfcExtrudedAreaSolid`, so a hand-tweaked extrusion
-opening was reset to the default on `duplicate_type`.
-
-`promote_opening_to_type` now gates on `should_preserve_opening` = custom **or**
-`_is_adjusted_extrusion`. The latter generates the default (`generate_opening_from_filling`,
-which yields the default since no template exists at promote time) *transiently*, compares the
-two bodies' axis-aligned bounding boxes (1 mm tolerance) via the geom engine, then removes the
-temporary default. Divergence ⇒ the extrusion was adjusted ⇒ promote it; a plain default
-matches ⇒ left regenerable (not frozen — see the "freeze" discussion). Scoped to the duplicate
-path so the generate-and-compare stays out of the hot predicate. Limitation: bbox comparison
-misses a shape change that preserves the bbox (upgrade to a vertex-set compare if needed).
-
-## Status — implemented (manually verified in Blender)
-
- core `map_type_representations.py`: skip `Reference` maps.
- `model/opening.py`: `get_/set_type_opening_representation`, `promote_opening_to_type`,
-  `update_type_template_from_opening` (+ `_remap_opening_to_template`),
-  `preserve_opening_on_type_change`, `should_preserve_opening` (+ `_is_adjusted_extrusion`,
-  `_representation_bbox`); `generate_opening_from_filling` consults the template; PR1 guard
-  removed from `_regenerate_from_type`.
- `model/handler.py`: pre + post assign_type listeners.
- `type/operator.py` `DuplicateType`: promote before copy.
- `project/operator.py` `AppendLibraryElement`: `harvest_opening_template`.
- `geometry/operator.py`: write-back hooks in `UpdateRepresentation` and
-  `OverrideModeSetObject`; `reimport_element_representations` renders the requested rep.
- `geometry/data.py` + `geometry/ui.py`: `RepresentationIdentifier` column + headers.
-
-Branch `opening-template-on-type` (#8200): initial feature commit + the #7916 build-conflict
-ancestry-merge + void-propagation-to-all-occurrences + adjusted-extrusion preservation. The
-`docs/dev-notes/` convention itself lives on the stacked branch `dev-notes-system` (#8201).
-
-Still **deferred:** explicit "Apply/Reset to type" operators + a "diverges from type"
-indicator; import never auto-writes back. `update_simple_openings` still keeps its
-`is_opening_representation_custom` guard (array propagation, same type — left as-is).
-
-## Things to test / verify
-
- Duplicated/appended type's new occurrence gets the faceset void and it **cuts** the
-  wall (kernel selects opening geom by context, so a `Reference`-id rep still booleans).
- `harvest_opening_template` cross-file `file.add`: no duplicate
-  `IfcGeometricRepresentationContext` left behind; units (kernel doesn't rescale rep
-  coords — same assumption as `append_asset`).
- Switch X→Y→X round-trip restores each type's void; switching to a plain (template-less)
-  type gives its default extrusion, not the previous faceset.
- Edit a void → type's `Reference` row updates; **all** occurrences follow (including ones
-  that had independent openings) and their host walls re-boolean; survives duplicate.
- `duplicate_type` on a type whose extrusion opening was **manually adjusted** → Type B keeps
-  the adjusted extrusion; a type with a plain/default extrusion stays regenerable (not frozen).
- Three write-back hooks are intentional (different commit paths) — candidate for
-  consolidation in review.
- Re-test against upstream's new `assign_type` (see NOTE under "Type switching").
@@ -1,10 +1,10 @@
 # This program requires doxygen, sphinx, breathe and exhale.

-import multiprocessing
 import os
+import sys
 import shutil
 import subprocess
-import sys
+import multiprocessing

 # some extra check to see if we can find sphinx in pypy bin dir
 sphinx_build = os.path.join(os.path.dirname(sys.executable), 'sphinx-build')
@@ -1,6 +1,4 @@
 #!/usr/bin/python
-# /// script
-# ///
 ###############################################################################
 #                                                                             #
 # This file is part of IfcOpenShell.                                          #
@@ -58,6 +56,8 @@ Used environment variables:
    `SIDE_MODULE_CFLAGS`, `SIDE_MODULE_LDFLAGS`.
    Allows to build wasm without pyodide build environment, which can be useful for debugging build issues.
    Example value: 'pyodide/cpython/installs/python-3.13.2'
+    - ``WASM_TOOLCHAIN_FILE`` - path to emscripten toolchain file from pyodide ('Emscripten.cmake')
+    needed only if ``WASM_PYTHON_PATH`` is provided.
    - ``ADD_COMMIT_SHA`` - if defined with any non-empty value then
    `ADD_COMMIT_SHA` and `VERSION_OVERRIDE` will be set to `ON` while configuring IfcOpenShell

@@ -77,57 +77,60 @@ Used environment variables:
 #                                                                             #
 #   for python37 to install correctly additionally:                           #
 #     * libffi(-dev[el])                                                      #
-#   for Python build we also needs ssl and zlib                               #
+#   for Python build we also needs ssl                                        #
 #   (since we do `pip install numpy` at the end)                              #
 #     * libssl-dev                                                            #
 #                                                                             #
 #     on debian 7.8 these can be obtained with:                               #
 #          $ apt-get install git gcc g++ autoconf bison bzip2 cmake           #
 #            mesa-common-dev libffi-dev libfontconfig1-dev                    #
-#            libssl-dev xz zlib1g-dev                                         #
+#            libssl-dev xz                                                    #
 #                                                                             #
 #     on ubuntu 14.04:                                                        #
 #          $ apt-get install git gcc g++ autoconf bison make cmake            #
 #            mesa-common-dev libffi-dev libfontconfig1-dev                    #
-#            libssl-dev xz-utils zlib1g-dev                                   #
+#            libssl-dev xz-utils                                              #
 #                                                                             #
 #     on OS X El Capitan with homebrew:                                       #
 #          $ brew install git bison autoconf automake libffi cmake            #
-#          $ # `bison` shipped with Mac is too old for swig build,            #
-#          $ # so we use `brew`.                                              #
-#          $ export PATH=$(brew --prefix bison)/bin:$PATH                     #
 #                                                                             #
 #     on RHEL-related distros:                                                #
-#          $ dnf install git gcc gcc-c++ autoconf bison make cmake            #
+#          $ yum install git gcc gcc-c++ autoconf bison make cmake            #
 #            mesa-libGL-devel libffi-devel fontconfig-devel bzip2             #
-#            automake patch byacc xz zlib-devel openssl-devel                 #
+#            automake patch byacc xz                                          #

 """

-import glob
 import logging
-import multiprocessing
 import os
-import platform
 import re
+import sys
+import glob
+import subprocess as sp
 import shutil
+import tarfile
+import multiprocessing
+import platform
+import threading
+import sysconfig
+from datetime import datetime

 # @todo temporary for expired mpfr.org certificate on 2023-04-08
 import ssl
-import subprocess as sp
-import sys
-import sysconfig
-import tarfile
-import threading
-from datetime import datetime

 ssl._create_default_https_context = ssl._create_unverified_context

 import time
+from urllib.request import urlretrieve
 from collections.abc import Generator, Sequence
 from pathlib import Path
-from typing import Literal, Union
-from urllib.request import urlretrieve
+
+try:
+    from typing import Union, Literal
+except:
+    # python 3.6 compatibility for rocky 8
+    from typing import Union
+    from typing_extensions import Literal

 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -138,15 +141,16 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")

-PYTHON_VERSIONS = ["3.10.3", "3.11.8", "3.12.1", "3.13.6", "3.14.0"]
+PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.6", "3.14.0"]
 JSON_VERSION = "3.11.3"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.8.1"
 BOOST_VERSION = "1.86.0"
 EIGEN_VERSION = "3.4.0"
 PCRE_VERSION = "8.41"
+PCRE2_VERSION = "10.32"
 LIBXML2_VERSION = "2.13.8"
-SWIG_VERSION = "4.2.1"
+SWIG_VERSION = "4.1.0"
 OPENCOLLADA_VERSION = "v1.6.68"
 HDF5_VERSION = "1.13.1"

@@ -239,12 +243,17 @@ if WASM:
    # Pyodide still in transition from `FLAGS` to `FLAGS_INIT`.
    # `FLAGS_INIT` allow us to provide flags using environment variables
    # and providing `FLAGS` directly would break pyodide toolchain.
-    # NOTE: changes in pyodide-build currently got postponed:
-    # https://github.com/pyodide/pyodide-build/pull/249
-    WASM_CMAKE_IS_USING_INIT_VARS = get_pyodide_build_version() >= (99, 0, 0)
+    WASM_CMAKE_IS_USING_INIT_VARS = get_pyodide_build_version() >= (0, 30, 8)

-    # 0.31 is required for SIDE_MODULE_CXXFLAGS to be provided.
-    assert get_pyodide_build_version() >= (0, 31)
+    # pyodide provide empty `CXXFLAGS`, leading to issues using C++ files compiled with `-fexceptions`
+    # which is used by OCCT.
+    # https://github.com/pyodide/pyodide-build/issues/251
+    side_module_cxx_flags = os.environ.get("SIDE_MODULE_CXXFLAGS", "")
+    if side_module_cxx_flags.strip():
+        print("SIDE_MODULE_CXXFLAGS are already passed from pyodide build ('{side_module_cxx_flags}').")
+        print("Maybe it's time to stop overriding them in the script?")
+
+    os.environ["SIDE_MODULE_CXXFLAGS"] = os.environ["SIDE_MODULE_CFLAGS"]

 # Set defaults for missing empty environment variables

@@ -284,7 +293,6 @@ DEPS_DIR = os.getenv("DEPS_DIR", DEFAULT_DEPS_DIR)
 if not os.path.exists(DEPS_DIR):
    os.makedirs(DEPS_DIR)

-INSTALL_DIR = Path(DEPS_DIR) / "install"
 BUILD_CFG = os.getenv("BUILD_CFG", "RelWithDebInfo")


@@ -310,18 +318,24 @@ cecho(f"* Build Directory   = {BUILD_DIR}", MAGENTA)
 cecho(f"* Dependency Directory   = {DEPS_DIR}", MAGENTA)
 cecho(f" - The directory where {PROJECT_NAME} dependencies are installed.")
 cecho(f"* Build Config Type      = {BUILD_CFG}", MAGENTA)
-cecho(""" - The used build configuration type for the dependencies.
-   Defaults to RelWithDebInfo if not specified.""")
+cecho(
+    """ - The used build configuration type for the dependencies.
+   Defaults to RelWithDebInfo if not specified."""
+)

 if BUILD_CFG == "MinSizeRel":
    cecho("     WARNING: MinSizeRel build can suffer from a significant performance loss.", RED)

 cecho(f"* IFCOS_NUM_BUILD_PROCS  = {IFCOS_NUM_BUILD_PROCS}", MAGENTA)
-cecho(""" - How many compiler processes may be run in parallel.
-""")
+cecho(
+    """ - How many compiler processes may be run in parallel.
+"""
+)
 cecho(f" * IFCOS_SCHEMAS = '{os.environ.get('IFCOS_SCHEMAS')}'", MAGENTA)
-cecho(""" - IFC Schemas to compile. If not provided, fallback to default provided in cmake.
-""")
+cecho(
+    """ - IFC Schemas to compile. If not provided, fallback to default provided in cmake.
+"""
+)

 dependency_tree: "dict[str, tuple[str, ...]]" = {
    "IfcParse": ("boost", "libxml2", "hdf5", "rocksdb"),
@@ -330,16 +344,18 @@ dependency_tree: "dict[str, tuple[str, ...]]" = {
    "OpenCOLLADA": ("libxml2", "pcre"),
    "IfcGeomServer": ("IfcGeom",),
    "IfcOpenShell-Python": ("python", "swig", "IfcGeom"),
-    "swig": (),
+    "swig": ("pcre2",),
    "boost": (),
    "libxml2": (),
    "python": (),
-    "occ": (),
+    "occ": ("freetype",),
    "pcre": (),
+    "pcre2": (),
    "json": (),
    "hdf5": (),
    "cgal": (),
    "eigen": (),
+    "freetype": (),
    "rocksdb": ("zstd",),
    "zstd": (),
    # 'usd': ('boost', 'oneTBB')
@@ -389,6 +405,8 @@ if any(f.startswith("py-") for f in flags):
 if any(f.startswith("occt-") for f in flags):
    OCCT_VERSION = next(f.split("-", 1)[1] for f in flags if f.startswith("occt-"))

+print(OCCT_VERSION)
+
 if explicit_targets:
    targets = {dep for target in explicit_targets for dep in gather_dependencies(target)}
 else:
@@ -402,6 +420,7 @@ if WASM:
        "opencollada",
        "swig",
        "pcre",
+        "pcre2",
        "IfcGeom",
        "IfcConvert",
        "IfcGeomServer",
@@ -416,16 +435,13 @@ print("Building:", *sorted(targets, key=lambda t: len(list(gather_dependencies(t

 # Check that required tools are in PATH
 yacc = "yacc"  # Used during swig building process, installed with `bison` on Debian / `byacc` on Red Hat.
-bison = "bison"
-
 missing_commands: "list[str]" = []
-required_commands = [git, bunzip2, tar, cc, cplusplus, autoconf, automake, make, "patch", "cmake", yacc, xz, bison]
+required_commands = [git, bunzip2, tar, cc, cplusplus, autoconf, automake, make, "patch", "cmake", yacc, xz]
 if "wasm" in flags:
    # Skip swig build for WASM.
    required_commands.append("swig")
    required_commands.append("pyodide")
    required_commands.remove(yacc)
-    required_commands.remove(bison)

 for cmd in required_commands:
    if shutil.which(cmd) is None:
@@ -484,7 +500,7 @@ def run(cmds: "Sequence[str]", cwd: "Union[str, None]" = None, can_fail: bool =
            collector.append(line)
        pipe.close()

-    logger.debug(f"running command `{' '.join(cmds)}` in directory '{cwd}'")
+    logger.debug(f"running command {' '.join(cmds)} in directory {cwd}")
    stdout: list[str] = []
    stderr: list[str] = []

@@ -530,14 +546,14 @@ BOOST_LOCATION = f"https://github.com/boostorg/boost/releases/download/boost-{BO
 # Helper functions


-def run_autoconf(dependency_name: str, configure_args: "list[str]", cwd: str) -> None:
+def run_autoconf(arg1: str, configure_args: "list[str]", cwd: str) -> None:
    configure_path = os.path.realpath(os.path.join(cwd, "..", "configure"))
    if not os.path.exists(configure_path):
        run(
            [bash, "./autogen.sh"], cwd=os.path.realpath(os.path.join(cwd, ".."))
        )  # only run autogen.sh in the directory it is located and use cwd to achieve that in order to not mess up things
    # Using `sh` over `bash` fixes issues with building swig
-    prefix = os.path.realpath(f"{DEPS_DIR}/install/{dependency_name}")
+    prefix = os.path.realpath(f"{DEPS_DIR}/install/{arg1}")

    wasm = []
    if "wasm" in flags:
@@ -916,34 +932,55 @@ if "pcre" in targets:
        restore_env("CC", OLD_CC)
        restore_env("CXX", OLD_CXX)

-if "swig" in targets:
-    dependency_name = f"swig-{SWIG_VERSION}"
+if "pcre2" in targets:
    build_dependency(
-        name=dependency_name,
-        mode="cmake",
-        build_tool_args=[
-            "-DWITH_PCRE=OFF",
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/{dependency_name}",
-        ],
+        name=f"pcre2-{PCRE2_VERSION}",
+        mode="autoconf",
+        build_tool_args=[DISABLE_FLAG],
+        download_url=f"https://downloads.sourceforge.net/project/pcre/pcre2/{PCRE2_VERSION}/",
+        download_name=f"pcre2-{PCRE2_VERSION}.tar.bz2",
+    )
+
+# An issue exists with swig-1.3 and python >= 3.2
+# Therefore, build a recent copy from source
+if "swig" in targets:
+    build_dependency(
+        name="swig",
+        mode="autoconf",
+        build_tool_args=["--disable-ccache", f"--with-pcre2-prefix={DEPS_DIR}/install/pcre2-{PCRE2_VERSION}"],
        download_url="https://github.com/swig/swig.git",
        download_name="swig",
        download_tool=download_tool_git,
        revision=f"v{SWIG_VERSION}",
    )

+if "freetype" in targets:
+    build_dependency(
+        name=f"freetype",
+        mode="cmake",
+        build_tool_args=[f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/freetype"],
+        download_url="https://github.com/freetype/freetype",
+        download_name="freetype2",
+        download_tool=download_tool_git,
+        revision="VER-2-14-0",
+    )
+
 if USE_OCCT and "occ" in targets:
-    occt_args: "list[str]" = []
-    patches: "list[str]" = []
+    patches = []
    if OCCT_VERSION < "7.4":
        patches.append("./patches/occt/enable-exception-handling.patch")

-    # Skip ExpToCasExe as we don't need it and it requires additional dependencies.
-    # Before 7.7.2 ExpToCasExe is part of DataExchange, DETools doesn't exist yet.
-    # Since we do need DataExchange (used for IgesSerializer), we use a patch to skip only ExpToCasExe.
-    if "7.7.2" > OCCT_VERSION >= "7.7":
+    if OCCT_VERSION == "7.7.1":
        patches.append("./patches/occt/no_ExpToCasExe.patch")
-    elif OCCT_VERSION >= "7.7.2":
-        occt_args.append("-DBUILD_MODULE_DETools=OFF")
+
+    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 OCCT_VERSION == "7.9.1":
+        patches.append("./patches/occt/no_ExpToCasExe_7_9_1.patch")

    if "wasm" in flags:
        patches.append("./patches/occt/no_em_js.patch")
@@ -962,9 +999,9 @@ if USE_OCCT and "occ" in targets:
            f"-DUSE_FREETYPE=OFF",
            f"-DUSE_OPENGL=OFF",
            f"-DUSE_GLES2=OFF",
+            f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype",
            f"-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
            *MAC_CROSS_COMPILE_INTEL_ARGS,
-            *occt_args,
        ],
        download_url="https://github.com/Open-Cascade-SAS/OCCT",
        download_name="occt",
@@ -1080,28 +1117,23 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
        PYTHON_CONFIGURE_ARGS.extend(["--with-universal-archs=intel-64", "--enable-universalsdk"])

    for PYTHON_VERSION in PYTHON_VERSIONS:
-        # Don't fail silently on missing Python dependencies (e.g. openssl or zlib),
-        # because later ifcopenshell-python build will fail too but in a more confusing way.
-        build_dependency(
-            f"python-{PYTHON_VERSION}",
-            "autoconf",
-            PYTHON_CONFIGURE_ARGS,
-            f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
-            f"Python-{PYTHON_VERSION}.tgz",
-        )
-        python_install = INSTALL_DIR / f"python-{PYTHON_VERSION}"
-        python_bin = python_install / "bin" / "python3"
-        # `_ssl` module is present -> we will be able to install `numpy` later
-        # to verify IfcOpenShell installation
        try:
-            run([str(python_bin), "-c", "import _ssl"])
-        except RuntimeError:
-            print(
-                "ERROR: Python was built without SSL support (_ssl module is missing). "
-                f"To fix this: remove the installed Python at {python_install}; "
-                "install OpenSSL development libraries and re-run."
+            build_dependency(
+                f"python-{PYTHON_VERSION}",
+                "autoconf",
+                PYTHON_CONFIGURE_ARGS,
+                f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
+                f"Python-{PYTHON_VERSION}.tgz",
            )
-            raise
+        except RuntimeError as e:
+            # Sometimes setting up modules such as pip/lzma can cause
+            # the python installer script to return a non zero exit
+            # code where actually the headers and dynamic libraries
+            # are installed correctly. This is all we need so we catch
+            # the exception and only reraise if a partially successful
+            # install is not detected.
+            if not os.path.exists(os.path.join(DEPS_DIR, "install", f"python-{PYTHON_VERSION}")):
+                raise e

    if MAC_CROSS_COMPILE_INTEL:
        assert original_path
@@ -1161,8 +1193,6 @@ if "cgal" in targets:
        # Disable assembly, otherwise `emcc -c conftest.s` will crash due to assembly mismatch.
        gmp_args.extend(("--disable-assembly", "--enable-cxx"))
        mpfr_args.extend(("--host", "none"))
-    elif "x86" in arch:
-        gmp_args.append("--enable-fat")  # See issues #7458 #7556

    OLD_CC = None
    if MAC_CROSS_COMPILE_INTEL:
@@ -1304,6 +1334,7 @@ os.makedirs(executables_dir, exist_ok=True)


 cmake_args = [
+    "-DCMAKE_CXX_STANDARD=17",
    "-DUSE_MMAP=OFF",
    "-DBUILD_EXAMPLES=OFF",
    "-DBUILD_SHARED_LIBS=" + OFF_ON[not BUILD_STATIC],
@@ -1378,11 +1409,11 @@ else:
    cmake_args.append("-DHDF5_SUPPORT=Off")

 if "usd" in targets:
-    cmake_args.append("-DUSD_SUPPORT=ON")
-    cmake_args_prefix_path.extend(
+    cmake_args.extend(
        [
-            f"{DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"{DEPS_DIR}/install/usd-{USD_VERSION}",
+            f"-DUSD_SUPPORT=" "On",
+            f"-DUSD_INCLUDE_DIR={DEPS_DIR}/install/usd-{USD_VERSION}/include",
+            f"-DUSD_LIBRARY_DIR={DEPS_DIR}/install/usd-{USD_VERSION}/lib",
        ]
    )

@@ -1400,9 +1431,6 @@ if "rocksdb" in targets:
        ]
    )

-if "swig" in targets:
-    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/swig-{SWIG_VERSION}")
-
 if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets)):
    logger.info("\rConfiguring executables...")

@@ -1455,6 +1483,9 @@ if "IfcOpenShell-Python" in targets:
        if os.path.exists(cache_path):
            os.remove(cache_path)

+        prefix_paths: list[str] = []
+        if "swig" in targets:
+            prefix_paths.append(f"{DEPS_DIR}/install/swig")
        if python_path:
            # We couldn't just prefix PATH and have to provide all variables explicitly,
            # see ifcwrap/cmake for the details.
@@ -1471,7 +1502,7 @@ if "IfcOpenShell-Python" in targets:
        run_cmake(
            "",
            cmake_args
-            + get_cmake_args_prefix_path()
+            + get_cmake_args_prefix_path(prefix_paths)
            + [
                *([f"-DPYTHON_EXECUTABLE={python_executable}"] if python_executable else []),
                # Needed because pyodide is expecting setup.py to be in the root.
@@ -1519,16 +1550,13 @@ if "IfcOpenShell-Python" in targets:
        )
        # Copy setup.py where pyodide build system expects it.
        shutil.copy(REPO_PATH / "pyodide" / "setup.py", REPO_PATH)
-        # Empty pyproject so it's contents won't affect the resulting wheel
-        # otherwise the wheel will use version and dependencies from toml, not setup.py.
-        (REPO_PATH / "pyproject.toml").write_text("")

    elif USE_CURRENT_PYTHON_VERSION:
        python_info = sysconfig.get_paths()
        compile_python_wrapper(platform.python_version(), python_info["include"], sys.executable)
    else:
        for python_version in PYTHON_VERSIONS:
-            python_path = INSTALL_DIR / f"python-{python_version}"
+            python_path = Path(DEPS_DIR) / "install" / f"python-{python_version}"
            module_dir = compile_python_wrapper(python_version, python_path=python_path)
            assert module_dir
            # Not sure why, but added after reading this in the logs
@@ -1,9 +1,13 @@
--- a/adm/MODULES
-+++ b/adm/MODULES
-@@ -3,5 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
- ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
- Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
- ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
-+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress
- Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd17283f77..6cecf9dad3 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -826,6 +826,8 @@ if (EMSCRIPTEN)
+   list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+ endif()
+ 
+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
@@ -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")
@@ -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")
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34300d41ad..09b2e0d45f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -721,6 +721,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+
+ # bison
+ if (BUILD_YACCLEX)
+   list (APPEND OCCT_3RDPARTY_CMAKE_LIST "adm/cmake/bison")
@@ -1,30 +1,26 @@
 #!/usr/bin/bash
 set -ex

-PYODIDE_VERSION=0.29.3
-PYODIDE_BUILD_VERSION=0.33.0
-PYODIDE_XBUILDENV_ROOT="${HOME}/.cache/.pyodide-xbuildenv-${PYODIDE_BUILD_VERSION}"
-PYODIDE_XBUILDENV="${PYODIDE_XBUILDENV_ROOT}/${PYODIDE_VERSION}"
-
-# Script is assuming that it will be possible to execute it multiple times
-# therefore we're clearing venv each time and ignoring existing 'emsdk' folder.
-
 # Install uv.
 curl -LsSf https://astral.sh/uv/install.sh | sh
-uv venv --python 3.13 --clear
+uv venv --python 3.13
 source .venv/bin/activate

 # Install pyodide cross build environment.
 # Instructions: https://pyodide.org/en/stable/development/building-packages.html
-uv pip install "pyodide-build==${PYODIDE_BUILD_VERSION}"
+uv pip install pyodide-build
 # `uv run` is required, so xbuildenv would skip using `pip`.
-uv run pyodide xbuildenv install "${PYODIDE_VERSION}"
-uv run pyodide xbuildenv install-emscripten
+uv run pyodide xbuildenv install

-EMSDK_ROOT="${PYODIDE_XBUILDENV}/emsdk"
-source "${EMSDK_ROOT}/emsdk_env.sh"
+# Emscripten doesn't come with xbuildenv.
+git clone https://github.com/emscripten-core/emsdk
+pushd emsdk
+PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
+./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
+./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
+source emsdk_env.sh
 which emcc
-emcc --version
+popd

 mkdir -p packages/ifcopenshell
 VERSION=`cat IfcOpenShell/VERSION`
@@ -1,5 +1,3 @@
-# /// script
-# ///
 """
 Cache built dependencies for builds.

@@ -7,51 +5,36 @@ This script is finding common install directory and either
 packs each folder into a tar.gz archive, if it wasn't packed before,
 or unpacks existing archives.

-Expected to be executed from 'build' directory (e.g. that might contain 'Linux/x86_64/install').
-
 Usage: python cache_dependencies.py [pack|unpack]
 """

-import platform
-import subprocess
-import sys
 import tarfile
+import sys
 from pathlib import Path
 from typing import Literal

+
 CACHE_PREFIX = "cache-"


 def get_install_dir() -> Path:
-    if platform.system() == "Darwin":
-        pattern = "Darwin/*/*/install"
-    else:
-        pattern = "*/*/install"
-    for data in Path.cwd().glob(pattern):
+    for data in Path.cwd().glob("*/*/install"):
        return data
    raise Exception("No install dir found")


-def run(cmd: str) -> None:
-    print(f"Running command: `{cmd}`")
-    subprocess.check_call(cmd, shell=True)
-
-
 def pack_dependencies(install_dir: Path) -> None:
    # Process each install_dir
    for dependency_path in install_dir.iterdir():
        if not dependency_path.is_dir():
            continue
        dependency_name = dependency_path.name
-        # Skip ifcopenshell - it's a build output, not a dependency to reuse across builds.
-        if dependency_name == "ifcopenshell":
-            continue
        tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
        if tar_path.exists():
            print(f"Skipping existing cache: '{tar_path}'")
        else:
-            # Python's `tarfile` is 10x slower than `tar` cli, so we use `tar`.
-            run(f'tar -czf "{tar_path}" -C "{install_dir}" "{dependency_name}"')
+            with tarfile.open(tar_path, "w:gz") as tar:
+                tar.add(dependency_path, arcname=dependency_path.name)
            print(f"Created cache: '{tar_path}'")


@@ -1,232 +0,0 @@
-#
-# /// script
-# # Latest Pyodide build env versions are listed here:
-# # https://pyodide.github.io/pyodide/api/pyodide-cross-build-environments.json
-# # https://github.com/pyodide/pyodide-build/blob/main/pyodide_build/xbuildenv_releases.py
-# requires-python = "==3.13.2"
-# dependencies = [
-#   "requests",
-#   "setuptools",
-# ]
-# ///
-"""
-Pack an IfcOpenShell WASM wheel using Pyodide build system.
-
-Usage:
-    uv run make_wheel.py           # Show this help
-    uv run make_wheel.py --build   # Build wheel
-    uv run make_wheel.py --clean   # Clean build artifacts and exit
-"""
-
-import argparse
-import os
-import re
-import shutil
-import subprocess
-import time
-import zipfile
-from pathlib import Path
-from urllib.parse import quote
-
-import requests
-
-# Get repo root (parent of this script's parent directory)
-REPO_ROOT = Path(__file__).parent.parent
-PYODIDE_DIR = REPO_ROOT / "pyodide"
-BUILD_DIR = PYODIDE_DIR / "build"
-
-# Hardcoded path (Windows packing workaround with --dev flag)
-PYODIDE_BUILD = Path(r"L:\Projects\Github\pyodide-build")
-
-# Wheel platform tag (from PYODIDE_EMSCRIPTEN_VERSION in pyodide-build/Makefile.envs)
-WHEEL_PLATFORM_TAG = "emscripten_4_0_9_wasm32"
-
-# Location where ifcopenshell will be extracted
-IFCOPENSHELL_DIR = PYODIDE_DIR / "ifcopenshell"
-
-
-class WheelBuilder:
-    @staticmethod
-    def extract_ifcopenshell_from_git(dst: Path) -> None:
-        """Extract ifcopenshell directory from git repo into destination."""
-        Tools.rmrf(dst)
-
-        print(f"Extracting ifcopenshell from git to {dst}...")
-        # Use git ls-files piped to git checkout-index to avoid copying
-        # untracked or ignored files from the actual repo.
-        ls_proc = subprocess.Popen(
-            ["git", "ls-files", "-z", "src/ifcopenshell-python/ifcopenshell"],
-            cwd=REPO_ROOT,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        checkout_proc = subprocess.Popen(
-            ["git", "checkout-index", "-z", "--prefix", "pyodide/", "--stdin"],
-            cwd=REPO_ROOT,
-            stdin=ls_proc.stdout,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        assert ls_proc.stdout is not None
-        ls_proc.stdout.close()
-        checkout_proc.communicate()
-
-        if checkout_proc.returncode != 0:
-            assert checkout_proc.stderr is not None
-            raise RuntimeError(f"Failed to extract: {checkout_proc.stderr.decode()}")
-
-        # Move src/ifcopenshell-python/ifcopenshell to ifcopenshell.
-        temp_src = PYODIDE_DIR / "src" / "ifcopenshell-python" / "ifcopenshell"
-        shutil.move(temp_src, dst)
-
-        # Clean up temporary src directory.
-        Tools.rmrf(PYODIDE_DIR / "src")
-
-        print("✓ Extracted ifcopenshell from git")
-
-    @staticmethod
-    def get_wheel_url(makefile_path: Path) -> str:
-        """Get S3 wheel URL based on BINARY_VERSION and BUILD_COMMIT from Makefile."""
-
-        def parse_makefile_vars() -> dict[str, str]:
-            content = makefile_path.read_text()
-            vars: dict[str, str] = {}
-            for match in re.finditer(r"^(BINARY_VERSION|BUILD_COMMIT):=(.+)$", content, re.MULTILINE):
-                vars[match.group(1)] = match.group(2).strip()
-            return vars
-
-        vars: dict[str, str] = parse_makefile_vars()
-        binary_version = vars["BINARY_VERSION"]
-        build_commit = vars["BUILD_COMMIT"]
-        filename = f"ifcopenshell-{binary_version}+{build_commit}-cp313-cp313-pyodide_2025_0_wasm32.whl"
-        encoded_filename = quote(filename, safe="")
-        return f"https://s3.amazonaws.com/ifcopenshell-builds/{encoded_filename}"
-
-    @staticmethod
-    def download_and_extract_so(url: str, build_dir: Path) -> tuple[Path, Path]:
-        """Download wheel from URL and extract .so and .py files."""
-        py_wrapper_filename = "ifcopenshell_wrapper.py"
-        build_dir.mkdir(parents=True, exist_ok=True)
-
-        wheel_path = build_dir / url.rsplit("/", 1)[-1]
-
-        if wheel_path.exists():
-            print(f"Using cached wheel: {wheel_path}")
-        else:
-            print(f"Downloading {url}...")
-            response = requests.get(url)
-            response.raise_for_status()
-            wheel_path.write_bytes(response.content)
-
-        print("Extracting _ifcopenshell_wrapper files...")
-        with zipfile.ZipFile(wheel_path) as zf:
-            so_files = [f for f in zf.namelist() if f.endswith(".so")]
-            py_files = [f for f in zf.namelist() if f.endswith(py_wrapper_filename)]
-
-            assert so_files, "No .so file found in wheel"
-            assert py_files, f"No {py_wrapper_filename} file found in wheel"
-
-            so_file = so_files[0]
-            so_dst = build_dir / Path(so_file).name
-            so_dst.write_bytes(zf.read(so_file))
-
-            py_file = py_files[0]
-            py_dst = build_dir / Path(py_file).name
-            py_dst.write_bytes(zf.read(py_file))
-
-        return so_dst, py_dst
-
-
-class Tools:
-    @staticmethod
-    def run(
-        cmd: list[str],
-        cwd: Path | None = None,
-    ) -> None:
-        print(f"$ {' '.join(cmd)}")
-        subprocess.check_call(cmd, cwd=cwd)
-
-    @staticmethod
-    def create_symlink(dst: Path, src: Path) -> None:
-        Tools.rmrf(dst)
-        dst.symlink_to(src)
-
-    @staticmethod
-    def rmrf(path: Path) -> None:
-        if path.exists() or path.is_symlink():
-            if path.is_dir() and not path.is_symlink():
-                shutil.rmtree(path)
-            else:
-                path.unlink()
-
-
-def clean() -> None:
-    """Remove build artifacts."""
-    paths_to_remove = (
-        BUILD_DIR,
-        PYODIDE_DIR / ".pyodide_build",
-        PYODIDE_DIR / "dist",
-        PYODIDE_DIR / "ifcopenshell.egg-info",
-        PYODIDE_DIR / "src",
-        IFCOPENSHELL_DIR,
-    )
-    for path in paths_to_remove:
-        if path.exists() or path.is_symlink():
-            print(f"Removing {path}...")
-            Tools.rmrf(path)
-    print("✓ Clean complete")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description=__doc__, add_help=False)
-    parser.add_argument("--build", action="store_true", help="Build the wheel")
-    parser.add_argument("--clean", action="store_true", help="Clean build folder")
-    parser.add_argument(
-        "--dev",
-        action="store_true",
-        help="Use editable pyodide-build from hardcoded path (Windows packing workaround)",
-    )
-    args = parser.parse_args()
-
-    if not args.build and not args.clean:
-        print(__doc__)
-        return
-
-    if args.clean:
-        clean()
-        return
-
-    start_time = time.time()
-
-    WheelBuilder.extract_ifcopenshell_from_git(IFCOPENSHELL_DIR)
-
-    print("Downloading and extracting _ifcopenshell_wrapper files...")
-    makefile = REPO_ROOT / "src" / "ifcopenshell-python" / "Makefile"
-    wheel_url = WheelBuilder.get_wheel_url(makefile)
-    so_file, py_file = WheelBuilder.download_and_extract_so(wheel_url, BUILD_DIR)
-
-    Tools.create_symlink(IFCOPENSHELL_DIR / Path(so_file).name, so_file)
-    Tools.create_symlink(IFCOPENSHELL_DIR / Path(py_file).name, py_file)
-
-    print("Installing pyodide-build...")
-    if args.dev:
-        Tools.run(["uv", "pip", "install", "-e", str(PYODIDE_BUILD)])
-    else:
-        Tools.run(["uv", "pip", "install", "pyodide-build"])
-
-    print("Building with pyodide...")
-    # Use --no-isolation due to pyodide-build Windows support issues:
-    # symlink_unisolated_packages fails with missing `_sysconfigdata_$(CPYTHON_ABI_FLAGS)_emscripten_wasm32-emscripten.py`.
-    # Hardcode platform name since pyodide doesn't yet support overriding wheel tags on Windows.
-    #
-    # Use `LEGACY_PLATFORM` since pyodide 0.34.1 introduced new tag for wheels `pyemscripten`,
-    # which doesn't work with pyodide itself yet - https://github.com/pyodide/pyodide/issues/6177.
-    os.environ["USE_LEGACY_PLATFORM"] = "1"
-    Tools.run(["pyodide", "build", f"-C--build-option=--plat-name={WHEEL_PLATFORM_TAG}"])
-
-    elapsed = time.time() - start_time
-    print(f"\n✓ Done! ({elapsed:.1f}s)")
-
-
-if __name__ == "__main__":
-    main()
@@ -2,16 +2,12 @@
 # because `tool.setuptools.ext-modules` is still experimental in pyproject.toml
 # and we need it to get the wheel suffix right.
 import os
-import sys
 from pathlib import Path

 import tomllib
 from setuptools import Extension, find_packages, setup
-from setuptools.command.build_ext import build_ext

-# Detect repo folder: if setup.py is in pyodide folder, go to parent
-SETUP_DIR = Path(__file__).parent
-REPO_FOLDER = SETUP_DIR.parent if SETUP_DIR.name == "pyodide" else SETUP_DIR
+REPO_FOLDER = Path(__file__).parent


 def get_version() -> str:
@@ -29,39 +25,6 @@ def get_dependencies() -> list[str]:
    return dependencies


-class UnixBuildExt(build_ext):
-    """Customize ``build_ext`` to support packing on Windows."""
-
-    def finalize_options(self):
-        from distutils import sysconfig
-
-        super().finalize_options()
-        if sys.platform == "win32":
-            self.compiler = "unix"
-
-            # Configure sysconfig for Windows builds
-            # CCSHARED is the only variable that's not customizable with env vars.
-            # Basically avoiding this:
-            # File ".venv\Lib\site-packages\setuptools\_distutils\sysconfig.py", line 366, in customize_compiler
-            #     compiler_so=cc_cmd + ' ' + ccshared,
-            #                 ~~~~~~~~~~~~~^~~~~~~~~~
-            # TypeError: can only concatenate str (not "NoneType") to str
-            sysconfig.get_config_vars()  # Initialize config cache
-            if sysconfig._config_vars.get("CCSHARED") is None:
-                sysconfig._config_vars["CCSHARED"] = "-fPIC"
-            # Override compiler type before it's instantiated
-
-        # Set Emscripten compiler environment variables
-        os.environ["CC"] = "emcc"
-        os.environ["CXX"] = "em++"
-        os.environ["CFLAGS"] = ""
-        os.environ["CXXFLAGS"] = ""
-        os.environ["LDSHARED"] = "emcc -shared"
-        os.environ["AR"] = "emar"
-        os.environ["ARFLAGS"] = "rcs"
-        os.environ["SETUPTOOLS_EXT_SUFFIX"] = ".cpython-313-wasm32-emscripten.so"
-
-
 setup(
    name="ifcopenshell",
    version=get_version(),
@@ -81,5 +44,4 @@ setup(
    },
    # Has to provide extension to get the correct wheel suffix.
    ext_modules=[Extension("ifcopenshell._ifcopenshell_wrapper", sources=[])],
-    cmdclass={"build_ext": UnixBuildExt},
 )
@@ -1,5 +1,6 @@
 from pathlib import Path

+
 WHEEL_FILENAME = next(
    p.name for p in (Path.cwd() / "pyodide").iterdir() if p.name.startswith("ifcopenshell-") and p.suffix == ".whl"
 )
@@ -1,14 +1,3 @@
-[project]
-name = "IfcOpenShell"
-version = "0.0.0"
-dependencies = [
-    "black==26.3.1",
-    "ruff==0.15.12",
-    "poethepoet",
-    "ty==0.0.32",
-    "gersemi==0.26.1",
-]
-
 [tool.black]
 line-length = 120
 include = '''
@@ -16,35 +5,28 @@ include = '''
    |nix/.*.pyi?$
 '''
 extend-exclude = '''
-    src/ifcopenshell-python/ifcopenshell/express/rules/*
-    |src/ifcopenshell-python/ifcopenshell/express/express_parser.py
+    src/ifcopenshell-python/ifcopenshell/express/*
    |src/ifcopenshell-python/ifcopenshell/mvd/*
    |src/ifcopenshell-python/ifcopenshell/simple_spf/*
    |src/ifc2ca/templates/*
+    |src/ifcconvert/cityjson/*
    |src/svgfill
    |src/exterior-shell-extractor
+    |src/pyodide
 '''

 [tool.pyright]
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
 reportUnnecessaryTypeIgnoreComment = true
-reportRedeclaration = false
-# Ignore warnings from bpy stubs missing actual source files.
-reportMissingModuleSource = false
-# Pylance doesn't respect gitignore, so we have to exclude files manually here
-# to avoid VS Code slowing down.
-# https://github.com/microsoft/pylance-release/issues/5169
-exclude = [
-    "_deps",
-]

 # Define here general ruff settings,
-# then they will be inherited by projects' .toml files.
+# then they will be inherited projects .toml files.
 # This allows using assuming different Python version for different projects.
 [tool.ruff]
 exclude = [
    # Submodules.
+    "src/ifcconvert/cityjson",
    "src/ifcopenshell-python/ifcopenshell/express",
    "src/ifcopenshell-python/ifcopenshell/mvd",
    "src/ifcopenshell-python/ifcopenshell/simple_spf",
@@ -68,7 +50,6 @@ select = [
    "UP",          # pyupgrade
    "RUF015",      # next() > list_comprehension[0]
    "RUF022",      # sort __all__
-    "I",           # import sorting
 ]
 ignore = [
    "FA100", # Conflicts with Blender using annotations for props definitions.
@@ -82,184 +63,13 @@ ignore = [
    "UP032", # Replace .format with f-string
 ]

-[tool.ty.rules]
-all = "ignore"
-
-# Structural rules (no deep type inference needed, easier to adapt).
-abstract-method-in-final-class = "error"
-ambiguous-protocol-member = "error"
-conflicting-declarations = "error"
-conflicting-metaclass = "error"
-cyclic-class-definition = "error"
-cyclic-type-alias-definition = "error"
-dataclass-field-order = "error"
-duplicate-base = "error"
-duplicate-kw-only = "error"
-empty-body = "error"
-escape-character-in-forward-annotation = "error"
-final-on-non-method = "error"
-final-without-value = "error"
-ignore-comment-unknown-rule = "error"
-implicit-concatenated-string-type-annotation = "error"
-inconsistent-mro = "error"
-ineffective-final = "error"
-instance-layout-conflict = "error"
-invalid-dataclass = "error"
-invalid-dataclass-override = "error"
-invalid-enum-member-annotation = "error"
-invalid-explicit-override = "error"
-invalid-frozen-dataclass-subclass = "error"
-invalid-generic-class = "error"
-invalid-generic-enum = "error"
-invalid-ignore-comment = "error"
-invalid-legacy-positional-parameter = "error"
-invalid-legacy-type-variable = "error"
-invalid-named-tuple = "error"
-invalid-newtype = "error"
-invalid-overload = "error"
-invalid-paramspec = "error"
-invalid-protocol = "error"
-invalid-syntax-in-forward-annotation = "error"
-invalid-total-ordering = "error"
-invalid-type-alias-type = "error"
-invalid-type-checking-constant = "error"
-invalid-type-guard-definition = "error"
-invalid-type-variable-bound = "error"
-invalid-type-variable-constraints = "error"
-invalid-typed-dict-header = "error"
-invalid-typed-dict-statement = "error"
-override-of-final-method = "error"
-override-of-final-variable = "error"
-possibly-missing-import = "error"
-possibly-missing-submodule = "error"
-# Has false positives due to ty walrus operator bug.
-# possibly-unresolved-reference = "error"
-raw-string-type-annotation = "error"
-redundant-final-classvar = "error"
-shadowed-type-variable = "error"
-subclass-of-final-class = "error"
-super-call-in-named-tuple-method = "error"
-unavailable-implicit-super-arguments = "error"
-unbound-type-variable = "error"
-undefined-reveal = "error"
-unresolved-global = "error"
-unresolved-import = "error"
-unresolved-reference = "error"
-unused-ignore-comment = "error"
-unused-type-ignore-comment = "error"
-useless-overload-body = "error"
-
-# Non-structural rules:
-deprecated = "error"
-zero-stepsize-in-slice = "error"
-possibly-missing-implicit-call = "error"
-unused-awaitable = "error"
-
-# Function argument rules:
-# Conflicts with `ifcopenshell.api.geometry.add_representation` type of callables we have, confusing them with a module.
-# call-non-callable = "error"
-conflicting-argument-forms = "error"
-# Too many false positives.
-# invalid-argument-type = "error"
-missing-argument = "error"
-parameter-already-assigned = "error"
-positional-only-parameter-as-kwarg = "error"
-too-many-positional-arguments = "error"
-unknown-argument = "error"
-# Has a lot of warnings due to current ty walrus operator issues.
-# index-out-of-bounds = "error"
-# unresolved-attribute = "error"
-
-[tool.ty.environment]
-extra-paths = [
-    "src/bonsai/external_dependencies",
-    "src/bcf",
-    "src/bsdd",
-    "src/bonsai",
-    "src/ifc4d",
-    "src/ifc5d",
-    "src/ifccityjson",
-    "src/ifcclash",
-    "src/ifccsv",
-    "src/ifcdiff",
-    "src/ifcfm",
-    "src/ifcopenshell-python",
-    "src/ifcpatch",
-    "src/ifctester",
-]
-
-[tool.ty.src]
-exclude = [
-    # External dependencies cloned for type checking only.
-    "src/bonsai/external_dependencies",
-    # Submodules.
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill/3rdparty",
-    # Has special dependencies.
-    "src/ifcopenshell-python/ifcopenshell/geom/app.py",
-    "src/ifcopenshell-python/ifcopenshell/geom/code_editor_pane.py",
-    "src/ifcopenshell-python/ifcopenshell/util/doc.py",
-    "src/ifcopenshell-python/ifcopenshell/util/generate_pset_templates.py",
-    "src/ifcopenshell-python/ifcopenshell/util/ifc4x3dev_scrape_data_for_docs.py",
-    # Too esoteric.
-    "src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py",
-    "src/ifc2ca/templates",
-    # Too dev.
-    "src/bcf/setup.py",
-    "src/bsdd/yml_to_classes.py",
-    # Deprecated.
-    "src/ifc2ca/_deprecated",
-]
-
 [tool.poe.tasks]

-ruff = "ruff check"
+ruff-main = "ruff check --extend-exclude nix/build-all.py"
+# It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
+ruff-old = "ruff check nix/build-all.py --target-version py37"
+ruff.sequence = ["ruff-main", "ruff-old"]

 black = "black ."

-ty.sequence = ["ty-bonsai", "ty-ios"]
-ty.help = "Run ty type checker. Requires ty-venv to be set up first."
-ty-bonsai = "ty check src/bonsai --python=src/bonsai/.venv"
-
-ty-venv.sequence = ["bonsai-deps", "ty-venv-bonsai", "ty-venv-ios"]
-
-ty-venv-bonsai.sequence = [
-    {cmd = "uv venv src/bonsai/.venv --python=3.11 --allow-existing"},
-    {cmd = "uv pip install -r src/bonsai/type-check-requirements.txt --python=src/bonsai/.venv"},
-]
-
-ty-venv-ios.sequence = [
-    {cmd = "uv venv src/ifcopenshell-python/.venv --python=3.10 --allow-existing"},
-    {cmd = "uv pip install -r src/ifcopenshell-python/type-check-requirements.txt --python=src/ifcopenshell-python/.venv"},
-]
-
-format.sequence = ["black", "ruff"]
-
-cmake-format = "gersemi . --in-place"
-
-[tool.poe.tasks.ty-ios]
-# --ignore unresolved-reference: walrus operator false positives in ty.
-cmd = """
-    ty check
-    src/bcf
-    src/bsdd
-    src/ifc2ca
-    src/ifc4d
-    src/ifc5d
-    src/ifccityjson
-    src/ifcclash
-    src/ifccsv
-    src/ifcdiff
-    src/ifcfm
-    src/ifcopenshell-python
-    src/ifcpatch
-    src/ifctester
-    --python=src/ifcopenshell-python/.venv
-    --ignore unresolved-reference
-"""
-
-[tool.poe.tasks.bonsai-deps]
-help = "Clone or update Bonsai external dependencies."
-cmd = "python src/bonsai/scripts/bonsai_deps.py"
+format.sequence = ["black", "ruff-main", "ruff-old"]
@@ -1,8 +1,7 @@
-from dataclasses import fields
-from typing import NamedTuple, Union
-
 import bcf.v2.model.extensions
 import bcf.v3.model.extensions
+from typing import NamedTuple, Union
+from dataclasses import fields


 class AttributeData(NamedTuple):
@@ -1,7 +1,6 @@
-from typing import Union
-
 import bcf.v2.model
 import bcf.v3.model
+from typing import Union

 BimSnippet = Union[bcf.v2.model.BimSnippet, bcf.v3.model.BimSnippet]
 BitMap = Union[bcf.v2.model.VisualizationInfoBitmap, bcf.v3.model.Bitmap]
@@ -1,16 +1,14 @@
 import tempfile
-from pathlib import Path
-from typing import Optional, Union
-
-from typing_extensions import assert_never
-
-import bcf.agnostic.model as mdl
 import bcf.v2.bcfxml
 import bcf.v2.model
 import bcf.v2.topic
 import bcf.v3.bcfxml
 import bcf.v3.model
 import bcf.v3.topic
+import bcf.agnostic.model as mdl
+from pathlib import Path
+from typing import Union, Optional
+from typing_extensions import assert_never

 TopicHandler = Union[bcf.v2.topic.TopicHandler, bcf.v3.topic.TopicHandler]

@@ -1,6 +1,5 @@
-from typing import Union
-
 import bcf.v2.visinfo
 import bcf.v3.visinfo
+from typing import Union

 VisualizationInfoHandler = Union[bcf.v2.visinfo.VisualizationInfoHandler, bcf.v3.visinfo.VisualizationInfoHandler]
@@ -29,6 +29,7 @@ from bcf.v3.bcfxml import BcfXml as BcfXml3
 from bcf.v3.model import Version as Version3
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer

+
 BcfXml = Union[BcfXml2, BcfXml3]


@@ -7,7 +7,6 @@ original idea from https://stackoverflow.com/a/19722365/1307905
 """

 from __future__ import annotations
-
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -27,7 +26,7 @@ class InMemoryZipFile:
        self._file_name: Optional[str | Path] = str(file_name) if hasattr(file_name, "_from_parts") else file_name
        self.in_memory_data = BytesIO()
        # Create the in-memory zipfile
-        self.in_memory_zip = zipfile.ZipFile(self.in_memory_data, "w", compression, True)
+        self.in_memory_zip = zipfile.ZipFile(self.in_memory_data, "w", compression, False)
        self.in_memory_zip.debug = debug

    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None:
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .8.6
 .8.4