shift+click, to quickly switch the drawing view without turning anything on or off in the scene.

as discussed: https://community.osarch.org/discussion/2196/quick-way-to-switch-between-drawing-views#latest
snapshot
2026-08-08 17:01:40 +00:00 · 2024-08-04 10:00:22 -05:00 · 2024-08-04 09:40:34 -05:00
2621 changed files with 210209 additions and 301075 deletions
@@ -1,23 +0,0 @@
-name: Bug Report
-description: Crashes, error messages, and broken features
-type: bug
-body:
- type: textarea
-  attributes:
-    label: Bug Description
-    placeholder: |
-      Describe what problem occurred and what you expected to happen instead.
-  
-      1. To reproduce this, open file '...'
-      2. Click on '....'
-      3. See error
- type: textarea
-  attributes:
-    label: Attachments
-    description: "Private files can be uploaded to https://ifcopenshell.org/upload.html - only viewed by core developers and will be deleted afterwards. Please submit your report first then upload private files afterwards."
-    placeholder: "If applicable, add screenshots to help explain your problem. Please also drag-drop any files necessary to show the error (rename the file extension from .ifc to .txt to upload)."
- type: textarea
-  attributes:
-    label: Debug and Error Output
-    description: "If this is in Bonsai, paste the output from the Copy Debug Information option in Bonsai. It can be found under Quality and Coordination -> Quality Control -> Debug. If this is a general software issue, if relevant include details about IfcOpenShell version, operating system, Python version, etc."
-    render: yes
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Community Forums
-    url: https://community.osarch.org/
-    about: Have a question? Want to discuss an idea? Try the OSArch forums instead.
-  - name: Live Chat
-    url: https://osarch.org/chat
-    about: Have a really confusing issue? Want real-time support?
@@ -1,8 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or improvement
-type: Feature
-body:
- type: textarea
-  attributes:
-    label: Feature Description
-    placeholder: "Describe a feature you'd like us to add, or a change to the user interface, design, or workflow for usability. If it's not obvious, explain why this feature is awesome. Note that feature requests must be specific and measurable."
@@ -1,21 +0,0 @@
-name: Dispatch Build IfcOpenShell
-
-on:
-  workflow_dispatch:
-
-jobs:
-  trigger-workflows:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        workflow:
-          - 'Build IfcOpenShell Linux'
-          - 'Build IfcOpenShell Linux ARM'
-          - 'Build IfcOpenShell OSX'
-          - 'Build IfcOpenShell WASM / Pyodide'
-          - 'Build IfcOpenShell Windows'
-    steps:
-      - name: Trigger binary build workflows
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: ${{ matrix.workflow }}
@@ -1,126 +0,0 @@
-name: Build IfcOpenShell OSX
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos
-            runner: macos-13
-            arch: x64
-            oldarch: 
-          - os: macos
-            runner: macos-14
-            arch: arm64
-            oldarch: m1
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v3
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: ${{ matrix.os }}-${{ matrix.arch }}
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-        
-      - name: Install Dependencies
-        run: |
-          brew update
-          brew install git bison autoconf automake libffi findutils
-          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-
-      - name: Install aws cli
-        run: |
-          python -m pip install awscli
-
-      - name: Unpack Dependencies
-        run: |
-          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
-        with:
-          key: ${GITHUB_WORKFLOW}-${{ matrix.os }}
-
-      - name: Run Build Script
-        run: |
-          if [ "${{ matrix.os }}" == "macos" ]; then
-            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
-          fi
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          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: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/10.15/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        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 }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive
@@ -1,54 +0,0 @@
-name: Build IfcOpenShell WASM / Pyodide
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          path: IfcOpenShell
-
-      - name: Checkout Pyodide
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          repository: pyodide/pyodide
-          ref: '0.28.0a3'
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          path: pyodide
-
-      - name: Build
-        run: |
-          VERSION=`cat IfcOpenShell/VERSION`
-          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
-          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
-          echo '#!/usr/bin/bash' > script.sh
-          echo 'cd pyodide' >> script.sh
-          echo 'make' >> script.sh
-          echo 'cd ..' >> script.sh
-          echo 'mkdir -p packages/ifcopenshell' >> script.sh
-          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
-          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
-          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
-          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
-          chmod +x script.sh
-          sed -i s/--tty// pyodide/run_docker
-          pyodide/run_docker ./script.sh
-          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp313-cp313-emscripten_4_0_9_wasm32.whl
-
-      - name: Configure AWS credentials
-        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 }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp dist s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.whl"
@@ -1,117 +0,0 @@
-name: Build IfcOpenShell Linux
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04
-    container: rockylinux:8
-
-    steps:
-      - name: Install Dependencies
-        run: |
-          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
-          python3 -m pip install typing_extensions
-          git config --global --add safe.directory '*'
-
-      - name: Install aws cli
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          ./aws/install
-          rm -rf awscliv2.zip aws
-          aws --version
-
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v3
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: rockylinux8-x64
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          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
-
-      # Not supported on docker
-      # - name: ccache
-      #   uses: hendrikmuhs/ccache-action@v1
-      #   with:
-      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
-
-      - name: Run Build Script
-        run: |
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          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: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        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 }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive
@@ -1,117 +0,0 @@
-name: Build IfcOpenShell Linux ARM
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04-arm
-    container: arm64v8/rockylinux:8
-
-    steps:
-      - name: Install Dependencies
-        run: |
-          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
-          python3 -m pip install typing_extensions
-          git config --global --add safe.directory '*'
-
-      - name: Install aws cli
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          ./aws/install
-          rm -rf awscliv2.zip aws
-          aws --version
-
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v3
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: rockylinux8-arm64
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          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
-
-      # Not supported on docker
-      # - name: ccache
-      #   uses: hendrikmuhs/ccache-action@v1
-      #   with:
-      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
-
-      - name: Run Build Script
-        run: |
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          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: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        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 }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive
@@ -1,130 +0,0 @@
-name: Build IfcOpenShell Windows
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: windows-2022
-    strategy:
-      fail-fast: false
-      matrix:
-        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
-        arch: ['x64']
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v3
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: _deps-vs2022-x64-installed
-          ref: windows-${{ matrix.arch }}
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Install Dependencies
-        run: |
-          choco install -y sed 7zip.install awscli
-
-      - name: Install Python
-        run: |
-          $installer = "python-${{ matrix.python }}-amd64.exe"
-          $url = "https://www.python.org/ftp/python/${{ matrix.python }}/$installer"
-          Invoke-WebRequest -Uri $url -OutFile $installer
-          Start-Process -Wait -FilePath .\$installer -ArgumentList '/quiet InstallAllUsers=0 PrependPath=0 Include_test=0 TargetDir=C:\Python\${{ matrix.python }}'
-          Remove-Item .\$installer
-
-      - name: Unpack Dependencies
-        run: |
-          cd _deps-vs2022-x64-installed
-          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
-            7z x $_.FullName
-          }
-
-      - name: Run Build Script
-        shell: cmd
-        run: |
-          setlocal EnableDelayedExpansion
-          SET PYTHON_VERSION=${{ matrix.python }}
-          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
-              set PY_VER_MAJOR_MINOR=%%a%%b
-          )
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          SET IFCOS_INSTALL_PYTHON=FALSE
-          cd win
-          echo y | call build-deps.cmd vs2022-x64 Release
-          SET PYTHONHOME=C:\Python\${{ matrix.python }}
-          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
-          call install-ifcopenshell.bat vs2022-x64 Release
-
-      - name: Pack Dependencies
-        run: |
-          cd _deps-vs2022-x64-installed
-          Get-ChildItem -Path . -Directory | ForEach-Object {
-            $cacheFile = "cache-$($_.Name).zip"
-            echo $cacheFile
-            if (!(Test-Path $cacheFile)) {
-              7z a $cacheFile $_.FullName
-            }
-          }
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd _deps-vs2022-x64-installed
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add *.zip
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || echo "Push failed"
-
-      - name: Package .zip Archives
-        run: |
-          $VERSION = 'v' + ((Get-Content VERSION).Trim())
-          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
-          $OUTPUT_DIR = "$env:USERPROFILE\output"
-          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
-
-          if ("${{ matrix.python }}" -eq "3.9.11") {
-            # only for the first python version the executables are assembled for upload
-            cd _installed-vs2022-x64/bin
-            Get-ChildItem -Path . | ForEach-Object {
-              echo $_
-              $exe = $_.Name
-              $baseName = $exe.Substring(0, $exe.Length - 4)
-              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
-              7z a $zipName $exe
-            }
-            mv *.zip $OUTPUT_DIR
-          }
-
-          $pyVersion = "${{ matrix.python }}"
-          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
-          cd C:\Python\${{ matrix.python }}\Lib\site-packages
-          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
-          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
-          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
-          7z a $zipName ifcopenshell
-          mv $zipName $OUTPUT_DIR
-
-      - name: Configure AWS Credentials
-        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 }}
-          aws-region: us-east-1
-
-      - name: Upload .zip Archives to S3
-        env:
-          AWS_DEBUG: 1
-          AWS_RETRY_MODE: standard
-          AWS_MAX_ATTEMPTS: 3
-        run: |
-          dir "$env:USERPROFILE\output"
-          foreach ($zip in Get-ChildItem -Path "$env:USERPROFILE\output" -Filter *.zip) {
-              aws s3 cp "$($zip.FullName)" s3://ifcopenshell-builds/ --debug
-              Start-Sleep -Seconds 5
-          }
@@ -22,7 +22,7 @@ jobs:
      - uses: actions/checkout@v2 # https://github.com/actions/checkout
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
      - run: echo ${{ env.DATE }}
      - name: Get current date
@@ -34,7 +34,7 @@ jobs:
          cd src/bcf &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -1,64 +0,0 @@
-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
-
-      # 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: |
-          uvx black --diff --check .
-        continue-on-error: true
-
-      - name: Ruff check
-        id: ruff
-        run: |
-          uvx ruff check
-        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
@@ -0,0 +1,12 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable
@@ -1,4 +1,4 @@
-name: ci-bonsai-choco
+name: Publish-blenderbim-chocolatey package

 on:
  schedule:
@@ -9,12 +9,11 @@ on:
    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
    #         *  * * * *
    - cron:  "30 0 * * *" # 30min past utc midnight
-  workflow_dispatch:

 env:
  major: 0
  minor: 0
-  name: bonsai
+  name: blenderbim
  choco_version: 1.1.0
  CHOCO_TOKEN:   ${{ secrets.CHOCO_TOKEN }}

@@ -42,6 +41,5 @@ jobs:
      - name: Check in release tags if we should do a choco release and perform the release if needed
        id: do_choco_release
        run: |
-          pip install pygithub
-          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/ &&
+          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
          python3 choco_release.py
@@ -0,0 +1,85 @@
+name: ci-blenderbim-daily
+
+on:
+  push:
+    paths:
+      - '.github/workflows/ci-blenderbim-daily.yml'
+      - 'src/blenderbim/**'
+      - 'src/ifcopenshell-python/ifcopenshell/**'
+      - 'src/bcf/bcf/**'
+      - 'src/ifcclash/ifcclash/**'
+      - 'src/ifccobie/**'
+      - 'src/ifcdiff/**'
+      - 'src/ifccsv/**'
+      - 'src/ifcpatch/ifcpatch/**'
+      - 'src/ifc4d/ifc4d/**'
+      - 'src/ifc5d/ifc5d/**'
+      - 'src/ifccityjson/**'
+    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
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [py310, py311, py312]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
+          - {
+            name: "Linux Build",
+            short_name: linux,
+          }
+          - {
+            name: "MacOS Build",
+            short_name: macos,
+          }
+          - {
+            name: "MacOS ARM Build",
+            short_name: macosm1,
+          }
+    steps:
+      - 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
+        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+      - name: Compile
+        run: |
+          cd src/blenderbim && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+      - name: Find zip file name
+        id: find_zip
+        run: |
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
+          echo "filepath=$filepath" >> $GITHUB_OUTPUT
+          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
+      - name: Upload zip file to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.find_zip.outputs.filepath }}
+          asset_name: ${{ steps.find_zip.outputs.filename }}
+          release_name: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
+          overwrite: true
@@ -1,6 +1,6 @@
-name: ci-bonsai
+name: ci-blenderbim

-# Differences from ci-bonsai-daily.yml:
+# Differences from ci-blenderbim-daily.yml:
 # - make has IS_STABLE=TRUE
 # - action is never triggered and executed only manually
 # - doesn't add a current date to the release and tag
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py311, py312]
+        pyver: [py310, py311, py312]
        config:
          - {
            name: "Windows Build",
@@ -32,15 +32,15 @@ jobs:
          }
          - {
            name: "Linux Build",
-            short_name: linux,
+            short_name: linux
          }
          - {
            name: "MacOS Build",
-            short_name: macos,
+            short_name: macos
          }
          - {
            name: "MacOS ARM Build",
-            short_name: macosm1,
+            short_name: macosm1
          }
    steps:
      - uses: actions/checkout@v2
@@ -53,11 +53,12 @@ jobs:
        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
      - name: Compile
        run: |
-          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          cd src/blenderbim &&
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
      - name: Find zip file name
        id: find_zip
        run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
          echo "filepath=$filepath" >> $GITHUB_OUTPUT
          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
      - name: Upload zip file to release
@@ -66,6 +67,6 @@ 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}}"
-          tag: "bonsai-${{steps.version.outputs.version}}"
+          release_name: "blenderbim-${{steps.version.outputs.version}}"
+          tag: "blenderbim-${{steps.version.outputs.version}}"
          overwrite: true
@@ -1,181 +0,0 @@
-name: ci-bonsai-daily
-
-on:
-  push:
-    paths:
-      - '.github/workflows/ci-bonsai-daily.yml'
-      - 'src/bonsai/**'
-      - 'src/ifcopenshell-python/ifcopenshell/**'
-      - 'src/bcf/bcf/**'
-      - 'src/ifcclash/ifcclash/**'
-      - 'src/ifccobie/**'
-      - 'src/ifcdiff/**'
-      - 'src/ifccsv/**'
-      - 'src/ifcpatch/ifcpatch/**'
-      - 'src/ifc4d/ifc4d/**'
-      - 'src/ifc5d/ifc5d/**'
-      - 'src/ifccityjson/**'
-    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
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py311, py312]
-        config:
-          - {
-            name: "Windows Build",
-            short_name: win,
-          }
-          - {
-            name: "Linux Build",
-            short_name: linux,
-          }
-          - {
-            name: "MacOS Build",
-            short_name: macos,
-          }
-          - {
-            name: "MacOS ARM Build",
-            short_name: macosm1,
-          }
-    steps:
-      - 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 }}
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          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${{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."
-
-  update-extensions-repo-and-run-tests:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v2
-        with:
-          repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IFCOPENBOT_TOKEN }}
-          path: bonsai_unstable_repo
-
-      - name: Download Blender and run critical tests
-        run: |
-          # 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/Blender4.5/blender-4.5.0-linux-x64.tar.xz
-          tar -xf blender.tar.xz
-
-          # Setup Blender.
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          # Setup unstable repo to get Bonsai build.
-          cd bonsai_unstable_repo
-          pip install -r requirements.txt
-          python setup_extensions_repo.py --last-tag
-          cd ..
-          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
-          blender --command extension list
-
-          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
-
-          # Reregister Bonsai.
-          # Note that running it in background might miss some errors
-          # (e.g. tools are not registered in background mode).
-          blender --background --python IfcOpenShell/src/bonsai/scripts/reregister_bonsai.py
-
-          # Install sverchok.
-          wget -q -O sverchok.zip https://github.com/nortikin/sverchok/archive/refs/heads/master.zip
-          # ifcsverchok expecting sverchok to be named "sverchok" and not "sverchok-master".
-          unzip -q sverchok.zip
-          mv sverchok-master sverchok
-          zip -q -r sverchok.zip sverchok
-          rm -r sverchok
-          blender --command extension install-file -r user_default sverchok.zip
-
-          # Install ifcsverchok.
-          cd IfcOpenShell/src/ifcsverchok
-          make dist
-          sverchok_zip="$(pwd)/dist/$(ls dist)"
-          blender --command extension install-file -r user_default $sverchok_zip
-
-      - name: Update index.json on extensions repo
-        run: |
-          set -x -e
-
-          # Setup Blender.
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          cd bonsai_unstable_repo
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          git add index.json
-          git add readme.md
-          git commit -m "Update index.json"
-          git push
-
-      - name: Run bonsai tests
-        run: |
-          set -x -e
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          # Install Sun Position extension.
-          blender --online-mode --command extension sync
-          blender --online-mode --command extension install --enable --sync sun_position
-
-          cd IfcOpenShell/src/bonsai
-          pip install pytest-blender
-          pip install pytest-bdd
-          blender --background --python scripts/setup_pytest.py
-          blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background
-          make test
@@ -28,7 +28,7 @@ jobs:
          cd src/bsdd &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc4d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc5d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccityjson &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcclash &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -24,6 +24,10 @@ jobs:
            name: "Windows 64bit",
            short_name: win64,
          }
+          - {
+            name: "Windows 32bit",
+            short_name: win32,
+          }
          - {
            name: "Linux 64bit",
            short_name: linux64
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccsv &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcdiff &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcfm &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -35,11 +35,11 @@ jobs:

      - name: Version + date str
        id: verdate
-        run: echo "verdate=${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}" >> $GITHUB_OUTPUT
+        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT

      
  test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
    needs: activate
    runs-on: ${{ matrix.platform.distver }}
    defaults:
@@ -48,67 +48,57 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
+        variant: [novtk, all]
        pyver: [
+#          { name: py311, distver: '3.11'},
          { name: py312, distver: '3.12'}
        ]
        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-x86, distver: macos-13, pkg_dir: 'osx-64' }
+          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
        ]
    steps:
-      - name: Set Swap Space
+      - name: Set up swap space
        if: runner.os == 'Linux'
-        uses: pierotofy/set-swap-space@master
+        uses: pierotofy/set-swap-space@v1.0
        with:
          swap-size-gb: 10
-      
-      - name: set ARTIFACTS ENV vars
-        shell: bash
-        run: |
-          pwd
-          if [[ "$RUNNER_OS" == "Windows" ]]; then
-            echo "ARTIFACTS_DIR=D:/a/artifacts" >> $GITHUB_ENV
-          elif [[ "$RUNNER_OS" == "macOS" ]]; then
-            echo "ARTIFACTS_DIR=/Users/runner/work/artifacts" >> $GITHUB_ENV
-          elif [[ "$RUNNER_OS" == "Linux" ]]; then
-            echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
-          fi
-      
+
      - uses: actions/checkout@v4
        with:
          submodules: recursive

      - name: Download and extract MacOSX SDK
-        if: ${{ matrix.platform.name == 'macOS-x86' }}
+        if: ${{ runner.os == 'macOS' }}
        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@v2 # 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: >-
-            python=3.12
+            python=3.11
            anaconda-client
-            rattler-build
+            boa

      - name: create conda package dist dir
        run: |
-          mkdir -p ${{ env.ARTIFACTS_DIR }}
+          mkdir -p ${{ github.workspace }}/dist

      - name: build & test ifcopenshell
        run: |
-          rattler-build  build -r conda/recipe.yaml --output-dir '${{ env.ARTIFACTS_DIR }}'
+          conda mambabuild . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist' --variants='{variant: ${{ matrix.variant }}}'
+        working-directory: ./conda
        env:
          VERSION_OVERRIDE: ${{ needs.activate.outputs.verdate }}

      - name: upload to anaconda
        if: ${{ matrix.platform.name == 'win' }}
        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda'
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'

      - name: upload to anaconda
        if: ${{ matrix.platform.name != 'win' }}
        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2
@@ -9,7 +9,7 @@ on:
 jobs:

  activate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    if: |
      github.repository == 'IfcOpenShell/IfcOpenShell' &&
      !startsWith(github.event.head_commit.message, 'Release ') &&
@@ -18,7 +18,7 @@ jobs:
    - run: echo ok go

  build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    needs: activate
    steps:
    - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:

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

    - 
      name: Build ifcopenshell
@@ -44,7 +44,6 @@ jobs:
        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 \
@@ -76,7 +75,7 @@ jobs:
        make package
      working-directory: build
    - name: Upload 
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        # Artifact name
        name: ifcos-artifacts
@@ -84,7 +83,7 @@ jobs:
        path: build/assets/Ifc*

  deliver:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    needs: build
    name: Docker Build, Tag, Push

@@ -94,7 +93,7 @@ jobs:
        lfs: true
    
    - name: Download 
-      uses: actions/download-artifact@v4.1.7
+      uses: actions/download-artifact@v2
      with:
        # Artifact name
        name: ifcos-artifacts
@@ -117,8 +116,6 @@ jobs:
      with: 
        context: artifacts
        repository: aecgeeks/ifcopenshell
-        # Since the dispatch is set to `tag`, `github.ref_name` should evaluate to the pushed tag
-        # On a workflow dispatch, `ref_name` will take on the value from the dispatch payload
-        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:22.04' }}
+        tags: aecgeeks/ifcopenshell:latest
        file: ./Dockerfile
        push: true
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312]
        config:
          - {
            name: "Windows 64bit",
@@ -44,8 +44,6 @@ jobs:
          }
    steps:
      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
      - 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
@@ -61,7 +59,7 @@ jobs:
          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -19,12 +19,16 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312]
        config:
          - {
            name: "Windows 64bit",
            short_name: win64,
          }
+          - {
+            name: "Windows 32bit",
+            short_name: win32,
+          }
          - {
            name: "Linux 64bit",
            short_name: linux64
@@ -39,8 +43,6 @@ jobs:
          }
    steps:
      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
      - 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
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcpatch &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifctester &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -15,7 +15,6 @@ on:
      - 'src/ifcparse/**'
      - 'src/ifcwrap/**'
      - 'src/qtviewer/**'
-      - 'src/svgfill/**'
      - 'src/serializers/**'
      - 'conda/**'
      - 'cmake/**'
@@ -24,15 +23,15 @@ on:

 jobs:
  activate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    if: |
      github.repository == 'IfcOpenShell/IfcOpenShell' &&
      !contains(github.event.head_commit.message, 'skip ci')
    steps:
      - run: echo ok go

-  compile-and-test:
-    runs-on: ubuntu-22.04
+  build:
+    runs-on: ubuntu-latest
    needs: activate
    steps:
      - uses: actions/checkout@v4
@@ -48,6 +47,7 @@ jobs:
        run: |
          python -m pip install --upgrade pip
          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
+          pip install mathutils
          pip install src/bcf --no-deps
          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip

@@ -73,26 +73,6 @@ jobs:
        with:
          key: ${GITHUB_WORKFLOW}

-      # rocksdb on debian distros misses RTTI?
-      - name: build rocksdb
-        run: |
-          git clone https://github.com/facebook/rocksdb --branch v9.11.2
-          cd rocksdb
-          mkdir build && cd build
-          cmake -DFAIL_ON_WARNINGS=Off \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DWITH_TESTS=OFF \
-            -DWITH_TOOLS=OFF \
-            -DWITH_GFLAGS=OFF \
-            -DWITH_BENCHMARK_TOOLS=OFF \
-            -DWITH_CORE_TOOLS=OFF \
-            -DROCKSDB_BUILD_SHARED=Off \
-            -DCMAKE_POSITION_INDEPENDENT_CODE=On \
-            -DUSE_RTTI=On \
-            ..
-          sudo make -j$(nproc) install
-
      - name: Build ifcopenshell
        run: |
          echo $Python3_ROOT_DIR
@@ -102,7 +82,6 @@ jobs:
          cmake \
               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-               -DCMAKE_CXX_STANDARD=17 \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -122,14 +101,13 @@ jobs:
               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
               -DEIGEN_DIR=/usr/include/eigen3 \
-               -DWITH_ROCKSDB=On \
             ../cmake
          sudo make -j $(nproc)
          sudo make install

      - name: Run IfcConvert on Sample files
        run: |
-          (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
+          (find test/input src/blenderbim/test/files -name '*.ifc' | while read i; do \
            echo $i | tee -a log; \
            timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
            echo $i $? >> statuses; \
@@ -148,22 +126,9 @@ jobs:
          python tests.py
          cd ../src/ifcopenshell-python
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
-          ERROR=0
-          make test || ERROR=1
-          cd ../bcf && make test || ERROR=1
+          make test
+          cd ../bcf && make test
          pip install requests
-          cd ../bsdd && make test || ERROR=1
-          pip install deepdiff
-          cd ../ifcdiff && make test || ERROR=1
-          cd ../ifcpatch && make test || ERROR=1
-          pip install -e ../ifctester --no-deps
-          cd ../ifctester && make test || ERROR=1
-          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
-          cd ../ifcopenshell-python
-          pip install mathutils
-          make test-mathutils || ERROR=1
-          if [ $ERROR -ne 0 ]; then
-            echo "One or more tests failed";
-            exit 1;
-          fi
+          cd ../bsdd && make test
+          cd ../ifcpatch && make test
+          cd ../ifctester && make test
@@ -1,38 +0,0 @@
-name: Build and Deploy Unstable Documentation
-
-on:
-  push:
-    branches:
-      - v0.8.0  # Trigger the workflow on pushes to the default branch which is currently v0.8.0
-
-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  # Navigate to the docs directory
-          pip install -r requirements.txt  # Install dependencies from requirements.txt
-
-      - name: Build documentation
-        run: |
-          cd src/bonsai/docs  # Navigate to the docs directory
-          make html  # Build the documentation
-
-      - name: Deploy to GitHub Pages (Unstable)
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}  # SSH key for deployment
-          external_repository: IfcOpenShell/bonsaibim_org_docs_unstable  # Target repository
-          publish_branch: main  # Branch to deploy to
-          cname: docs-unstable.bonsaibim.org  # Custom domain for unstable docs
-          publish_dir: src/bonsai/docs/_build/html  # Directory containing built docs
@@ -1,36 +0,0 @@
-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,50 +0,0 @@
-name: Deploy Pyodide Demo App to GitHub Pages
-
-permissions:
-  id-token: write
-  pages: write
-
-on:
-  push:
-    paths:
-      - 'src/pyodide/**'
-      - '.github/workflows/publish-pyodide-demo-app.yml'
-    branches:
-      - v0.8.0
-
-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@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Upload static files as artifact
-        id: deployment
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: src/pyodide/demo-app/
-
-  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
@@ -4,17 +4,16 @@ on:
  push:
    tags:
      - 'v[0-9].[0-9].[0-9]*'
-  workflow_dispatch:

 jobs:
  activate:
    if: github.repository == 'IfcOpenShell/IfcOpenShell'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
    - run: echo ok go
  build:
    needs: activate
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -46,7 +45,6 @@ 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 \
@@ -54,8 +52,8 @@ jobs:
           -DOCC_INCLUDE_DIR=/usr/include/opencascade \
           -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
           -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.10 \
-           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
           -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
           -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
           -DGLTF_SUPPORT=On \
@@ -73,26 +73,22 @@ src/ifcopenshell-python/test/build
 # mypy cache
 .mypy_cache

-# bonsai i18n
-src/bonsai/bonsai/translations.py
+# blenderbim libs
+src/blenderbim/blenderbim/libs

-# bonsai test temp files
-src/bonsai/test/files/temp
-src/bonsai/test/files/basic.ifc.cache.blend
-src/bonsai/test/files/basic.ifc.cache.sqlite
+# blenderbim i18n
+src/blenderbim/blenderbim/translations.py

-# bonsai data
-src/bonsai/bonsai/bim/data/build/
-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
+# blenderbim test temp files
+src/blenderbim/test/files/temp
+src/blenderbim/test/files/basic.ifc.cache.blend
+src/blenderbim/test/files/basic.ifc.cache.sqlite

-src/bonsai/drawings
-src/bonsai/layouts
+src/blenderbim/drawings
+src/blenderbim/layouts

 # ifcopenshell swig and compiled files
-src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
+src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py

 # apple
@@ -104,9 +100,4 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 .cache

 # Brickschema
-src/bonsai/bonsai/bim/schema/Brick.ttl
-
-bonsaiDecoratorForLoads.code-workspace
-dev_environment.bat
-
-.pixi/
+src/blenderbim/blenderbim/bim/schema/Brick.ttl
@@ -17,9 +17,3 @@
 [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
-[submodule "src/ifcopenshell-python/ifcopenshell/simple_spf"]
-	path = src/ifcopenshell-python/ifcopenshell/simple_spf
-	url = https://github.com/IfcOpenShell/step-file-parser
-[submodule "src/pyodide/demo-app/wheels"]
-	path = src/pyodide/demo-app/wheels
-	url = https://github.com/IfcOpenShell/wasm-wheels
@@ -1,6 +1,6 @@
 # -*- mode: Dockerfile -*-

-FROM ubuntu:22.04
+FROM ubuntu:focal

 ARG CHANNEL
 ENV CHANNEL=${CHANNEL:-latest}
@@ -23,7 +23,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
    echo "deb http://archive.ubuntu.com/ubuntu focal-proposed multiverse" |  tee -a /etc/apt/sources.list; \
    apt-get -qq update; \
    apt-get -y install tzdata dos2unix rsync; \
-    apt-get -y install python3 libxml2 libpython3.10 \
+    apt-get -y install python3 libxml2 libpython3.8 \
                    libboost-all-dev \
                    libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                    libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
@@ -6,14 +6,13 @@ IfcOpenShell
 <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
 </p>

-
 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
 parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and [IFC4x3 Add2]. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
 is possible at compile-time when using C++ and at run-time when using Python.

 In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), Bonsai (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
 and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.

 For more information, see:
@@ -23,10 +22,10 @@ For more information, see:
  * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
  * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
  * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
-* [Bonsai Website](https://bonsaibim.org)
-* [Bonsai Documentation](https://docs.bonsaibim.org/index.html)
-  * [Add-on Installation](https://docs.bonsaibim.org/quickstart/installation.html)
-  * [Exploring an IFC model](https://docs.bonsaibim.org/quickstart/explore_model.html)
+* [BlenderBIM Add-on Website](https://blenderbim.org)
+* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
+  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
+  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
 
 Development is sponsored through your generous donations!

@@ -37,8 +36,8 @@ Contents

 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/bcf-client/badges/version.svg)](https://anaconda.org/conda-forge/bcf-client) |
-| bonsai                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) |
+| blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BlenderBIM.org-Download-70ba35)](https://blenderbim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=blenderbim-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
 | bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
 | ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
 | ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |
@@ -1 +1 @@
-0.8.4
+0.7.11
@@ -15,7 +15,7 @@
    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/COPYING</licenseUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.bonsaibim.org/</docsUrl>
+    <docsUrl>https://docs.blenderbim.org/</docsUrl>
    <!--<mailingListUrl></mailingListUrl>-->
    <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
    <tags>blender bim blenderbim ifc python opensource foss</tags>
@@ -14,11 +14,9 @@ import os
 import pathlib
 import re
 from urllib import request
-from github import Github
-from typing import NoReturn


-def get_repo_tag_names() -> list[str]:
+def get_repo_tag_names():
    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")
@@ -45,7 +43,7 @@ def get_latest_choco_blender_version() -> list:
    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)


-def get_file_sha256_hash(file_path: str) -> str:
+def get_file_sha256_hash(file_path):
    BLOCKSIZE = 65536
    hasher = hashlib.sha256()

@@ -58,29 +56,16 @@ def get_file_sha256_hash(file_path: str) -> str:
    return hasher.hexdigest()


-def quit_with_error_message(message: str) -> NoReturn:
+def quit_with_error_message(message: str):
    print(f"ERROR: {message}")
    quit(0)


-def get_release_zip(tag: str) -> tuple[str, str]:
-    g = Github()
-    repo = g.get_repo("IfcOpenShell/IfcOpenShell")
-    release = repo.get_release(tag)
-    for asset in release.get_assets():
-        asset_name = asset.name
-        if python_version not in asset_name:
-            continue
-        if TARGET_OS not in asset_name:
-            continue
-        return (asset_name, asset.browser_download_url)
-    raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
-
-
 start = datetime.datetime.now()

 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
 URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases/download/"
 RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
 RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
 RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
@@ -94,7 +79,7 @@ os.chdir(BLENDERBIM_DIR)
 blenderbim_date_yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%y%m%d")
 should_release = False
 target_release_tag = ""
-TARGET_OS = "windows-x64"
+target_os = "win"

 git_status = os.popen("git status").read()
 print(git_status)
@@ -145,7 +130,10 @@ print(f"{python_version=}")
 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)
+release_zip_file_name = f"{target_release_tag}-{python_version}-{target_os}.zip"
+
+# download release
+url_blenderbim_py3x_win_zip = f"{URL_IFCOS_RELEASES}{target_release_tag}/{release_zip_file_name}"
 os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()

 # sha256sum_blenderbim_py310_win_zip
@@ -18,12 +18,7 @@
 ################################################################################

 cmake_minimum_required(VERSION 3.21)
-if (NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
-endif()
-if (CMAKE_CXX_STANDARD LESS 17)
-    message(FATAL_ERROR "C++17 or newer is required.")
-endif()
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

@@ -32,14 +27,13 @@ if(CCACHE_FOUND)
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 endif()

-add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-
-if(POLICY CMP0144) # 3.27
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0078 OLD)
+cmake_policy(SET CMP0086 NEW)
+if (POLICY CMP0144)
    cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
 endif()
-if(POLICY CMP0167) # 3.30
-    cmake_policy(SET CMP0167 OLD)
-endif()

 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -68,7 +62,7 @@ option(BUILD_IFCPYTHON "Build IfcPython." ON)
 option(BUILD_CONVERT "Build IfcConvert executable." ON)
 option(BUILD_DOCUMENTATION "Build IfcOpenShell Documentation." OFF)
 option(BUILD_EXAMPLES "Build example applications." ON)
-option(BUILD_GEOMSERVER "Build IfcGeomServer executable (Open CASCADE is required)." ON)
+option(BUILD_GEOMSERVER "Build IfcGeomServer executable." ON)
 option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)
@@ -81,21 +75,13 @@ option(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 option(WITH_PROJ "Enable output of Earth-Centered Earth-Fixed glTF output using the PROJ library" OFF)
 option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
-option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." OFF)
+option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." ON)
 option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
-option(WITH_ROCKSDB "Support a RocksDB key-value store as a file backend in IfcOpenShell" OFF)
-option(WITH_ZSTD "Use Zstd compression in RocksDB writes" OFF)

 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
 option(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
 option(VERSION_OVERRIDE "Override the version defined in IfcParse.h with the file VERSION in the repository root" OFF)

-set(
-    PYTHON_MODULE_INSTALL_DIR
-    "" CACHE PATH
-    "Directory to install IfcPython package to. By default package is installed in found Python's site-packages."
-)
-
 if (VERSION_OVERRIDE)
    file(READ "../VERSION" "RELEASE_VERSION_")
    string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
@@ -208,31 +194,15 @@ foreach(option_flag IN LISTS option_flags)
    convert_env_var_to_bool("${option_flag}")
 endforeach()

-set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
-
-macro(clear_wasm_sysroot)
 if(WASM_BUILD)
    # when using the nix/build-all.py build script we should not
    # look into the sysroot for most of the dependencies but rather
    # in the designated build/ folder created by the script.
+    set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
    set(CMAKE_FIND_ROOT_PATH "")
 endif()
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
-endmacro()
-
-macro(restore_wasm_sysroot)
-if(WASM_BUILD)
-    # reset to use sysroot
-    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
-endif()
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endmacro()

 if(WITH_CGAL)
-    if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT EXISTS "${CGAL_INCLUDE_DIR}")
-        message(FATAL_ERROR "CGAL_INCLUDE_DIR ('${CGAL_INCLUDE_DIR}') is not provided or doesn't exist.")
-    endif()
-
    add_definitions(-DIFOPSH_WITH_CGAL)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)

@@ -251,9 +221,7 @@ endif()

 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    clear_wasm_sysroot()
-    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-    restore_wasm_sysroot()
+    find_path(json_header_path "json.hpp" ${JSON_INCLUDE_DIR} PATH_SUFFIXES "nlohmann")
    set(JSON_INCLUDE_DIR ${json_header_path})

    if(json_header_path)
@@ -266,7 +234,7 @@ if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()

-# Add USD support to serializers
+# Add USD support to serializers 
 if(USD_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
    UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
@@ -289,13 +257,13 @@ if(USD_SUPPORT)
    endif()

    set(USD_LIBRARIES
-            usd_usd
+            usd_usd 
            usd_usdGeom
-            usd_usdShade
-            usd_usdLux
-            usd_vt
-            usd_sdf
-            usd_tf
+            usd_usdShade 
+            usd_usdLux 
+            usd_vt 
+            usd_sdf 
+            usd_tf 
            usd_gf
        )

@@ -313,26 +281,6 @@ if(USD_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
 endif(USD_SUPPORT)

-if (WITH_ROCKSDB)
-    find_package(RocksDB CONFIG REQUIRED)
-    message(STATUS "RocksDB: found at '${RocksDB_DIR}'.")
-    add_definitions(-DIFOPSH_WITH_ROCKSDB)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB)
-    link_libraries(RocksDB::rocksdb)
-
-    if (WITH_ZSTD)
-        # @todo do we actually need the zstd include dir or rather just pass
-        # the libzstd.a along with the rocksdb library when needed and feature
-        # detect based on rocksdb API?
-        find_package(ZSTD CONFIG REQUIRED)
-        message(STATUS "ZSTD: found at '${ZSTD_DIR}'.")
-        link_libraries(zstd::libzstd_static)
-
-        add_definitions(-DIFOPSH_WITH_ROCKSDB_ZSTD)
-        set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB_ZSTD)
-    endif()
-endif()
-
 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
 # runtime, when doing running conda-build we pick what conda prepared for us.
 if(WIN32 AND("$ENV{CONDA_BUILD}" STREQUAL ""))
@@ -380,41 +328,13 @@ if(USE_MMAP)
    add_definitions(-DUSE_MMAP)
 endif()

-clear_wasm_sysroot()
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-restore_wasm_sysroot()
 message(STATUS "Boost include files found in ${Boost_INCLUDE_DIRS}")
 message(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")

 if(NOT MINIMAL_BUILD)
    # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
-    clear_wasm_sysroot()
-    if(IFCXML_SUPPORT)
-        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?)
-            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()
-
-            if(TARGET LibXml2::LibXml2)
-                # Config mode already gives us the target
-                set(LIBXML2_LIBRARIES LibXml2::LibXml2)
-                get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
-            else()
-                # Module mode (Ubuntu)
-                set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
-                set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
-            endif()
-        else()
-            find_package(LibXml2 REQUIRED)
-        endif()
-    endif()
-    restore_wasm_sysroot()
+    find_package(LibXml2 REQUIRED)
 endif()

 if(IFCXML_SUPPORT)
@@ -423,91 +343,48 @@ if(IFCXML_SUPPORT)
 endif()

 if(BUILD_IFCGEOM)
-    if(MSVC AND NOT LibXml2_DIR)
+    if(MSVC)
        add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
    endif()

    # Open CASCADE
    if(WITH_OPENCASCADE)
-
-    # Fallback for missing OCC_INCLUDE_DIR.
-    if(NOT OCC_INCLUDE_DIR)
-	clear_wasm_sysroot()
+    if("${OCC_INCLUDE_DIR}" STREQUAL "")
        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
            PATHS
                /usr/include/occt
                /usr/include/oce
                /usr/include/opencascade
+            REQUIRED
        )
-	restore_wasm_sysroot()

        if(OCC_INCLUDE_DIR)
            message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
+        else()
+            message(FATAL_ERROR "Unable to find Open CASCADE include directory, specify OCC_INCLUDE_DIR manually.")
        endif()
    else()
        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}" STREQUAL "")
-        find_library(OCC_LIBRARY TKernel
-            PATHS
-                /usr/lib
+    if(OCC_INCLUDE_DIR)
+        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
+            REGEX "#define OCC_VERSION_MAJOR.*"
        )
-
-        if(OCC_LIBRARY)
-            GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
-            message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-        endif()
-    else()
-        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()
-
-    # No specific paths specified, try to find package.
-    if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
-        message(
-            STATUS
-            "Using provided OCCT_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-            "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
+        string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
+        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
+          REGEX "#define OCC_VERSION_MINOR.*"
        )
-    elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-        find_package(OpenCASCADE CONFIG REQUIRED)
-        get_target_property(OCC_INCLUDE_DIR TKernel INTERFACE_INCLUDE_DIRECTORIES)
-        get_target_property(TKERNEL_LIB_PATH TKernel LOCATION)
-        get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
-        message(
-            STATUS
-            "Found Open CASCADE package at '${OpenCASCADE_DIR}', "
-            "deducing from it OCC_INCLUDE_DIR: '${OCC_INCLUDE_DIR}' "
-            "and OCC_LIBRARY_DIR: '${OCC_LIBRARY_DIR}'."
+        string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
+        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
+          REGEX "#define OCC_VERSION_MAINTENANCE.*"
        )
-    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."
-        )
-    endif()
+        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
+        set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
+    endif(OCC_INCLUDE_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}")
-
-    set(
-        OPENCASCADE_LIBRARY_NAMES
+    set(OPENCASCADE_LIBRARY_NAMES
        TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
        TKFillet TKXSBase TKOffset TKHLR

@@ -521,9 +398,25 @@ if(BUILD_IFCGEOM)
        list(APPEND OPENCASCADE_LIBRARY_NAMES TKDESTEP TKDEIGES)
    endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)

-    clear_wasm_sysroot()
+    if("${OCC_LIBRARY_DIR}" STREQUAL "")
+        find_library(OCC_LIBRARY TKernel
+            PATHS
+                /usr/lib
+            REQUIRED
+        )
+
+        if(OCC_LIBRARY)
+            GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
+            message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
+        else()
+            message(FATAL_ERROR "Unable find Open CASCADE library directory, specify OCC_LIBRARY_DIR manually.")
+        endif()
+    else()
+        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()
+
    find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
-    restore_wasm_sysroot()

    if(libTKernel)
        message(STATUS "Required Open Cascade Library files found")
@@ -559,7 +452,7 @@ if(BUILD_IFCGEOM)

    if(OCCT_STATIC)
        find_package(Threads)
-
+        
        if(WASM_BUILD)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
        else()
@@ -571,7 +464,7 @@ if(BUILD_IFCGEOM)
                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()
@@ -582,18 +475,7 @@ if(BUILD_IFCGEOM)
    endif(WITH_OPENCASCADE)
 endif(BUILD_IFCGEOM)

-if(COLLADA_SUPPORT AND (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)
-    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(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
+if(COLLADA_SUPPORT)
    # Find OpenCOLLADA
    if("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
        message(STATUS "No OpenCOLLADA include directory specified")
@@ -626,7 +508,8 @@ if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)

    if(COLLADASWStreamWriter_h)
        message(STATUS "OpenCOLLADA header files found")
-        set(OPENCOLLADA_FOUND TRUE)
+        add_definitions(-DWITH_OPENCOLLADA)
+        set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)

        set(OPENCOLLADA_LIBRARY_NAMES
            GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
@@ -674,12 +557,7 @@ if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
    endif()
-endif(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
-if(COLLADA_SUPPORT AND OPENCOLLADA_FOUND)
-    add_definitions(-DWITH_OPENCOLLADA)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
-endif()
-
+endif(COLLADA_SUPPORT)

 if(HDF5_SUPPORT)
    if("${HDF5_INCLUDE_DIR}" STREQUAL "")
@@ -747,33 +625,25 @@ if(HDF5_SUPPORT)
    endif()

    if(NOT HDF5_LIBRARIES)
-        if(NOT WIN32 AND NOT APPLE)
-            # debian default
-            set(HDF5_LIBRARIES
-                /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
-                /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
-                /usr/lib/x86_64-linux-gnu/libsz.so
-                /usr/lib/x86_64-linux-gnu/libaec.so
-                z dl
-            )
-        else()
-            find_package(HDF5 CONFIG)
-            if(NOT HDF5_DIR)
-                message(
-                    FATAL_ERROR
-                    "HDF5_LIBRARY_DIR is not provided (current value: '${HDF5_LIBRARY_DIR}'). "
-                    "Also could not find HDF5 package."
-                )
-            endif()
-            message(STATUS "Found HDF5 package: '${HDF5_DIR}'.")
-            set(HDF5_LIBRARIES hdf5_cpp-static)
-        endif()
+        # debian default
+        set(HDF5_LIBRARIES
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
+            /usr/lib/x86_64-linux-gnu/libsz.so
+            /usr/lib/x86_64-linux-gnu/libaec.so
+            z dl
+        )
    endif()

    add_definitions(-DWITH_HDF5)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
 endif(HDF5_SUPPORT)

+if(WASM_BUILD)
+    # reset to use sysroot
+    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
+endif()
+
 if(ENABLE_BUILD_OPTIMIZATIONS)
    if(MSVC)
        # NOTE: RelWithDebInfo and Release use O2 (= /Ox /Gl /Gy/ = Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) by default,
@@ -860,10 +730,6 @@ if(MSVC)
    # endif()

 	add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
-	# See #5158.
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.40)
-		add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-	endif()
 else()
    add_definitions(-Wall -Wextra)

@@ -884,21 +750,6 @@ else()
    endif()
 endif(MSVC)

-
-# Ensure other dependencies are provided.
-if(NOT EXISTS "${EIGEN_DIR}")
-    find_package(Eigen3 CONFIG)
-    if(NOT Eigen3_DIR)
-        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()
-    link_libraries(Eigen3::Eigen)
-endif()
-
-
 include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
    ${EIGEN_DIR} ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
@@ -908,7 +759,7 @@ include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCL
 if(NOT SCHEMA_VERSIONS)
    if(WASM_BUILD)
        # super arbitrarily try to keep size down at least a little bit
-        set(SCHEMA_VERSIONS "2x3" "4" "4x3_add2")
+        set(SCHEMA_VERSIONS "2x3" "4")
    else()
        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
    endif()
@@ -999,7 +850,7 @@ if(BUILD_IFCGEOM)
 	if(WASM_BUILD)
 	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	else()
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
+	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})	
 	endif()
 endif()

@@ -1057,20 +908,9 @@ endforeach()

 set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})

-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-        message(STATUS "GCC < 9 detected, linking stdc++fs explicitly")
-        set(STDCPPFS stdc++fs)
-    endif()
-endif()
-
 add_library(IfcParse ${IFCPARSE_FILES})
-target_link_libraries(IfcParse ${STDCPPFS})
 set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

-if(LibXml2_DIR)
-    target_compile_definitions(IfcParse PRIVATE ${LIBXML2_DEFINITIONS})
-endif()
 if(WASM_BUILD)
    target_link_libraries(IfcParse ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 else()
@@ -1079,10 +919,8 @@ endif()

 if(BUILD_IFCGEOM)
    if(WITH_CGAL)
-	clear_wasm_sysroot()
        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)
-	restore_wasm_sysroot()
        if(NOT libGMP)
            message(FATAL_ERROR "Unable to find GMP library files, aborting")
        endif()
@@ -1099,7 +937,7 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
-
+        
        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
        # needed?
@@ -1107,7 +945,7 @@ if(BUILD_IFCGEOM)
        # endif()
        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES})
        list(APPEND kernel_libraries geometry_kernel_${kernel})
-
+        
        if(${kernel} STREQUAL "cgal")
            set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")

@@ -1127,7 +965,7 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
-
+        
        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
@@ -1166,7 +1004,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
    foreach(schema ${SCHEMA_VERSIONS})
        add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES})
        set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-
+        
        if(WASM_BUILD)
            target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES})
        else()
@@ -1207,19 +1045,10 @@ if(BUILD_CONVERT)
        target_include_directories(cityjson_converter PRIVATE ../src)
        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} cityjson_converter)

-        install(TARGETS cityjson_converter
-            ARCHIVE DESTINATION ${LIBDIR}
-            LIBRARY DESTINATION ${LIBDIR}
-        )
-
        add_executable(cityjson_converter_exe ${CITYJSON_CONVERT_FILES})
        set_target_properties(cityjson_converter_exe PROPERTIES COMPILE_FLAGS "-DCITYJSON_EXECUTABLE")
        target_include_directories(cityjson_converter_exe PRIVATE ../src)
        target_link_libraries(cityjson_converter_exe ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
-
-        install(TARGETS cityjson_converter_exe
-            RUNTIME DESTINATION ${BINDIR}
-        )
    endif()

    # IfcConvert
@@ -1258,11 +1087,6 @@ endif(BUILD_CONVERT)

 # IfcGeomServer
 if(BUILD_GEOMSERVER)
-
-    if(NOT WITH_OPENCASCADE)
-        message(FATAL_ERROR "Open CASCADE is required to build IfcGeomServer.")
-    endif()
-
    file(GLOB CPP_FILES ../src/ifcgeomserver/*.cpp)
    file(GLOB H_FILES ../src/ifcgeomserver/*.h)
    set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
@@ -1290,7 +1114,6 @@ if(ADD_COMMIT_SHA)
            message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
            execute_process(
                COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                OUTPUT_VARIABLE git_branches
                OUTPUT_STRIP_TRAILING_WHITESPACE
            )
@@ -1308,18 +1131,11 @@ if(ADD_COMMIT_SHA)

        execute_process(
            COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
            OUTPUT_VARIABLE git_sha
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )
-
        message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
        message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
-
-        if ("${git_branch}" STREQUAL "" OR "${git_sha}" STREQUAL "")
-            message(FATAL_ERROR "Unable to determine commit sha and/or branch")
-        endif()
-
        add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
        add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
    endif()
@@ -1351,7 +1167,7 @@ if(BUILD_IFCMAX)
 endif()

 if(WITH_CGAL)
-    add_subdirectory(../src/svgfill svgfill)
+    add_subdirectory(../src/svgfill svgfill)        
 endif()

 if(BUILD_QTVIEWER)
@@ -1370,20 +1186,13 @@ install(TARGETS IfcParse
 )

 if(BUILD_IFCGEOM)
-    # install(FILES ${IFCGEOM_H_FILES}
-    #     DESTINATION ${INCLUDEDIR}/ifcgeom
-    # )
-
-    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
+    install(FILES ${IFCGEOM_H_FILES}
        DESTINATION ${INCLUDEDIR}/ifcgeom
    )

-    foreach(kernel ${GEOMETRY_KERNELS})
-        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
-         install(FILES ${IFCGEOM_H_FILES}
-            DESTINATION ${INCLUDEDIR}/ifcgeom/kernels/${kernel}
-        )
-    endforeach()
+    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
+        DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
+    )

    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
        ARCHIVE DESTINATION ${LIBDIR}
@@ -1399,25 +1208,15 @@ if(BUILD_CONVERT)
        RUNTIME DESTINATION ${BINDIR}
    )

-    install(FILES ${SERIALIZERS_H_FILES}
+    install(FILES ${SERIALIZERS_FILES}
        DESTINATION ${INCLUDEDIR}/serializers/
    )

-    install(FILES ${SERIALIZERS_S_H_FILES}
+    install(FILES ${SERIALIZERS_S_FILES}
        DESTINATION ${INCLUDEDIR}/serializers/schema_dependent
    )
 endif(BUILD_CONVERT)

-if(BUILD_CONVERT OR BUILD_IFCPYTHON)
-    if(WITH_OPENCASCADE)
-        install(TARGETS geometry_serializer ${geometry_serializer_libraries}
-            ARCHIVE DESTINATION ${LIBDIR}
-            LIBRARY DESTINATION ${LIBDIR}
-            RUNTIME DESTINATION ${BINDIR}
-        )
-    endif()
-endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
-
 # Cmake uninstall target
 if(NOT TARGET uninstall)
    configure_file(
@@ -1433,8 +1232,6 @@ endif()
 list(APPEND CPACK_SOURCE_IGNORE_FILES
    "/\\\\.git"
    "/build/"
-    "/.pytest_cache/"
-    "/__pycache__/"
 )
 set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/..;/")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}")
@@ -1,114 +0,0 @@
-{
-  "version": 6,
-  "configurePresets": [
-    {
-      "name": "shared",
-      "generator": "Ninja",
-      "hidden": true,
-      "cacheVariables": {
-        "BUILD_IFCPYTHON": "ON",
-        "BUILD_IFCGEOM": "ON",
-        "COLLADA_SUPPORT": "OFF",
-        "BUILD_EXAMPLES": "OFF",
-        "BUILD_GEOMSERVER": "OFF",
-        "GLTF_SUPPORT": "ON",
-        "BUILD_CONVERT": "ON",
-        "BUILD_IFCMAX": "OFF",
-        "IFCXML_SUPPORT": "ON",
-        "HDF5_SUPPORT": "ON",
-        "SCHEMA_VERSIONS": "4x3_add2",
-        "CITYJSON_SUPPORT": "OFF",
-        "CMAKE_GENERATOR_PLATFORM": "",
-        "CMAKE_GENERATOR_TOOLSET": ""
-      }
-    },
-    {
-      "name": "win-shared",
-      "inherits": [
-        "shared"
-      ],
-      "hidden": true,
-      "environment": {
-        "CONDA_BUILD": "ON",
-        "CONDA_PY": "312"
-      },
-      "cacheVariables": {
-        "Boost_USE_STATIC_LIBS": "OFF",
-        "CMAKE_INSTALL_PREFIX": "$env{LIBRARY_PREFIX}",
-        "PYTHON_EXECUTABLE": "$env{PREFIX}/python.exe",
-        "PYTHON_INCLUDE_DIR": "$env{PREFIX}/include",
-        "PYTHON_LIBRARY": "$env{PREFIX}/libs/python$env{CONDA_PY}.lib",
-        "CMAKE_FIND_ROOT_PATH": "$env{LIBRARY_PREFIX}",
-        "CMAKE_PREFIX_PATH": "$env{LIBRARY_PREFIX}",
-        "LIBXML2_LIBRARIES": "$env{LIBRARY_PREFIX}/lib/libxml2.lib",
-        "OCC_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include/opencascade",
-        "OCC_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "CGAL_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "EIGEN_DIR": "$env{LIBRARY_PREFIX}/include/eigen3",
-        "JSON_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include"
-      }
-    },
-    {
-      "name": "win-release",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/prod",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/prod/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "win-debug",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-debug",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/dev",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/dev/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "win-test",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-test",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/tests",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/tests/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "SCHEMA_VERSIONS": "2x3;4;4x3_add2"
-      }
-    }
-  ]
-}
@@ -121,4 +121,4 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
        PARENT_SCOPE
    )
-endfunction()
+endfunction()
@@ -9,7 +9,6 @@ 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%" ^
@@ -50,7 +49,3 @@ if errorlevel 1 exit 1
 ninja install -j 1

 if errorlevel 1 exit 1
-
-python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py
-
-if errorlevel 1 exit 1
@@ -16,7 +16,6 @@ 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 \
@@ -47,6 +46,4 @@ cmake ${CMAKE_ARGS} -G Ninja \

 ninja

-ninja install -j 1
-
-python "${RECIPE_DIR}/update_version_init.py" "${PKG_VERSION}" "${SP_DIR}/ifcopenshell/__init__.py"
+ninja install -j 1
@@ -1,5 +1,6 @@
-python:
-  - 3.12
+variant:
+  - novtk
+  - all

 occt:
  - 7.8.1
@@ -23,15 +24,14 @@ cxx_compiler_version:
 - '12'    # [linux]
 - '16'    # [osx]
 c_stdlib_version:
-  - 2.17    # [linux]
-  - 10.13   # [osx and x86_64]
-  - 11.0    # [osx and arm64]
+- '2.12'    # [linux]
+- '10.13'   # [osx]
 hdf5:
- 1.14.6
+- 1.14.3
 libboost_devel:
- '1.86'
+- '1.84'
 libxml2:
- 2.13
+- '2'
 mpfr:
 - '4'
 gmp:
@@ -47,12 +47,12 @@ target_platform:
 - win-64    # [win]
 - linux-64  # [linux]
 - osx-64    # [osx]
-macos_machine:                 # [osx]
-  - x86_64-apple-darwin13.4.0  # [osx and x86_64]
-  - arm64-apple-darwin20.0.0   # [osx and arm64]
-MACOSX_DEPLOYMENT_TARGET:      # [osx]
-  - 11.0                       # [osx and arm64]
-  - 10.13                      # [osx and x86_64]
+macos_machine:
+- x86_64-apple-darwin13.4.0
+MACOSX_DEPLOYMENT_TARGET:
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'

-CONDA_BUILD_SYSROOT:  # [osx]
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx and x86_64]
+CONDA_BUILD_SYSROOT:
+  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx]
@@ -1,78 +1,64 @@
-context:
-  version: ${{ env.get("VERSION_OVERRIDE", default="0.8.2.1") }}
-  build: 1
+{% set version = environ.get('VERSION_OVERRIDE', '0.8.0') %}
+{% set build = 0 %}
+
+# Higher number -> Always prioritize "novtk" variant over "all" variant
+{% set build = build + 200 %}   # [variant == "novtk"]
+{% set build = build + 100 %}   # [variant == "all"]

 package:
  name: ifcopenshell
-  version: ${{ version }}
+  version: {{ version }}

 source:
-  - path: ..
+  path: ../


 build:
-  number: ${{ build }}
-  dynamic_linking:
-    binary_relocation: ${{ true if osx }}
+  number: {{ build }}
+  skip: true  # [py<39]
+  binary_relocation: false  # [osx]
+  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
+  run_exports:
+    - {{ pin_subpackage('ifcopenshell', max_pin='x.x.x') }} *{{ variant }}*
+

 requirements:
  build:
-    - if: build_platform != target_platform
-      then:
-        - python
-        - cross-python_${{ target_platform }}
-    - cmake <4
+    - cmake
    - ninja
    - swig >=4.1.1
-    - ${{ stdlib("c") }}
-    - ${{ compiler('c') }}
-    - ${{ compiler('cxx') }}
+    - {{ stdlib("c") }}
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
  host:
    - python
    - libboost-devel
-    - occt
+    - occt *=*{{ variant }}*
    - libxml2
    - cgal-cpp
    - hdf5
    - eigen
    - mpfr
    - nlohmann_json
-    - gmp
+    - gmp  # [unix]
+    - mpir  # [win]
    - zlib
  run:
    - python
-    - shapely
-    - typing_extensions
-    - ${{ pin_compatible('occt', upper_bound='x.x.x') }}
-    - ${{ pin_compatible('cgal-cpp', upper_bound='x.x') }}
-  run_exports:
-    - ${{ pin_subpackage('ifcopenshell', upper_bound='x.x.x') }}
+    - {{ pin_compatible('occt', max_pin='x.x.x') }} *{{ variant }}*
+    - {{ pin_compatible('cgal-cpp', max_pin='x.x') }}
+
+
+test:
+  imports:
+    - ifcopenshell

-tests:
-  - python:
-      imports:
-        - ifcopenshell
-      pip_check: false
-  - script:
-      - python -c "import ifcopenshell; assert ifcopenshell.version == '${{ version }}', 'print(ifcopenshell.version)'"
-    requirements:
-      run:
-        - occt * *novtk*  # Ensure that even though compiled against OCCT with VTK, it can still run with OCCT without VTK
-        - pytest
-        - python-dateutil
-        - xmlschema
-        - xsdata
-        - lxml
-        - isodate
-        - lark
-        - networkx
-        - tabulate
-        - shapely

 about:
+  home: https://ifcopenshell.org
  license: LGPL-3.0-or-later
  license_file: COPYING
-  summary: IfcOpenShell is a library to support the IFC file format
+  summary: 'IfcOpenShell is a library to support the IFC file format'
  description: |
    IfcOpenShell
    ============
@@ -90,14 +76,14 @@ about:
    For more information, see:
    
    * [IfcOpenShell Website](http://ifcopenshell.org)
-    * [IfcOpenShell Documentation](http://bonsaibim.org/docs-python)
-    * [IfcOpenShell C++ Installation](https://bonsaibim.org/docs-python/ifcopenshell/installation.html)
-    * [IfcOpenShell Python Installation](https://bonsaibim.org/docs-python/ifcopenshell-python/installation.html)
-    * [IfcOpenShell Python Hello World Tutorial](https://bonsaibim.org/docs-python/ifcopenshell-python/hello_world.html)
-    * [Bonsai Website](https://bonsaibim.org)
-    * [Bonsai Documentation](http://bonsaibim.org/docs)
-    * [Add-on Installation](https://bonsaibim.org/docs/users/installation.html)
-    * [Exploring an IFC model](https://bonsaibim.org/docs/users/exploring_an_ifc_model.html)
+    * [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
+    * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
+    * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+    * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
+    * [BlenderBIM Add-on Website](https://blenderbim.org)
+    * [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
+    * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
+    * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)
    
    <table>
      <thead>
@@ -307,9 +293,8 @@ about:
    [MSYS2]: https://msys2.github.io/ "MSYS2"
    [win/readme.md]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/win/readme.md "win/readme.md"
    [nix/build-all.py]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/nix/build-all.py "nix/build-all.py"
-  homepage: https://ifcopenshell.org
-  repository: https://github.com/IfcOpenShell/IfcOpenShell
-  documentation: https://ifcopenshell.org/
+  doc_url: https://ifcopenshell.org/
+  dev_url: https://github.com/IfcOpenShell/IfcOpenShell

 extra:
  recipe-maintainers:
@@ -1,32 +0,0 @@
-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)
-
-    # Read the file and replace the version
-    file_contents = file_path.read_text(encoding="utf-8")
-    new_contents = re.sub(r'version = "0\.0\.0"', f'version = "{version}"', file_contents)
-
-    # Write the updated contents back to the file
-    file_path.write_text(new_contents, encoding="utf-8")
-
-    print(f"Updated version in {file_path} to {version}")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Update the version string in a Python file.")
-    parser.add_argument(
-        "version",
-        type=str,
-        help="The version string to replace '0.0.0' with (e.g., '1.2.3')."
-    )
-    parser.add_argument(
-        "file",
-        type=str,
-        help="The path to the __init__.py file where the version will be updated."
-    )
-
-    args = parser.parse_args()
-    update_version(args.file, args.version)
@@ -1,13 +0,0 @@
-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")
@@ -1,13 +0,0 @@
-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")
@@ -1,84 +0,0 @@
-[project]
-name = "IfcOpenShell"
-version = "0.8.4"
-description = "IfcOpenShell is a library to support the IFC file format"
-channels = ["conda-forge"]
-platforms = ["win-64", "linux-64", "osx-64"]
-
-[environments]
-common = { features = ["common"], no-default-feature = true }
-prod = { features = ["prod", "common"], no-default-feature = true }
-dev = { features = ["dev", "common"], no-default-feature = true }
-lint = { features = ["lint"], no-default-feature = true }
-tests = { features = ["tests", "common"], no-default-feature = true }
-
-[feature.lint.dependencies]
-ruff = "*"
-black = "*"
-
-[feature.common.dependencies]
-# Build deps
-cmake = "==3.30.5"
-ninja = "*"
-swig = "*"
-c-compiler = "*"
-cxx-compiler = "*"
-
-# Runtime deps
-python = "3.12.*"
-libboost-devel = "*"
-occt = { version = "*", build = "*novtk*" }
-cgal-cpp = "*"
-numpy = "*"
-lark = "*"
-hdf5 = "*"
-eigen = "*"
-mpfr = "*"
-gmp = "*"
-nlohmann_json = "*"
-zlib = "*"
-# Not strictly necessary
-pythonocc-core = "*"
-
-[feature.tests.dependencies]
-pytest = "*"
-shapely = "*"
-tabulate = "*"
-isodate = "*"
-python-dateutil = "*"
-xmlschema = "*"
-xsdata = "*"
-lxml = "*"
-networkx = "*"
-
-[feature.common.target.win-64.dependencies]
-vs2022_win-64 = "*"
-#vs_win-64 = "*" # Visual Studio
-#vswhere = "*" # Visual Studio
-
-[feature.common.tasks]
-init-submodules = { cmd = "git submodule update --init --recursive", outputs =["$PIXI_PROJECT_ROOT/src/svgfill/3rdparty/svgpp/*"]}
-
-[feature.prod.target.win-64.tasks]
-configure-release = { cmd = ["cmake", "--preset", "win-release", "-B", "build/win-release", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }] }
-build-release = { cmd = ["cmake", "--build", "build/win-release", "--config", "Release"], description = "Build the project" }
-
-[feature.dev.target.win-64.tasks]
-configure-debug = { cmd = ["cmake", "--preset", "win-debug", "-B", "build/win-debug", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-debug/CMakeCache.txt"] }
-build-debug = { cmd = ["cmake", "--build", "build/win-debug", "--config", "Debug"], description = "Build the project", depends-on = ["configure-debug"] }
-install-debug = { cmd = ["cmake", "--install", "build/win-debug", "--config", "Debug"], description = "Install the project" } # Optionally Install files to your desired env using --prefix
-
-vsdebug = { cmd = ["python"], description = "Run a python script with vs debugger attached" }
-
-[feature.tests.tasks]
-configure-test = { cmd = ["cmake", "--preset", "win-test", "-B", "build/win-test", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-test/CMakeCache.txt"] }
-build-test = { cmd = ["cmake", "--build", "build/win-test", "--config", "Release"], description = "Build the project", depends-on = ["configure-test"], outputs=["build/win-test/IfcGeom.lib"] }
-install-test = { cmd = ["cmake", "--install", "build/win-test", "--config", "Release"], description = "Install the project", depends-on = ["build-test"] } # Optionally Install files to your desired env using --prefix
-
-test = { cmd = "pytest .", cwd="src/ifcopenshell-python/test", depends-on=["install-test"], env = {PYTHONPATH="$PIXI_PROJECT_ROOT/src/ifcpatch"}}
-
-[feature.lint.tasks]
-lint = { cmd = "ruff check && black --diff --check ."}
-
-[feature.common.target.win-64.activation]
-#scripts = ["cmake/activate.bat"]
@@ -3,12 +3,11 @@ package:
  version: 0.8.0

 source:
-  path: ../../IfcOpenShell
+  path: IfcOpenShell

 build:
  script: |
-    BUILD_CFG=Release python nix/build-all.py --without-rocksdb --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py313 IfcOpenShell-Python
-    mv package/ifcopenshell .
+    python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py310 IfcOpenShell-Python
    cp pyodide/setup.py .

 about:
@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages

-setup(name='ifcopenshell',
+setup(name='IfcOpenShell',
      version='0.8.0',
      description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
      author='Thomas Krijnen',
      author_email='thomas@aecgeeks.com',
      url='http://ifcopenshell.org',
      packages=find_packages(),
-      package_data={'': ['*.so', '*.json']},
+      package_data={'': ['*.so']},
 )
@@ -1,66 +1,35 @@
 [tool.black]
 line-length = 120
 include = '''
-    src/.*.pyi?$
-    |nix/.*.pyi?$
+    src/(
+        bcf
+        |bcfserver
+        |blenderbim
+        |bsdd
+        |foundationserver
+        |ifc2ca
+        |ifc4d
+        |ifc5d
+        |ifcbimtester
+        |ifcblender
+        |ifccityjson
+        |ifcclash
+        |ifccsv
+        |ifcdiff
+        |ifcfm
+        |ifcpatch
+        |ifctester
+        |ifcopenshell-python
+        |ifcsverchok
+        |opencdeserver
+    )/.*.py$
 '''
 extend-exclude = '''
    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
-
-# Define here general ruff settings,
-# 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",
-    "src/svgfill",
-    #
-    # Unformatted.
-    "src/exterior-shell-extractor",
-    # Incompatible with linter.
-    "src/ifc2ca/templates",
-]
-[tool.ruff.lint]
-select = [
-    # Default Ruff rules.
-    # "E4",        # imports
-    # "E7",        # statements
-    "E9",          # io errors
-    # "F",         # pyflakes
-    #
-    "FA",          # future annotations
-    "UP",          # pyupgrade
-    "RUF015",      # next() > list_comprehension[0]
-    "RUF022",      # sort __all__
-]
-ignore = [
-    "FA100", # Conflicts with Blender using annotations for props definitions.
-    # Maybe will enable later:
-    "UP007", # Optional to X | Y
-    "UP045", # Optional to X | None
-    "UP015", # Unnecessary mode argument
-    "UP028", # yield for -> yield from
-    "UP030", # implicit references for positional format fields
-    "UP031", # Replace % with .format
-    "UP032", # Replace .format with f-string
-
-    # Deprecated Ruff rules.
-    "UP038", # Use X | Y in isinstance
-]
@@ -30,8 +30,8 @@ license:
 # TODO: make this based on xsd file presence
 .PHONY: models
 models:
-	xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
-	xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
+	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
+	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd

 .PHONY: test
 test:
@@ -3,7 +3,3 @@
 A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
 available via `bcfxml.py` and manipulation of BCF-API is available via
 `bcfapi.py`.
-
-Python files in 'model' folder are automatically generated from .xsd files (located in 'xsd' folder).
-To regenerate them you can use `make models`.
-The only exception is 'v2/model/extensions.py', see it's note for the details.
@@ -1,28 +0,0 @@
-import bcf.v2.model.extensions
-import bcf.v3.model.extensions
-from typing import NamedTuple, Union
-from dataclasses import fields
-
-
-class AttributeData(NamedTuple):
-    attr_type: type
-    subattr_name: str
-    subattr_xsd_name: str
-
-
-Extensions = Union[bcf.v2.model.extensions.Extensions, bcf.v3.model.extensions.Extensions]
-
-
-def get_extensions_attributes(extensions: Extensions) -> dict[str, AttributeData]:
-    """Return mapping of xsd attribute name to a tuple that consists of:
-    - Extensions attribute name
-    - Extensions attribute type type
-    - subattribute name"""
-    possible_attributes = {}
-    for field in fields(type(extensions)):
-        field_type = field.type.__args__[0]  # pyright: ignore [reportAttributeAccessIssue]
-        subfield = next(iter(fields(field_type)))
-        xsd_name = subfield.metadata["name"]
-        possible_attributes[field.name] = AttributeData(field_type, subfield.name, xsd_name)
-
-    return possible_attributes
@@ -1,10 +0,0 @@
-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]
-DocumentReference = Union[bcf.v2.model.TopicDocumentReference, bcf.v3.model.DocumentReference]
-HeaderFile = Union[bcf.v2.model.HeaderFile, bcf.v3.model.File]
-Topic = Union[bcf.v2.model.Topic, bcf.v3.model.Topic]
-ViewPoint = Union[bcf.v2.model.ViewPoint, bcf.v3.model.ViewPoint]
@@ -1,101 +0,0 @@
-import tempfile
-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]
-
-
-def extract_file(
-    topic: TopicHandler,
-    entity: Union[mdl.HeaderFile, mdl.BimSnippet, mdl.DocumentReference, mdl.BitMap],
-    bcfxml: Optional[Union[bcf.v2.bcfxml.BcfXml, bcf.v3.bcfxml.BcfXml]] = None,
-    outfile: Optional[Path] = None,
-) -> Union[Path, str, None]:
-    """Extracts an element with a file into a temporary directory
-
-    These include header files, bim snippets, document references, and
-    viewpoint bitmaps. External reference are not downloaded. Instead, the
-    URI reference is returned.
-
-    :param entity: The entity with a file reference to extract
-    :param outfile: If provided, save the header file to that location.
-        Otherwise, a temporary directory is created and the filename is
-        derived from the header's original filename.
-    :param bcfxml: The BCF XML file to use for resolving document references files.
-        Required only for BCF v3 document references (in BCF v3 internal documents
-        are stored at BCF root, not in the topic).
-    :return: The filepath of the extracted file. It may be a URL if the
-        header file is external.
-    """
-    if isinstance(entity, mdl.DocumentReference):
-        if isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            reference = entity.referenced_document
-        else:
-            reference = entity.document_guid
-    else:
-        reference = entity.reference
-
-    if not reference:
-        return None
-
-    # For v3 document references external documents are detected by empty document_guid.
-    # External bitmaps are not supported by bcf.
-    if not isinstance(entity, (bcf.v3.model.DocumentReference, mdl.BitMap)) and entity.is_external:
-        return reference
-
-    if isinstance(entity, bcf.v3.model.DocumentReference):
-        # Extract document reference filename and contents.
-        if not bcfxml:
-            raise TypeError("bcfxml is required for BCF v3 document references.")
-        assert isinstance(bcfxml, bcf.v3.bcfxml.BcfXml)
-        error_msg = f"BCF XML is missing document with guid '{reference}'."
-        if not bcfxml.documents:
-            raise Exception(error_msg)
-        definition_docs = bcfxml.documents.definition.documents
-        if not definition_docs:
-            raise Exception(error_msg)
-        docs = next((doc for doc in definition_docs.document if doc.guid == reference), None)
-        if not docs:
-            raise Exception(error_msg)
-        filename = docs.filename
-        bytes_data = bcfxml.documents.documents[filename]
-    else:
-        if isinstance(entity, mdl.BimSnippet):
-            bytes_data = topic.bim_snippet
-            assert isinstance(bytes_data, bytes)
-        elif isinstance(entity, mdl.HeaderFile):
-            bytes_data = topic.reference_files[reference]
-        elif isinstance(entity, mdl.BitMap):
-            bytes_data = next(
-                byte_data
-                for vp in topic.viewpoints.values()
-                for data_reference, byte_data in vp.bitmaps.items()
-                if data_reference == reference
-            )
-        elif isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            assert isinstance(topic, bcf.v2.topic.TopicHandler)
-            bytes_data = topic.document_references[reference]
-        else:
-            assert_never(entity)
-
-        # We don't really need it if 'outfile' is None, just keeping type checker happy.
-        if isinstance(entity, mdl.HeaderFile) and entity.filename:
-            filename = entity.filename
-        else:
-            filename = Path(reference).name
-
-    if not outfile:
-        outfile = Path(tempfile.mkdtemp()) / filename
-
-    with open(outfile, "wb") as f:
-        f.write(bytes_data)
-
-    return outfile
@@ -1,5 +0,0 @@
-import bcf.v2.visinfo
-import bcf.v3.visinfo
-from typing import Union
-
-VisualizationInfoHandler = Union[bcf.v2.visinfo.VisualizationInfoHandler, bcf.v3.visinfo.VisualizationInfoHandler]
@@ -30,10 +30,9 @@ from bcf.v3.model import Version as Version3
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer


-BcfXml = Union[BcfXml2, BcfXml3]
-
-
-def load(filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+def load(
+    filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None
+) -> Optional[Union[BcfXml2, BcfXml3]]:
    """
    Load a BCF file.

@@ -6,7 +6,6 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 original idea from https://stackoverflow.com/a/19722365/1307905
 """

-from __future__ import annotations
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -48,7 +47,7 @@ class InMemoryZipFile:
    def data(self) -> bytes:
        return self.in_memory_data.getvalue()

-    def __enter__(self) -> InMemoryZipFile:
+    def __enter__(self) -> "InMemoryZipFile":
        return self

    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
@@ -1,15 +1,12 @@
 """BCF XML V2 handler."""

-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
 from pathlib import Path
 from typing import Any, NoReturn, Optional, TypeVar

-import bcf.agnostic.extensions
 import bcf.v2.model as mdl
-import bcf.v2.model.extensions as mdl_extensions
 from bcf.inmemory_zipfile import InMemoryZipFile, ZipFileInterface
 from bcf.v2.topic import TopicHandler
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
@@ -27,12 +24,11 @@ class BcfXml:
        self._xml_handler = xml_handler or XmlParserSerializer()
        self._version: Optional[mdl.Version] = None
        self._project_info: Optional[mdl.ProjectExtension] = None
-        self._extensions: Optional[mdl_extensions.Extensions] = None
-        self._topics: Optional[dict[str, TopicHandler]] = None
+        self._topics: dict[str, TopicHandler] = {}
        self._extension_schema: Optional[bytes] = None
        self._zip_file = self._load_zip_file()

-    def __enter__(self) -> BcfXml:
+    def __enter__(self) -> "BcfXml":
        return self

    def __exit__(self, *args: Any) -> None:
@@ -89,67 +85,28 @@ class BcfXml:
    def extension_schema(self, value: bytes) -> None:
        self._extension_schema = value

-    @property
-    def extensions(self) -> Optional[mdl_extensions.Extensions]:
-        """BCF extensions."""
-
-        if not self._extensions and self.extension_schema:
-            import io
-            from xml.etree import ElementTree as etree
-
-            extensions = mdl_extensions.Extensions()
-
-            xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO(self.extension_schema))
-
-            attrs = bcf.agnostic.extensions.get_extensions_attributes(extensions)
-            xsd_to_attrs = {v.subattr_xsd_name: k for k, v in attrs.items()}
-            for node in root.findall(f".//{xs}restriction"):
-                attr_type = node.attrib.get("base")
-                if not attr_type:
-                    continue
-                attr_name = xsd_to_attrs.get(attr_type)
-                if attr_name is None:
-                    continue
-                values = []
-                for enum in node.findall(f".//{xs}enumeration"):
-                    values.append(enum.attrib["value"])
-                if not values:
-                    continue
-                attr_data = attrs[attr_name]
-                attr = attr_data.attr_type()
-                setattr(attr, attr_data.subattr_name, values)
-                setattr(extensions, attr_name, attr)
-
-            self._extensions = extensions
-        return self._extensions
-
-    @extensions.setter
-    def extensions(self, value: Optional[mdl_extensions.Extensions]) -> None:
-        self._extensions = value
-
    @property
    def topics(self) -> dict[str, TopicHandler]:
        """BCF topics."""
-        if self._topics is None:
-            self._topics = self._load_topics()
+        if not self._topics and self._zip_file:
+            self._topics = self._load_topics(self._zip_file, self._xml_handler)
        return self._topics

-    def _load_topics(self) -> dict[str, TopicHandler]:
+    def _load_topics(
+        self, zip_file: zipfile.ZipFile, xml_handler: AbstractXmlParserSerializer
+    ) -> dict[str, TopicHandler]:
        topics = {}
-        if self._zip_file is None:
-            return topics
-        for topic_dir in zipfile.Path(self._zip_file).iterdir():
+        for topic_dir in zipfile.Path(zip_file).iterdir():
            if not topic_dir.is_dir():
                continue
            markup_path = topic_dir.joinpath("markup.bcf")
            if not markup_path.exists():
                continue
-            topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
+            topics[topic_dir.name] = TopicHandler(topic_dir, xml_handler)
        return topics

    @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
        """
        Create a BcfXml object from a file.

@@ -173,7 +130,7 @@ class BcfXml:
        cls,
        project_name: Optional[str] = None,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
        """
        Create a new BcfXml object.

@@ -262,7 +219,7 @@ class BcfXml:
        )

    # region Deprecated methods
-    def new_project(self) -> BcfXml:
+    def new_project(self) -> "BcfXml":
        """Deprecated method."""
        warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
        return self.create_new()
@@ -36,10 +36,20 @@ from bcf.v2.model.visinfo import (

 __all__ = [
    "BimSnippet",
-    "BitmapFormat",
-    "ClippingPlane",
    "Comment",
    "CommentViewpoint",
+    "Header",
+    "HeaderFile",
+    "Markup",
+    "Topic",
+    "TopicDocumentReference",
+    "TopicRelatedTopic",
+    "ViewPoint",
+    "Project",
+    "ProjectExtension",
+    "Version",
+    "BitmapFormat",
+    "ClippingPlane",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -48,20 +58,10 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
-    "Header",
-    "HeaderFile",
    "Line",
-    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
-    "Project",
-    "ProjectExtension",
-    "Topic",
-    "TopicDocumentReference",
-    "TopicRelatedTopic",
-    "Version",
-    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmap",
@@ -1,201 +0,0 @@
-# NOTE: This file is not generated from
-# https://github.com/buildingSMART/BCF-XML/blob/release_2_1/Extension%20Schemas/extensions.xsd
-# because in bcf 2.1 there is no extensions.xml - I guess, the schema assumes that each .bcf
-# will use their own schema patched by it's own extensions.xsd.
-#
-# To make things simpler we just mimic extensions structures from bcf 3, so they'll have common API,
-# and parse extensions.xsd inside .bcf as .xml and fill our structures.
-#
-# Preferably if we could generate some kind of extensions.xml from extensions.xsd
-# and leave all the handling to xsdata.
-#
-# We also don't add it to __init__.py not to mess with generator.
-#
-# Currently extensions support for v2 is only read-only.
-
-
-import sys
-from dataclasses import dataclass, field, fields
-from typing import Optional
-
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsPriorities:
-    class Meta:
-        global_type = False
-
-    priority: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "Priority",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsSnippetTypes:
-    class Meta:
-        global_type = False
-
-    snippet_type: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "SnippetType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsStages:
-    class Meta:
-        global_type = False
-
-    stage: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "Stage",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsTopicLabels:
-    class Meta:
-        global_type = False
-
-    topic_label: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicLabel",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsTopicStatuses:
-    class Meta:
-        global_type = False
-
-    topic_status: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicStatus",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsTopicTypes:
-    class Meta:
-        global_type = False
-
-    topic_type: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class ExtensionsUsers:
-    class Meta:
-        global_type = False
-
-    user: list[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "UserIdType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(**DATACLASS_KWARGS)
-class Extensions:
-    topic_types: Optional[ExtensionsTopicTypes] = field(
-        default=None,
-        metadata={
-            "name": "TopicTypes",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    topic_statuses: Optional[ExtensionsTopicStatuses] = field(
-        default=None,
-        metadata={
-            "name": "TopicStatuses",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    priorities: Optional[ExtensionsPriorities] = field(
-        default=None,
-        metadata={
-            "name": "Priorities",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    topic_labels: Optional[ExtensionsTopicLabels] = field(
-        default=None,
-        metadata={
-            "name": "TopicLabels",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    users: Optional[ExtensionsUsers] = field(
-        default=None,
-        metadata={
-            "name": "Users",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    snippet_types: Optional[ExtensionsSnippetTypes] = field(
-        default=None,
-        metadata={
-            "name": "SnippetTypes",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    stages: Optional[ExtensionsStages] = field(
-        default=None,
-        metadata={
-            "name": "Stages",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import List, Optional

 from xsdata.models.datatype import XmlDateTime

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
    reference: str = field(
        metadata={
@@ -41,7 +38,7 @@ class BimSnippet:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
    class Meta:
        global_type = False
@@ -56,7 +53,7 @@ class CommentViewpoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFile:
    class Meta:
        global_type = False
@@ -112,7 +109,7 @@ class HeaderFile:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReference:
    class Meta:
        global_type = False
@@ -150,7 +147,7 @@ class TopicDocumentReference:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopic:
    class Meta:
        global_type = False
@@ -165,7 +162,7 @@ class TopicRelatedTopic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
    viewpoint: Optional[str] = field(
        default=None,
@@ -201,7 +198,7 @@ class ViewPoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
    date: XmlDateTime = field(
        metadata={
@@ -261,9 +258,9 @@ class Comment:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
-    file: list[HeaderFile] = field(
+    file: List[HeaderFile] = field(
        default_factory=list,
        metadata={
            "name": "File",
@@ -274,9 +271,9 @@ class Header:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
-    reference_link: list[str] = field(
+    reference_link: List[str] = field(
        default_factory=list,
        metadata={
            "name": "ReferenceLink",
@@ -308,7 +305,7 @@ class Topic:
            "namespace": "",
        },
    )
-    labels: list[str] = field(
+    labels: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Labels",
@@ -388,7 +385,7 @@ class Topic:
            "namespace": "",
        },
    )
-    document_reference: list[TopicDocumentReference] = field(
+    document_reference: List[TopicDocumentReference] = field(
        default_factory=list,
        metadata={
            "name": "DocumentReference",
@@ -396,7 +393,7 @@ class Topic:
            "namespace": "",
        },
    )
-    related_topic: list[TopicRelatedTopic] = field(
+    related_topic: List[TopicRelatedTopic] = field(
        default_factory=list,
        metadata={
            "name": "RelatedTopic",
@@ -428,7 +425,7 @@ class Topic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
    header: Optional[Header] = field(
        default=None,
@@ -446,7 +443,7 @@ class Markup:
            "required": True,
        }
    )
-    comment: list[Comment] = field(
+    comment: List[Comment] = field(
        default_factory=list,
        metadata={
            "name": "Comment",
@@ -454,7 +451,7 @@ class Markup:
            "namespace": "",
        },
    )
-    viewpoints: list[ViewPoint] = field(
+    viewpoints: List[ViewPoint] = field(
        default_factory=list,
        metadata={
            "name": "Viewpoints",
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
    name: Optional[str] = field(
        default=None,
@@ -24,7 +21,7 @@ class Project:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectExtension:
    project: Optional[Project] = field(
        default=None,
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Version:
    detailed_version: Optional[str] = field(
        default=None,
@@ -1,9 +1,6 @@
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


 class BitmapFormat(Enum):
@@ -11,7 +8,7 @@ class BitmapFormat(Enum):
    JPG = "JPG"


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
    originating_system: Optional[str] = field(
        default=None,
@@ -38,7 +35,7 @@ class Component:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
    x: float = field(
        metadata={
@@ -63,7 +60,7 @@ class Direction:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
    x: float = field(
        metadata={
@@ -88,7 +85,7 @@ class Point:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
    spaces_visible: Optional[bool] = field(
        default=None,
@@ -113,7 +110,7 @@ class ViewSetupHints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
    location: Point = field(
        metadata={
@@ -131,12 +128,12 @@ class ClippingPlane:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -154,9 +151,9 @@ class ComponentColoringColor:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -166,12 +163,12 @@ class ComponentSelection:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -181,7 +178,7 @@ class ComponentVisibilityExceptions:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
    start_point: Point = field(
        metadata={
@@ -199,7 +196,7 @@ class Line:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
    """
    Attributes
@@ -239,7 +236,7 @@ class OrthogonalCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
    """
    Attributes
@@ -284,7 +281,7 @@ class PerspectiveCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmap:
    class Meta:
        global_type = False
@@ -333,9 +330,9 @@ class VisualizationInfoBitmap:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
-    color: list[ComponentColoringColor] = field(
+    color: List[ComponentColoringColor] = field(
        default_factory=list,
        metadata={
            "name": "Color",
@@ -345,7 +342,7 @@ class ComponentColoring:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
    exceptions: Optional[ComponentVisibilityExceptions] = field(
        default=None,
@@ -363,12 +360,12 @@ class ComponentVisibility:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
    class Meta:
        global_type = False

-    clipping_plane: list[ClippingPlane] = field(
+    clipping_plane: List[ClippingPlane] = field(
        default_factory=list,
        metadata={
            "name": "ClippingPlane",
@@ -377,12 +374,12 @@ class VisualizationInfoClippingPlanes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
    class Meta:
        global_type = False

-    line: list[Line] = field(
+    line: List[Line] = field(
        default_factory=list,
        metadata={
            "name": "Line",
@@ -392,7 +389,7 @@ class VisualizationInfoLines:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
    view_setup_hints: Optional[ViewSetupHints] = field(
        default=None,
@@ -424,7 +421,7 @@ class Components:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
    """
    VisualizationInfo documentation.
@@ -465,7 +462,7 @@ class VisualizationInfo:
            "type": "Element",
        },
    )
-    bitmap: list[VisualizationInfoBitmap] = field(
+    bitmap: List[VisualizationInfoBitmap] = field(
        default_factory=list,
        metadata={
            "name": "Bitmap",
@@ -1,12 +1,11 @@
 """BCF XML V2 Topic handler."""

-from __future__ import annotations
 import datetime
 import tempfile
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional, Union
+from typing import Any, NoReturn, Optional

 import numpy as np
 from ifcopenshell import entity_instance
@@ -28,9 +27,9 @@ class TopicHandler:
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
    ) -> None:
        self._markup: Optional[mdl.Markup] = None
-        self._viewpoints: Optional[dict[str, VisualizationInfoHandler]] = None
-        self._reference_files: Optional[dict[str, bytes]] = None
-        self._document_references: Optional[dict[str, bytes]] = None
+        self._viewpoints: dict[str, VisualizationInfoHandler] = {}
+        self._reference_files: dict[str, bytes] = {}
+        self._document_references: dict[str, bytes] = {}
        self._bim_snippet: Optional[bytes] = None
        self._xml_handler = xml_handler or XmlParserSerializer()
        self._topic_dir = topic_dir
@@ -64,21 +63,11 @@ class TopicHandler:
        """Return the header of the topic."""
        return self.markup.header if self.markup else None

-    @header.setter
-    def header(self, header: mdl.Header) -> None:
-        """Set the header of the topic."""
-        self.markup.header = header
-
    @property
    def comments(self) -> list[mdl.Comment]:
        """Return the comments of the topic."""
        return self.markup.comment if self.markup else []

-    @comments.setter
-    def comments(self, comments: list[mdl.Comment]) -> None:
-        assert self.markup
-        self.markup.comment = comments
-
    @property
    def bim_snippet(self) -> Optional[bytes]:
        if not self._bim_snippet and self._topic_dir:
@@ -91,24 +80,14 @@ class TopicHandler:

    @property
    def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._viewpoints is None:
+        if not self._viewpoints and self._topic_dir:
            self._viewpoints = self._load_viewpoints()
        return self._viewpoints

-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._topic_dir and self.markup and (viewpoints := self.markup.viewpoints):
-            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
-        return {}
-
    @property
    def reference_files(self) -> dict[str, bytes]:
-        if self._reference_files is not None:
+        if self._reference_files or not self.header:
            return self._reference_files
-
-        self._reference_files = {}
-        if not self.header:
-            return self._reference_files
-
        for ref in self.header.file:
            if ref.is_external:
                continue
@@ -120,13 +99,8 @@ class TopicHandler:

    @property
    def document_references(self) -> dict[str, bytes]:
-        if self._document_references is not None:
+        if self._document_references or not self.topic:
            return self._document_references
-
-        self._document_references = {}
-        if not self.topic:
-            return self._document_references
-
        for doc in self.topic.document_reference:
            if doc.is_external or not doc.referenced_document:
                continue
@@ -144,6 +118,11 @@ class TopicHandler:
                return bim_snippet_path.read_bytes()
        return None

+    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+        if self.markup and (viewpoints := self.markup.viewpoints):
+            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
+        return {}
+
    @classmethod
    def create_new(
        cls,
@@ -153,7 +132,7 @@ class TopicHandler:
        topic_type: str = "",
        topic_status: str = "",
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
        """
        Create a new BCF topic.

@@ -241,7 +220,55 @@ class TopicHandler:
                real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
            destination_zip.writestr(real_path.at, self.document_references[doc.referenced_document])

-    def add_viewpoint(self, element: entity_instance) -> VisualizationInfoHandler:
+    def extract_file(self, entity, outfile: Optional[Path] = None) -> Path:
+        """Extracts an element with a file into a temporary directory
+
+        These include header files, bim snippets, document references, and
+        viewpoint bitmaps. External reference are not downloaded. Instead, the
+        URI reference is returned.
+
+        :param entity: The entity with a file reference to extract
+        :type entity: bcf.v2.model.HeaderFile,bcf.v2.model.BimSnippet,bcf.v2.model.TopicDocumentReference
+        :param outfile: If provided, save the header file to that location.
+            Otherwise, a temporary directory is created and the filename is
+            derived from the header's original filename.
+        :type outfile: pathlib.Path,optional
+        :return: The filepath of the extracted file. It may be a URL if the
+            header file is external.
+        :rtype: Path
+        """
+        if hasattr(entity, "reference"):
+            reference = entity.reference
+        else:
+            reference = entity.referenced_document
+
+        if not reference:
+            return
+
+        if getattr(entity, "is_external", False):
+            return entity.reference
+
+        resolved_reference = self._topic_dir
+
+        for part in Path(reference).parts:
+            if part == "..":
+                resolved_reference = resolved_reference.parent
+            else:
+                resolved_reference = resolved_reference.joinpath(part)
+
+        if not outfile:
+            if getattr(entity, "filename", None):
+                filename = entity.filename
+            else:
+                filename = resolved_reference.name
+            outfile = Path(tempfile.mkdtemp()) / filename
+
+        with open(outfile, "wb") as f:
+            f.write(resolved_reference.read_bytes())
+
+        return outfile
+
+    def add_viewpoint(self, element: entity_instance) -> None:
        """Add a viewpoint pointed at the placement of an IFC element to the topic.

        Args:
@@ -251,9 +278,7 @@ class TopicHandler:
        self.add_visinfo_handler(new_viewpoint)
        return new_viewpoint

-    def add_viewpoint_from_point_and_guids(
-        self, position: NDArray[np.float64], *guids: str
-    ) -> VisualizationInfoHandler:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None:
        """Add a viewpoint pointing at an XYZ point in space

        Args:
@@ -266,17 +291,9 @@ class TopicHandler:
        self.add_visinfo_handler(vi_handler)
        return vi_handler

-    def add_visinfo_handler(
-        self, new_viewpoint: VisualizationInfoHandler, snapshot_filename: Optional[str] = None
-    ) -> mdl.ViewPoint:
+    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
        self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
-        viewpoint = mdl.ViewPoint(
-            viewpoint=new_viewpoint.guid + ".bcfv",
-            snapshot=snapshot_filename,
-            guid=new_viewpoint.guid,
-        )
-        self.markup.viewpoints.append(viewpoint)
-        return viewpoint
+        self.markup.viewpoints.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid))

    def __eq__(self, other: object) -> bool | NoReturn:
        return (
@@ -1,7 +1,7 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from functools import lru_cache
+from typing import Any, Iterable, Optional

 import numpy as np
 from ifcopenshell import entity_instance
@@ -134,15 +134,6 @@ class VisualizationInfoHandler:
        self._save_bitmaps(bcf_zip, topic_dir)

    def _save_snapshot(self, bcf_zip: ZipFileInterface, topic_dir: str, filename: Optional[str]) -> None:
-        if bool(self.snapshot) ^ bool(filename):
-            data = ["data (VisualizationInfoHandler.snapshot)", "filename (ViewPoint.snapshot)"]
-            provided_data, missing_data = data if self.snapshot else data[::-1]
-            print(
-                f"WARNING. Snapshot with viewpoint guid '{self.guid}' won't be saved to bcf. "
-                f"Only snapshot {provided_data} is provided but snapshot {missing_data} is missing."
-            )
-            return
-
        if self.snapshot and filename:
            bcf_zip.writestr(f"{topic_dir}/{filename}", self.snapshot)

@@ -205,110 +196,13 @@ class VisualizationInfoHandler:
            visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
        )

-    def get_selected_guids(self) -> Union[list[str], None]:
-        """
-        Return viewpoint selected elements IFC guids.
-
-        Returns:
-            If viewpoint has no selection settings, return `None`.
-            Otherwise return a list of selected elements IFC guids.
-        """
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        selection = components.selection
-        if not selection:
-            return None
-        return [guid for c in selection.component if (guid := c.ifc_guid)]
-
-    def set_selected_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        visualization_info = self.visualization_info
-
-        guids = [e.GlobalId for e in elements]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=True)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        selection = components.selection
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        if not selection:
-            selection = mdl.ComponentSelection()
-            components.selection = selection
-        selection.component = components_list
-
-    def set_visible_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="VISIBLE")
-
-    def set_hidden_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="HIDDEN")
-
-    def set_visibility(
-        self, elements: list[ifcopenshell.entity_instance], elements_visibility: Literal["VISIBLE", "HIDDEN"]
-    ) -> None:
-        visualization_info = self.visualization_info
-        default_visibility = elements_visibility == "HIDDEN"
-
-        guids = [e.GlobalId for e in elements]
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        visibility = components.visibility
-        if not visibility:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components.visibility = visibility
-        elif visibility.default_visibility != default_visibility:
-            visibility.default_visibility = default_visibility
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            exceptions = mdl.ComponentVisibilityExceptions()
-            visibility.exceptions = exceptions
-        exceptions.component = components_list
-
-    def get_elements_visibility(self) -> Union[tuple[bool, list[str]], None]:
-        """
-        Return viewpoint elements visibility settings.
-
-        Returns:
-            If viewpoint has no visibility settings, return `None`.
-            Otherwise return a tuple containing the default visibility
-            and a list of IFC element GUIDs listed as exceptions.
-
-            If default visibility is `True`, all elements are visible except the exceptions.
-
-            If default visibility is `False`, all elements are hidden except the exceptions.
-        """
-
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        visibility = components.visibility
-        if not visibility:
-            return None
-        default_visibility = visibility.default_visibility or False
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            return default_visibility, []
-        guids = [guid for c in exceptions.component if (guid := c.ifc_guid)]
-        return default_visibility, guids
-

+@lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    """
    Return a BCF viewpoint of an IFC element.

-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.

    Args:
        element: The IFC element to point at.
@@ -334,7 +228,7 @@ def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guid
    """
    Return a BCF viewpoint of an IFC element.

-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.

    Args:
        position: target point coordinates.
@@ -355,7 +249,7 @@ def build_components(*guids: str) -> mdl.Components:
    Return the BCF components from an IFC element GUID.

    Args:
-        *guids: One or more selected IFC element GUID.
+        *guids: One or more IFC element GUID.

    Returns:
        The BCF components definition.
@@ -21,11 +21,11 @@ import http.server
 import os
 import tempfile
 import time
-import urllib.parse
+import urllib
 import uuid
 import webbrowser
 from re import A
-from typing import Any, Optional
+from typing import Any, Optional, Tuple

 import requests

@@ -40,7 +40,7 @@ class OAuthReceiver(http.server.BaseHTTPRequestHandler):
        self.send_response(200)
        self.send_header("Content-type", "text/plain")
        self.end_headers()
-        self.wfile.write(b"You have now authenticated :) You may now close this browser window.")
+        self.wfile.write("You have now authenticated :) You may now close this browser window.".encode("utf-8"))


 class FoundationClient:
@@ -174,7 +174,7 @@ class BcfClient:
        except requests.exceptions.HTTPError as e:
            print(f"message: {response.reason}'   '{response.status_code}'   '{ e }")

-    def post(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
+    def post(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -192,7 +192,7 @@ class BcfClient:
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

-    def put(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
+    def put(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -210,7 +210,7 @@ class BcfClient:
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

-    def delete(self, endpoint: str, params: Any = None) -> tuple[int, str]:
+    def delete(self, endpoint: str, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -237,7 +237,7 @@ class BcfClient:
            },
        )

-    def update_project(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
+    def update_project(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
        url = f"{self.baseurl}/projects/{project_id}"
        headers = {"Authorization": f"Bearer {self.foundation_client.get_access_token()}"}
        resp = requests.put(url, headers=headers, data=data)
@@ -276,16 +276,16 @@ class BcfClient:
            },
        )

-    def create_topic(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
+    def create_topic(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.post(f"/projects/{project_id}/topics", data=data)

-    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
+    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.put(f"/projects/{project_id}/topics/{topic_id}", data=data)

-    def delete_topic(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
+    def delete_topic(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
        return self.delete(f"/projects/{project_id}/topics/{topic_id}")

-    def get_snippet(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
+    def get_snippet(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/octet-stream",
@@ -332,7 +332,7 @@ class BcfClient:
        topic_id: str = "",
        data: Any = None,
        params: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/files",
            data=data,
@@ -347,7 +347,7 @@ class BcfClient:
        topic_id: str = "",
        data: Any = None,
        params: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/comments",
            data=data,
@@ -363,7 +363,7 @@ class BcfClient:
            },
        )

-    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> tuple[int, str]:
+    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> Tuple[int, str]:
        return self.delete(f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}")

    def update_comment(
@@ -372,7 +372,7 @@ class BcfClient:
        topic_id: str = "",
        comment_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}",
            data=data,
@@ -387,7 +387,7 @@ class BcfClient:
            },
        )

-    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
+    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/viewpoints",
            data=data,
@@ -408,7 +408,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        viewpoint_id: str = "",
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.delete(
            f"/projects/{project_id}/topics/{topic_id}/viewpoints/{viewpoint_id}",
        )
@@ -478,7 +478,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/related_topics",
            data=data,
@@ -498,7 +498,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/document_references",
            data=data,
@@ -510,7 +510,7 @@ class BcfClient:
        topic_id: str = "",
        document_reference_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/document_references/{document_reference_id}",
            data=data,
@@ -543,7 +543,7 @@ class BcfClient:

        return response.status_code

-    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> tuple[int, str]:
+    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/octet-stream",
@@ -1,6 +1,5 @@
 """BCF XML V3 handlers."""

-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -27,11 +26,11 @@ class BcfXml:
        self._version: Optional[mdl.Version] = None
        self._project_info: Optional[mdl.ProjectInfo] = None
        self._extensions: Optional[mdl.Extensions] = None
-        self._topics: Optional[dict[str, TopicHandler]] = None
+        self._topics: dict[str, TopicHandler] = {}
        self._documents: Optional[DocumentsHandler] = None
        self._zip_file = self._load_zip_file()

-    def __enter__(self) -> BcfXml:
+    def __enter__(self) -> "BcfXml":
        return self

    def __exit__(self, *args: Any) -> None:
@@ -92,22 +91,18 @@ class BcfXml:
    @property
    def topics(self) -> dict[str, TopicHandler]:
        """BCF topics."""
-        if self._topics is None:
-            self._topics = self._load_topics()
+        if not self._topics and self._zip_file:
+            self._load_topics()
        return self._topics

-    def _load_topics(self) -> dict[str, TopicHandler]:
-        topics = {}
-        if self._zip_file is None:
-            return topics
+    def _load_topics(self) -> None:
        for topic_dir in zipfile.Path(self._zip_file).iterdir():
            if not topic_dir.is_dir():
                continue
            markup_path = topic_dir.joinpath("markup.bcf")
            if not markup_path.exists():
                continue
-            topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
-        return topics
+            self._topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)

    @property
    def documents(self) -> Optional[DocumentsHandler]:
@@ -117,7 +112,7 @@ class BcfXml:
        return self._documents

    @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
        """
        Create a BcfXml object from a file.

@@ -142,7 +137,7 @@ class BcfXml:
        project_name: Optional[str] = None,
        extensions: Optional[mdl.Extensions] = None,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
        """
        Create a new BcfXml object.

@@ -240,7 +235,7 @@ class BcfXml:
        )

    # region Deprecated methods
-    def new_project(self) -> BcfXml:
+    def new_project(self) -> "BcfXml":
        """Deprecated method."""
        warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
        return self.create_new()
@@ -55,12 +55,40 @@ from bcf.v3.model.visinfo import (
 )

 __all__ = [
+    "Document",
+    "DocumentInfo",
+    "DocumentInfoDocuments",
+    "Extensions",
+    "ExtensionsPriorities",
+    "ExtensionsSnippetTypes",
+    "ExtensionsStages",
+    "ExtensionsTopicLabels",
+    "ExtensionsTopicStatuses",
+    "ExtensionsTopicTypes",
+    "ExtensionsUsers",
    "BimSnippet",
+    "Comment",
+    "CommentViewpoint",
+    "DocumentReference",
+    "File",
+    "Header",
+    "HeaderFiles",
+    "Markup",
+    "Topic",
+    "TopicComments",
+    "TopicDocumentReferences",
+    "TopicLabels",
+    "TopicReferenceLinks",
+    "TopicRelatedTopics",
+    "TopicRelatedTopicsRelatedTopic",
+    "TopicViewpoints",
+    "ViewPoint",
+    "Project",
+    "ProjectInfo",
+    "Version",
    "Bitmap",
    "BitmapFormat",
    "ClippingPlane",
-    "Comment",
-    "CommentViewpoint",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -70,38 +98,10 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
-    "Document",
-    "DocumentInfo",
-    "DocumentInfoDocuments",
-    "DocumentReference",
-    "Extensions",
-    "ExtensionsPriorities",
-    "ExtensionsSnippetTypes",
-    "ExtensionsStages",
-    "ExtensionsTopicLabels",
-    "ExtensionsTopicStatuses",
-    "ExtensionsTopicTypes",
-    "ExtensionsUsers",
-    "File",
-    "Header",
-    "HeaderFiles",
    "Line",
-    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
-    "Project",
-    "ProjectInfo",
-    "Topic",
-    "TopicComments",
-    "TopicDocumentReferences",
-    "TopicLabels",
-    "TopicReferenceLinks",
-    "TopicRelatedTopics",
-    "TopicRelatedTopicsRelatedTopic",
-    "TopicViewpoints",
-    "Version",
-    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmaps",
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Document:
    filename: str = field(
        metadata={
@@ -37,12 +34,12 @@ class Document:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfoDocuments:
    class Meta:
        global_type = False

-    document: list[Document] = field(
+    document: List[Document] = field(
        default_factory=list,
        metadata={
            "name": "Document",
@@ -52,7 +49,7 @@ class DocumentInfoDocuments:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfo:
    documents: Optional[DocumentInfoDocuments] = field(
        default=None,
@@ -1,16 +1,13 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsPriorities:
    class Meta:
        global_type = False

-    priority: list[str] = field(
+    priority: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Priority",
@@ -22,12 +19,12 @@ class ExtensionsPriorities:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsSnippetTypes:
    class Meta:
        global_type = False

-    snippet_type: list[str] = field(
+    snippet_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "SnippetType",
@@ -39,12 +36,12 @@ class ExtensionsSnippetTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsStages:
    class Meta:
        global_type = False

-    stage: list[str] = field(
+    stage: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Stage",
@@ -56,12 +53,12 @@ class ExtensionsStages:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicLabels:
    class Meta:
        global_type = False

-    topic_label: list[str] = field(
+    topic_label: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicLabel",
@@ -73,12 +70,12 @@ class ExtensionsTopicLabels:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicStatuses:
    class Meta:
        global_type = False

-    topic_status: list[str] = field(
+    topic_status: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicStatus",
@@ -90,12 +87,12 @@ class ExtensionsTopicStatuses:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicTypes:
    class Meta:
        global_type = False

-    topic_type: list[str] = field(
+    topic_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicType",
@@ -107,12 +104,12 @@ class ExtensionsTopicTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsUsers:
    class Meta:
        global_type = False

-    user: list[str] = field(
+    user: List[str] = field(
        default_factory=list,
        metadata={
            "name": "User",
@@ -124,7 +121,7 @@ class ExtensionsUsers:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Extensions:
    topic_types: Optional[ExtensionsTopicTypes] = field(
        default=None,
@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import List, Optional

 from xsdata.models.datatype import XmlDateTime

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
    reference: str = field(
        metadata={
@@ -47,7 +44,7 @@ class BimSnippet:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
    class Meta:
        global_type = False
@@ -62,7 +59,7 @@ class CommentViewpoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentReference:
    document_guid: Optional[str] = field(
        default=None,
@@ -103,7 +100,7 @@ class DocumentReference:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class File:
    filename: Optional[str] = field(
        default=None,
@@ -160,12 +157,12 @@ class File:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicLabels:
    class Meta:
        global_type = False

-    label: list[str] = field(
+    label: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Label",
@@ -177,12 +174,12 @@ class TopicLabels:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicReferenceLinks:
    class Meta:
        global_type = False

-    reference_link: list[str] = field(
+    reference_link: List[str] = field(
        default_factory=list,
        metadata={
            "name": "ReferenceLink",
@@ -194,7 +191,7 @@ class TopicReferenceLinks:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopicsRelatedTopic:
    class Meta:
        global_type = False
@@ -209,7 +206,7 @@ class TopicRelatedTopicsRelatedTopic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
    viewpoint: Optional[str] = field(
        default=None,
@@ -249,7 +246,7 @@ class ViewPoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
    date: XmlDateTime = field(
        metadata={
@@ -315,12 +312,12 @@ class Comment:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFiles:
    class Meta:
        global_type = False

-    file: list[File] = field(
+    file: List[File] = field(
        default_factory=list,
        metadata={
            "name": "File",
@@ -330,12 +327,12 @@ class HeaderFiles:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReferences:
    class Meta:
        global_type = False

-    document_reference: list[DocumentReference] = field(
+    document_reference: List[DocumentReference] = field(
        default_factory=list,
        metadata={
            "name": "DocumentReference",
@@ -345,12 +342,12 @@ class TopicDocumentReferences:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopics:
    class Meta:
        global_type = False

-    related_topic: list[TopicRelatedTopicsRelatedTopic] = field(
+    related_topic: List[TopicRelatedTopicsRelatedTopic] = field(
        default_factory=list,
        metadata={
            "name": "RelatedTopic",
@@ -360,12 +357,12 @@ class TopicRelatedTopics:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicViewpoints:
    class Meta:
        global_type = False

-    view_point: list[ViewPoint] = field(
+    view_point: List[ViewPoint] = field(
        default_factory=list,
        metadata={
            "name": "ViewPoint",
@@ -375,7 +372,7 @@ class TopicViewpoints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
    files: Optional[HeaderFiles] = field(
        default=None,
@@ -387,12 +384,12 @@ class Header:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicComments:
    class Meta:
        global_type = False

-    comment: list[Comment] = field(
+    comment: List[Comment] = field(
        default_factory=list,
        metadata={
            "name": "Comment",
@@ -402,7 +399,7 @@ class TopicComments:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
    reference_links: Optional[TopicReferenceLinks] = field(
        default=None,
@@ -599,7 +596,7 @@ class Topic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
    header: Optional[Header] = field(
        default=None,
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
    name: Optional[str] = field(
        default=None,
@@ -28,7 +25,7 @@ class Project:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectInfo:
    project: Project = field(
        metadata={
@@ -1,10 +1,7 @@
-import sys
 from dataclasses import dataclass, field

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Version:
    version_id: str = field(
        metadata={
@@ -1,10 +1,6 @@
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Optional
-
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


 class BitmapFormat(Enum):
@@ -12,7 +8,7 @@ class BitmapFormat(Enum):
    JPG = "jpg"


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
    originating_system: Optional[str] = field(
        default=None,
@@ -43,7 +39,7 @@ class Component:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
    x: float = field(
        metadata={
@@ -68,7 +64,7 @@ class Direction:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
    x: float = field(
        metadata={
@@ -93,7 +89,7 @@ class Point:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
    spaces_visible: bool = field(
        default=False,
@@ -118,7 +114,7 @@ class ViewSetupHints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Bitmap:
    format: BitmapFormat = field(
        metadata={
@@ -166,7 +162,7 @@ class Bitmap:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
    location: Point = field(
        metadata={
@@ -184,12 +180,12 @@ class ClippingPlane:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColorComponents:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -199,9 +195,9 @@ class ComponentColoringColorComponents:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -210,12 +206,12 @@ class ComponentSelection:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -224,7 +220,7 @@ class ComponentVisibilityExceptions:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
    start_point: Point = field(
        metadata={
@@ -242,7 +238,7 @@ class Line:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
    """
    Attributes
@@ -292,7 +288,7 @@ class OrthogonalCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
    """
    Attributes
@@ -348,7 +344,7 @@ class PerspectiveCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
    class Meta:
        global_type = False
@@ -370,7 +366,7 @@ class ComponentColoringColor:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
    view_setup_hints: Optional[ViewSetupHints] = field(
        default=None,
@@ -395,12 +391,12 @@ class ComponentVisibility:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmaps:
    class Meta:
        global_type = False

-    bitmap: list[Bitmap] = field(
+    bitmap: List[Bitmap] = field(
        default_factory=list,
        metadata={
            "name": "Bitmap",
@@ -409,12 +405,12 @@ class VisualizationInfoBitmaps:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
    class Meta:
        global_type = False

-    clipping_plane: list[ClippingPlane] = field(
+    clipping_plane: List[ClippingPlane] = field(
        default_factory=list,
        metadata={
            "name": "ClippingPlane",
@@ -423,12 +419,12 @@ class VisualizationInfoClippingPlanes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
    class Meta:
        global_type = False

-    line: list[Line] = field(
+    line: List[Line] = field(
        default_factory=list,
        metadata={
            "name": "Line",
@@ -437,9 +433,9 @@ class VisualizationInfoLines:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
-    color: list[ComponentColoringColor] = field(
+    color: List[ComponentColoringColor] = field(
        default_factory=list,
        metadata={
            "name": "Color",
@@ -448,7 +444,7 @@ class ComponentColoring:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
    selection: Optional[ComponentSelection] = field(
        default=None,
@@ -473,7 +469,7 @@ class Components:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
    """
    VisualizationInfo documentation.
@@ -1,6 +1,5 @@
 """BCF XML V3 Topic handler."""

-from __future__ import annotations
 import datetime
 import uuid
 import zipfile
@@ -27,8 +26,7 @@ class TopicHandler:
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
    ) -> None:
        self._markup: Optional[mdl.Markup] = None
-        self._viewpoints: Optional[dict[str, VisualizationInfoHandler]] = None
-        self._reference_files: Optional[dict[str, bytes]] = None
+        self._viewpoints: dict[str, VisualizationInfoHandler] = {}
        self._bim_snippet: Optional[bytes] = None
        self._xml_handler = xml_handler or XmlParserSerializer()
        self._topic_dir = topic_dir
@@ -51,36 +49,22 @@ class TopicHandler:
        return self.markup.topic

    @property
-    def guid(self) -> str:
+    def guid(self) -> Optional[str]:
        """Return the GUID of the topic."""
        if self._markup:
            return self.topic.guid
-        return self._topic_dir.name if self._topic_dir else ""
+        return self._topic_dir.name if self._topic_dir else None

    @property
    def header(self) -> Optional[mdl.Header]:
        """Return the header of the topic."""
        return self.markup.header

-    @header.setter
-    def header(self, header: mdl.Header) -> None:
-        """Set the header of the topic."""
-        self.markup.header = header
-
    @property
    def comments(self) -> list[mdl.Comment]:
        """Return the comments of the topic."""
        return self.topic.comments.comment if self.topic.comments else []

-    @comments.setter
-    def comments(self, comments: list[mdl.Comment]) -> None:
-        topic_comments = self.topic.comments
-        if topic_comments is None:
-            if not comments:
-                return
-            self.topic.comments = (topic_comments := mdl.TopicComments())
-        topic_comments.comment = comments
-
    @property
    def bim_snippet(self) -> Optional[bytes]:
        if not self._bim_snippet and self._topic_dir:
@@ -92,16 +76,16 @@ class TopicHandler:
        self._bim_snippet = value

    @property
-    def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._viewpoints is None:
-            self._viewpoints = self._load_viewpoints()
+    def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
+        if (
+            not self._viewpoints
+            and self._topic_dir
+            and self.topic.viewpoints
+            and (viewpoints := self.topic.viewpoints.view_point)
+        ):
+            self._viewpoints = VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
        return self._viewpoints

-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._topic_dir and self.topic.viewpoints and (viewpoints := self.topic.viewpoints.view_point):
-            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
-        return {}
-
    def _load_bim_snippet(self) -> Optional[bytes]:
        bim_snippet_obj = self.topic.bim_snippet
        if bim_snippet_obj and not bim_snippet_obj.is_external and self._topic_dir:
@@ -110,27 +94,6 @@ class TopicHandler:
                return bim_snippet_path.read_bytes()
        return None

-    @property
-    def reference_files(self) -> dict[str, bytes]:
-        if self._reference_files is not None:
-            return self._reference_files
-
-        self._reference_files = {}
-        if not self.header:
-            return self._reference_files
-
-        if not self.header.files:
-            return self._reference_files
-
-        for ref in self.header.files.file:
-            if ref.is_external:
-                continue
-            real_path = self._topic_dir
-            for path_part in ref.reference.split("/"):
-                real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
-            self._reference_files[ref.reference] = real_path.read_bytes()
-        return self._reference_files
-
    @classmethod
    def create_new(
        cls,
@@ -140,7 +103,7 @@ class TopicHandler:
        topic_type: str = "",
        topic_status: str = "",
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
        """
        Create a new BCF topic.

@@ -182,7 +145,6 @@ class TopicHandler:
        self._save_xml(destination_zip, self._markup, "markup.bcf")
        self._save_viewpoints(destination_zip, topic_dir)
        self._save_bim_snippet(destination_zip)
-        self._save_reference_files(destination_zip)

    def _save_viewpoints(self, destination_zip: ZipFileInterface, topic_dir: str) -> None:
        if not self.topic.viewpoints or not (viewpoints := self.topic.viewpoints.view_point):
@@ -203,20 +165,7 @@ class TopicHandler:
        if self.bim_snippet:
            destination_zip.writestr(f"{self.topic.guid}/{ref_filename}", self.bim_snippet)

-    def _save_reference_files(self, destination_zip: ZipFileInterface) -> None:
-        if not self.header:
-            return
-        if not self.header.files:
-            return
-        for ref in self.header.files.file:
-            if ref.is_external or not ref.reference:
-                continue
-            real_path = self._topic_dir
-            for path_part in ref.reference.split("/"):
-                real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
-            destination_zip.writestr(real_path.at, self.reference_files[ref.reference])
-
-    def add_viewpoint(self, element: entity_instance) -> VisualizationInfoHandler:
+    def add_viewpoint(self, element: entity_instance) -> None:
        """
        Add a viewpoint tergeting an IFC element to the topic.

@@ -225,11 +174,8 @@ class TopicHandler:
        """
        new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
        self.add_visinfo_handler(new_viewpoint)
-        return new_viewpoint

-    def add_viewpoint_from_point_and_guids(
-        self, position: NDArray[np.float64], *guids: str
-    ) -> VisualizationInfoHandler:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None:
        """
        Add a viewpoint tergeting an IFC element to the topic.

@@ -240,21 +186,14 @@ class TopicHandler:
            position, *guids, xml_handler=self._xml_handler
        )
        self.add_visinfo_handler(vi_handler)
-        return vi_handler

-    def add_visinfo_handler(
-        self, new_viewpoint: VisualizationInfoHandler, snapshot_filename: Optional[str] = None
-    ) -> mdl.ViewPoint:
+    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
        self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
        if self.topic.viewpoints is None:
            self.topic.viewpoints = mdl.TopicViewpoints()
-        viewpoint = mdl.ViewPoint(
-            viewpoint=new_viewpoint.guid + ".bcfv",
-            snapshot=snapshot_filename,
-            guid=new_viewpoint.guid,
+        self.topic.viewpoints.view_point.append(
+            mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid)
        )
-        self.topic.viewpoints.view_point.append(viewpoint)
-        return viewpoint

    def __eq__(self, other: object) -> bool | NoReturn:
        return (
@@ -1,12 +1,11 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from functools import lru_cache
+from typing import Any, Iterable, Optional

 import numpy as np
 from ifcopenshell import entity_instance
-import ifcopenshell.util.unit
-import ifcopenshell.util.placement
+from ifcopenshell.util import placement
 from numpy.typing import NDArray

 import bcf.v3.model as mdl
@@ -134,15 +133,6 @@ class VisualizationInfoHandler:
        self._save_bitmaps(bcf_zip, topic_dir)

    def _save_snapshot(self, bcf_zip: ZipFileInterface, topic_dir: str, filename: Optional[str]) -> None:
-        if bool(self.snapshot) ^ bool(filename):
-            data = ["data (VisualizationInfoHandler.snapshot)", "filename (ViewPoint.snapshot)"]
-            provided_data, missing_data = data if self.snapshot else data[::-1]
-            print(
-                f"WARNING. Snapshot with viewpoint guid '{self.guid}' won't be saved to bcf. "
-                f"Only snapshot {provided_data} is provided but snapshot {missing_data} is missing."
-            )
-            return
-
        if self.snapshot and filename:
            bcf_zip.writestr(f"{topic_dir}/{filename}", self.snapshot)

@@ -205,110 +195,13 @@ class VisualizationInfoHandler:
            visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
        )

-    def get_selected_guids(self) -> Union[list[str], None]:
-        """
-        Return viewpoint selected elements IFC guids.
-
-        Returns:
-            If viewpoint has no selection settings, return `None`.
-            Otherwise return a list of selected elements IFC guids.
-        """
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        selection = components.selection
-        if not selection:
-            return None
-        return [guid for c in selection.component if (guid := c.ifc_guid)]
-
-    def set_selected_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        visualization_info = self.visualization_info
-
-        guids = [e.GlobalId for e in elements]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=True)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        selection = components.selection
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        if not selection:
-            selection = mdl.ComponentSelection()
-            components.selection = selection
-        selection.component = components_list
-
-    def set_visible_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="VISIBLE")
-
-    def set_hidden_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="HIDDEN")
-
-    def set_visibility(
-        self, elements: list[ifcopenshell.entity_instance], elements_visibility: Literal["VISIBLE", "HIDDEN"]
-    ) -> None:
-        visualization_info = self.visualization_info
-        default_visibility = elements_visibility == "HIDDEN"
-
-        guids = [e.GlobalId for e in elements]
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        visibility = components.visibility
-        if not visibility:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components.visibility = visibility
-        elif visibility.default_visibility != default_visibility:
-            visibility.default_visibility = default_visibility
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            exceptions = mdl.ComponentVisibilityExceptions()
-            visibility.exceptions = exceptions
-        exceptions.component = components_list
-
-    def get_elements_visibility(self) -> Union[tuple[bool, list[str]], None]:
-        """
-        Return viewpoint elements visibility settings.
-
-        Returns:
-            If viewpoint has no visibility settings, return `None`.
-            Otherwise return a tuple containing the default visibility
-            and a list of IFC element GUIDs listed as exceptions.
-
-            If default visibility is `True`, all elements are visible except the exceptions.
-
-            If default visibility is `False`, all elements are hidden except the exceptions.
-        """
-
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        visibility = components.visibility
-        if not visibility:
-            return None
-        default_visibility = visibility.default_visibility or False
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            return default_visibility, []
-        guids = [guid for c in exceptions.component if (guid := c.ifc_guid)]
-        return default_visibility, guids
-

+@lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    """
    Return a BCF viewpoint of an IFC element.

-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.

    Args:
        element: The IFC element to point at.
@@ -316,12 +209,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    Returns:
        The BCF viewpoint definition.
    """
-    ifc_file = element.wrapped_data.file
-    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
-    elem_placement = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-    elem_placement[0][3] *= unit_scale
-    elem_placement[1][3] *= unit_scale
-    elem_placement[2][3] *= unit_scale
+    elem_placement = placement.get_local_placement(element.ObjectPlacement)

    return mdl.VisualizationInfo(
        guid=str(uuid.uuid4()),
@@ -334,7 +222,7 @@ def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guid
    """
    Return a BCF viewpoint of an IFC element.

-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.

    Args:
        position: target point coordinates.
@@ -355,7 +243,7 @@ def build_components(*guids: str) -> mdl.Components:
    Return the BCF components from an IFC element GUID.

    Args:
-        *guids: One or more selected IFC element GUID.
+        *guids: One or more IFC element GUID.

    Returns:
        The BCF components definition.
@@ -1,6 +1,6 @@
 """XML Parser and Serializer factories."""

-from typing import Optional, Protocol, TypeVar
+from typing import Optional, Protocol, Type, TypeVar

 from xsdata.formats.dataclass.context import XmlContext
 from xsdata.formats.dataclass.parsers import XmlParser
@@ -29,7 +29,7 @@ T = TypeVar("T")
 class AbstractXmlParserSerializer(Protocol):
    """XML Parser and serializer wrapper."""

-    def parse(self, xml: bytes, clazz: type[T]) -> T:
+    def parse(self, xml: bytes, clazz: Type[T]) -> T:
        """
        Parse an XML file to an object.

@@ -61,7 +61,7 @@ class XmlParserSerializer:
        self.parser = build_xml_parser(self.context)
        self.serializer = build_serializer(self.context)

-    def parse(self, xml: bytes, clazz: type[T]) -> T:
+    def parse(self, xml: bytes, clazz: Type[T]) -> T:
        """
        Parse an XML file to an object.

@@ -16,7 +16,6 @@ dependencies = [
    "xsdata>=24.4",
    "numpy",
    "ifcopenshell",
-    "requests",
 ]
 version = "0.0.0"
 classifiers = [
@@ -55,32 +55,9 @@ def test_save_maximum_information() -> None:

 def assert_everything_in_place(bcf: BcfXml):
    assert bcf.version.version_id == "2.1"
-    assert bcf.project
    assert bcf.project.name == "BCF API Implementation"
-    assert bcf.project_info
    assert bcf.project_info.extension_schema == "extensions.xsd"

-    assert bcf.extensions
-    assert bcf.extensions.topic_types
-    assert bcf.extensions.topic_types.topic_type == ["Architecture", "Hidden Type", "Structural"]
-    assert bcf.extensions.topic_statuses
-    assert bcf.extensions.topic_statuses.topic_status == ["Finished status", "Open", "Closed"]
-    assert bcf.extensions.priorities
-    assert bcf.extensions.priorities.priority == ["Low", "High", "Medium"]
-    assert bcf.extensions.topic_labels
-    assert bcf.extensions.topic_labels.topic_label == [
-        "Architecture",
-        "IT Development",
-        "Management",
-        "Mechanical",
-        "Structural",
-    ]
-    assert bcf.extensions.users
-    assert bcf.extensions.users.user == ["dangl@iabi.eu", "linhard@iabi.eu"]
-    assert bcf.extensions.snippet_types
-    assert bcf.extensions.snippet_types.snippet_type == ["IFC2X3", "PDF", "XLSX"]
-    assert bcf.extensions.stages is None
-
    assert len(bcf.topics) == 2
    assert_first_topic_handler(bcf.topics["7ddc3ef0-0ab7-43f1-918a-45e38b42369c"])
    second_th = bcf.topics["d1068c81-af04-4546-b63c-348810f6c716"]
@@ -39,22 +39,6 @@ def assert_everything_in_place(bcf: BcfXml):
    assert bcf.project.name == "BCF 3.0 test cases"
    assert bcf.project.project_id == "de894a86-3a08-4ea0-b2d1-6c222b5602d1"

-    assert bcf.extensions
-    assert bcf.extensions.topic_types
-    assert bcf.extensions.topic_types.topic_type == ["ERROR", "WARNING", "INFORMATION", "CLASH", "OTHER"]
-    assert bcf.extensions.topic_statuses
-    assert bcf.extensions.topic_statuses.topic_status == ["OPEN", "IN_PROGRESS", "SOLVED", "CLOSED"]
-    assert bcf.extensions.priorities
-    assert bcf.extensions.priorities.priority == ["LOW", "MEDIUM", "HIGH", "CRITICAL"]
-    assert bcf.extensions.topic_labels
-    assert bcf.extensions.topic_labels.topic_label == []
-    assert bcf.extensions.users
-    assert bcf.extensions.users.user == ["Architect@example.com", "Engineer@example.com", "MEPDesigner@example.com"]
-    assert bcf.extensions.snippet_types
-    assert bcf.extensions.snippet_types.snippet_type == []
-    assert bcf.extensions.stages
-    assert bcf.extensions.stages.stage == []
-
    assert len(bcf.topics) == 1
    topic_handler = bcf.topics["8ac9822a-761a-4deb-9f39-f61286acbf6a"]

@@ -2,7 +2,7 @@
 # Visit https://bit.ly/cffinit to generate yours today!

 cff-version: 1.2.0
-title: Bonsai
+title: BlenderBIM Add-on
 message: >-
  If you use this software, please cite it using the
  metadata from this file.
@@ -10,9 +10,9 @@ type: software
 authors:
  - name: "IfcOpenShell contributors"
 repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.8.0/src/bonsai
-url: 'https://bonsaibim.org/'
-repository-artifact: 'https://bonsaibim.org/download.html'
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.8.0/src/blenderbim
+url: 'https://blenderbim.org/'
+repository-artifact: 'https://blenderbim.org/download.html'
 abstract: >-
  Add-on to Blender providing a graphical native IFC
  authoring platform
@@ -1,22 +1,21 @@
-# Bonsai - OpenBIM Blender Add-on
+# BlenderBIM Add-on - OpenBIM Blender Add-on
 # Copyright (C) 2020-2023 Dion Moult <dion@thinkmoult.com>
 #
-# This file is part of Bonsai.
+# This file is part of BlenderBIM Add-on.
 #
-# Bonsai is free software: you can redistribute it and/or modify
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Bonsai is distributed in the hope that it will be useful,
+# BlenderBIM Add-on 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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-SHELL := sh
 PYTHON:=python3.11
 PIP:=pip3.11
 PATCH:=patch
@@ -47,10 +46,14 @@ VERSION_MINOR:=$(shell cat '../../VERSION' | cut -d '.' -f 2)
 VERSION_PATCH:=$(shell cat '../../VERSION' | cut -d '.' -f 3)
 VERSION_DATE:=$(shell date '+%y%m%d')
 LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
-LAST_COMMIT_DATE:=$(shell git show -s --format=%cI)
 PYVERSION:=py310
 PYPI_IMP:=cp

+ifeq ($(PYVERSION), py310)
+PYLIBDIR:=python3.10
+PYNUMBER:=310
+PYPI_VERSION:=3.10
+endif
 ifeq ($(PYVERSION), py311)
 PYLIBDIR:=python3.11
 PYNUMBER:=311
@@ -68,11 +71,7 @@ BLENDER_PLATFORM:=linux-x64
 endif

 ifeq ($(PLATFORM), macos)
-ifeq ($(PYVERSION), py311)
 PYPI_PLATFORM:=--platform macosx_10_10_x86_64
-else
-PYPI_PLATFORM:=--platform macosx_10_13_x86_64
-endif
 BLENDER_PLATFORM:=macos-x64
 endif

@@ -87,12 +86,9 @@ BLENDER_PLATFORM:=windows-x64
 endif

 # Current build commit hash.
-OLD:=e795cec
+OLD:=d51fa2c
 .PHONY: bump
 bump:
-ifndef NEW
-	$(error ERROR: 'NEW' variable is not set (should be set with new commmit hash). Example use for 'bump' command: 'make bump NEW=0123456'.)
-endif
 	cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 	cd ../ifcopenshell-python/ && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile

@@ -104,7 +100,7 @@ endif
 	rm -rf build
 	mkdir -p build
 	mkdir -p dist
-	cp -r bonsai build/
+	cp -r blenderbim build/

 	# To scope any build-time dependencies
 	cd build && $(PYTHON) -m venv env && . env/$(VENV_ACTIVATE) && $(PIP) install build
@@ -112,18 +108,18 @@ endif

 	mkdir -p build/wheels
 	# Provides IfcOpenShell Python functionality
-	cd ../ifcopenshell-python && make dist PLATFORM=$(PLATFORM)64 PYVERSION=$(PYVERSION) && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../bcf && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifcclash && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifctester && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifcfm && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../bsdd && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifcdiff && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifccsv && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifcpatch && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifc4d && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifc5d && make dist && mv dist/*.whl ../bonsai/build/wheels/
-	cd ../ifccityjson && make dist && mv dist/*.whl ../bonsai/build/wheels/
+	cd ../ifcopenshell-python && make dist PLATFORM=$(PLATFORM)64 PYVERSION=$(PYVERSION) && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../bcf && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcclash && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifctester && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcfm && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../bsdd && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcdiff && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifccsv && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcpatch && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifc4d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifc5d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifccityjson && make dist && mv dist/*.whl ../blenderbim/build/wheels/
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download GitPython --dest=./wheels
 	# Provides audio playback for costing
 	# This is a REALLY IMPORTANT feature
@@ -138,9 +134,7 @@ endif
 	# odfpy doesn't come with its own wheel, so whee'l (get it?) create it ourselves!
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel odfpy --wheel-dir=./wheels
 	# Required by IFCCityJSON
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "cjio >=0.8, <0.10" --dest=./wheels
-	# Required in general for sorting all sorts of stuff in a nice way
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download natsort --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --dest=./wheels
 	# Provides express rule validation for ifcopenshell.validate
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytest --dest=./wheels
 	# Provides Brickschema functionality
@@ -179,8 +173,6 @@ endif
 	# Is not platform specific but has platform specific dependencies.
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-socketio[asyncio_client] $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download aiohttp $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required to access platform specific paths
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download platformdirs --dest=./wheels
 	# Required by light module
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytz --dest=./wheels
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tzfpy $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
@@ -192,18 +184,18 @@ else ifeq ($(PLATFORM), macos)
 else
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 endif
-	# Required by ifctester web ui.
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download flask $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-
-	# jQuery is required for web UI functionality
-	cd build/bonsai/bim/data/webui/static/js/ && wget https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js
+	# tomllib replacement for < Python 3.11, used to parse blender_manifest
+ifeq ($(PYVERSION), py310)
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tomli --dest=./wheels
+endif

 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
-	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
-	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
+	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
+	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css

 	# Provides IFCJSON functionality
-	cd build && wget -O ifc2json.zip https://github.com/IFCJSON-Team/IFC2JSON_python/archive/refs/heads/master.zip
+	# TODO: replace with main repo if https://github.com/IFCJSON-Team/IFC2JSON_python/pull/3 is merged.
+	cd build && wget -O ifc2json.zip https://github.com/Moult/IFC2JSON_python/archive/refs/heads/feature-ios-v0.8.0.zip
 	cd build && unzip ifc2json.zip && rm ifc2json.zip
 	# IFCJSON doesn't have pyproject.toml, so we use python command.
 	cd build && . env/$(VENV_ACTIVATE) && cd IFC2JSON_python-*/file_converters && \
@@ -220,7 +212,7 @@ endif
 	# Brickschema requires pkg_resources which is provided by Blender.
 	# Provides Brickschema functionality
 	# For now lets bundle the latest nightly schema
-	cd build/bonsai/bim/data/brick/ && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd build/blenderbim/bim/schema && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl

 	# Required for hipped roof generation
 	cd build && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
@@ -234,20 +226,12 @@ endif
 		)" bdist_wheel
 	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/

-	# folder for executable files
-	mkdir -p build/bonsai/libs/bin
+	# Required for Desktop icon and file association
+	cp -r blenderbim/libs/desktop build/blenderbim/libs/

-	# required for three-way git merging
-ifeq ($(PLATFORM), win)
-	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip
-	cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
-else
-	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
-endif
-
-	# Generate translations module for Bonsai build
-	git clone https://github.com/IfcOpenShell/bonsai-translations.git build/working
-	$(PYTHON) scripts/bonsai_translations.py -i "build/working" -o "build/bonsai"
+	# Generate translations module for BBIM build
+	git clone https://github.com/IfcOpenShell/blenderbim-translations.git build/working
+	$(PYTHON) scripts/bbim_translations.py -i "build/working" -o "build/blenderbim"
 	rm -rf build/working

 	# Remove dependencies also bundled with Blender
@@ -255,18 +239,17 @@ endif

 	cp pyproject.toml build/
 ifeq ($(IS_STABLE), TRUE)
-	$(SED) "s/0.0.0/$(VERSION)/" build/bonsai/blender_manifest.toml
+	$(SED) "s/0.0.0/$(VERSION)/" build/blenderbim/blender_manifest.toml
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
 else
-	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/bonsai/blender_manifest.toml
-	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/bonsai/__init__.py
-	$(SED) "s/9999999/$(LAST_COMMIT_DATE)/" build/bonsai/__init__.py
+	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/blenderbim/blender_manifest.toml
+	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/blenderbim/__init__.py
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
 endif

-	$(SED) "s/os-arch/$(BLENDER_PLATFORM)/" build/bonsai/blender_manifest.toml
+	$(SED) "s/os-arch/$(BLENDER_PLATFORM)/" build/blenderbim/blender_manifest.toml

-	# Provides bonsai Add-on functionality
+	# Provides BlenderBIM Add-on functionality
 ifeq ($(IS_STABLE), TRUE)
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
 else
@@ -283,18 +266,61 @@ endif
 		echo "Error: non-wheel dependencies are not supported by Blender!"; \
 		exit 1; \
 	fi
-	mv build/wheels/*.whl build/bonsai/wheels/
+	mv build/wheels/*.whl build/blenderbim/wheels/

-	# Temporary workaround for Blender not handling non-3.11 wheels #5743.
-	# Use '-n' as on macos x86-64 doesn't have a binary wheel and it autoincludes 'cp311'.
-	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/-cp39-/-cp$(PYNUMBER)-/"); \
-	mv --update=none "$$prev_whl_name" "$$whl_name";
+	# Ugly patch to accomodate MacOS universal builds not being recognized by Blender.
+	# Blender doesn't look into the wheel contents, it just checks the name.
+	# So this hack works without working out some way to repack those wheels.
+	# See: https://projects.blender.org/blender/blender/issues/125091
+
+ifeq ($(PLATFORM), macosm1)
+	# Has universal and x86_64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/MarkupSafe-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has universal and x86_64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/lxml-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has only universal build.
+	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+endif
+ifeq ($(PLATFORM), macos)
+	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# has universal and amr64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/fonttools-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+endif
+
+	# Safeguard for unhandled universal files.
+	wheels=$$(find build/blenderbim/wheels/*universal2*.whl); \
+	if [ -n "$$wheels" ]; then \
+		echo "Found universal2 wheel files:"; \
+		echo "$$wheels"; \
+		echo "Error: universal2 wheel files are not supported by Blender!"; \
+		exit 1; \
+	fi

 ifneq ($(PLATFORM), linux)
 	# Safeguard: in case one of `pip download` will break,
 	# it will produce a linux wheel for non-linux build (our github action machine is using linux).
-	wheels=$$(find build/bonsai/wheels/*manylinux_*.whl); \
+	wheels=$$(find build/blenderbim/wheels/*manylinux_*.whl); \
 	if [ -n "$$wheels" ]; then \
 		echo "Found linux wheel files in non-linux build:"; \
 		echo "$$wheels"; \
@@ -303,19 +329,18 @@ ifneq ($(PLATFORM), linux)
 	fi
 endif

-	$(PYTHON) scripts/get_wheels.py build/bonsai/wheels build/bonsai/blender_manifest.toml
-	rm -rf build/bonsai/bim/
-	rm -rf build/bonsai/core/
-	rm -rf build/bonsai/tool/
-	rm -rf build/bonsai/libs/
+	$(PYTHON) scripts/get_wheels.py build/blenderbim/wheels build/blenderbim/blender_manifest.toml
+	rm -rf build/blenderbim/bim/
+	rm -rf build/blenderbim/core/
+	rm -rf build/blenderbim/tool/

 ifeq ($(IS_STABLE), TRUE)
-	cd build && zip -r bonsai_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./bonsai
+	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./blenderbim
 else
-	cd build && zip -r bonsai_$(PYVERSION)-$(VERSION)-alpha$(VERSION_DATE)-$(BLENDER_PLATFORM).zip ./bonsai
+	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-alpha$(VERSION_DATE)-$(BLENDER_PLATFORM).zip ./blenderbim
 endif

-	mv build/bonsai*.zip dist/
+	mv build/blenderbim*.zip dist/

 	rm -rf build

@@ -351,12 +376,6 @@ else
 	pytest test/tool/test_$(MODULE).py
 endif

-# Reregistering test is not added to the standard test suite because during unregister
-# Blender removes all Bonsai dependencies breaking dev-environment symlinks.
-.PHONY: test-reregister
-test-reregister:
-	blender --python scripts/reregister_bonsai.py
-
 .PHONY: qa
 qa:
 	black .
@@ -364,13 +383,13 @@ qa:

 .PHONY: coverage
 coverage:
-	coverage run --source bonsai.core -m pytest -p no:pytest-blender test/core
+	coverage run --source blenderbim.core -m pytest -p no:pytest-blender test/core
 	coverage html
 	xdg-open htmlcov/index.html

 .PHONY: license
 license:
-	copyright-header --license GPL3 --copyright-holder "Dion Moult <dion@thinkmoult.com>" --copyright-year "2022" --copyright-software "Bonsai" --copyright-software-description "OpenBIM Blender Add-on" -a ./ -o ./
+	copyright-header --license GPL3 --copyright-holder "Dion Moult <dion@thinkmoult.com>" --copyright-year "2022" --copyright-software "BlenderBIM Add-on" --copyright-software-description "OpenBIM Blender Add-on" -a ./ -o ./

 .PHONY: clean
 clean:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ryan Schultz	c62ed5d3b6	shift+click, to quickly switch the drawing view without turning anything on or off in the scene. as discussed: https://community.osarch.org/discussion/2196/quick-way-to-switch-between-drawing-views#latest	2024-08-04 10:00:22 -05:00
Ryan Schultz	ffb6c82541	snapshot	2024-08-04 09:40:34 -05:00
@@ -1 +1 @@
 .8.4
 .7.11