tweaked active operator

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -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

.github/ISSUE_TEMPLATE/config.yml

@@ -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?

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -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."

.github/workflows/build_all.yml

@@ -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 }}

.github/workflows/build_osx.yml

@@ -1,150 +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-14
-            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: Install Dependencies
-        run: |
-          brew update
-          # preinstalled: xz, cmake
-          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.2
-        with:
-          key: mac-${{ matrix.arch }}
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          if [ "${{ matrix.os }}" == "macos" ]; then
-            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
-          fi
-          if [ "${{ matrix.arch }}" == "x64" ]; then
-            arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-            MAC_INTEL=-mac-cross-compile-intel
-            # We don't use gmpcxx, but it comes preinstalled on macos runner as arm64 bottle
-            # and CGAL detects it and breaks cross compilation.
-            brew uninstall --ignore-dependencies gmp
-            # Otherwise Python will fallback to use arm64 `pkg-config`,
-            # will pick up arm64 libraries ('zstd' in particular),
-            # and break the build.
-            /usr/local/bin/brew install pkg-config
-            # Required by Python.
-            /usr/local/bin/brew install gettext openssl
-          fi
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
-            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
-            | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-osx-${{ matrix.arch }}
-          path: |
-            build.log
-            build/*/*/*/logs/*.log
-            build/*/*/*/build/ifcopenshell/**/CMakeCache.txt
-          retention-days: 30
-
-      - 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

.github/workflows/build_pyodide.yml

@@ -1,75 +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 Build Repository
-        uses: actions/checkout@v3
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ifcopenshell_build
-          ref: wasm
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}
-
-      - name: Build
-        run: |
-          ./IfcOpenShell/pyodide/build_pyodide.sh
-          FILE=`echo dist/ifcopenshell-*.whl`
-          NEW_FILE=`echo $FILE | sed "s/-/+${GITHUB_SHA:0:7}-/2"`
-          mv $FILE $NEW_FILE
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-pyodide
-          path: |
-            ifcopenshell_build/*/*/logs/*.log
-          retention-days: 30
-
-      - name: Pack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/pyodide/cache_dependencies.py pack
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd ifcopenshell_build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add */*/install/cache-*.tar.gz
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || echo "Push failed"
-
-      - 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"

.github/workflows/build_rocky.yml

@@ -1,129 +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 byacc
-          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
-
-      - name: ccache
-        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
-        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-rocky
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
-
-      - 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

.github/workflows/build_rocky_arm.yml

@@ -1,129 +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 byacc
-          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
-
-      - name: ccache
-        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
-        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-rocky-arm64
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
-
-      - 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

.github/workflows/build_win.yml

@@ -1,92 +0,0 @@
-name: Build IfcOpenShell Windows
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: windows-2022
-    strategy:
-      fail-fast: false
-      matrix:
-        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: Unpack Dependencies
-        run: |
-          cd _deps-vs2022-x64-installed
-          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
-            7z x $_.FullName
-          }
-
-      - name: ccache
-        # Use fork to resolve cache misses / duplicated cache entries on Windows.
-        uses: Andrej730/ccache-action@main
-        with:
-          key: win-${{ matrix.arch }}
-          # Windows ccache needs ~1GB
-          # and with default 500MB some cache gets deleted, leading to misses.
-          max-size: 5000MB
-
-      - name: Run Build Script And Pack .zip Archives
-        shell: cmd
-        run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          cd win
-          python build-all-win.py
-
-      - name: Pack Dependencies
-        run: |
-          cd _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: 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
-          }

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

@@ -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 }}

.github/workflows/ci-black-formatting.yaml

@@ -1,66 +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
-          # It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
-          uvx ruff check nix/build-all.py --target-version py37
-        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

.github/workflows/ci-black-formatting.yml

@@ -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

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

@@ -96,15 +96,15 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IFCOPENBOT_TOKEN }}
+          token: ${{ secrets.IOS_TO_BLENDER_REPO }}
           path: bonsai_unstable_repo
 
-      - name: Download Blender and run critical tests
+      - name: Update index.json on extensions repo
         run: |
-          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
+          set -x -e
 
           # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.2/blender-4.2.0-linux-x64.tar.xz
           tar -xf blender.tar.xz
 
           # Setup Blender.
@@ -112,25 +112,25 @@ jobs:
           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 ..
+          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"
           bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
-
-          # Install Bonsai.
+          blender --version
           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
@@ -139,43 +139,20 @@ jobs:
           rm -r sverchok
           blender --command extension install-file -r user_default sverchok.zip
 
-          # Install ifcsverchok.
+          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
           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
+          blender --online-mode --background --python-expr "import bpy; \
+          bpy.ops.extensions.package_install(repo_index=0, pkg_id='sun_position'); \
+          bpy.ops.preferences.addon_enable(module='bl_ext.blender_org.sun_position'); bpy.ops.wm.save_userpref()"
 
-          cd IfcOpenShell/src/bonsai
+          cd ../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

.github/workflows/ci-bsdd-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifc4d-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifc5d-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifccityjson-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifcclash-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifcconvert.yml

@@ -24,6 +24,10 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
+          - {
+            name: "Windows 32bit",
+            short_name: win32,
+          }
           - {
             name: "Linux 64bit",
             short_name: linux64

.github/workflows/ci-ifccsv-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifcdiff-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifcfm-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -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

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

@@ -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
 
@@ -119,6 +118,6 @@ jobs:
         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:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:latest' }}
         file: ./Dockerfile
         push: true

.github/workflows/ci-ifcopenshell-python-pypi.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312, py313, py314]
+        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 }}

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

@@ -19,12 +19,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312, py313, py314]
+        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

.github/workflows/ci-ifcpatch-pypi.yaml

@@ -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 }}

.github/workflows/ci-ifctester-org.yml

@@ -1,32 +0,0 @@
-name: ci-ifctester-org
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - src/ifctester/**
-
-jobs:
-  publish_website:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v4
-        with:
-          repository: IfcOpenShell/ifctester_org_static_html
-          token: ${{ secrets.IFCOPENBOT_TOKEN }}
-          path: ifctester_org_static_html
-      - name: Build webapp
-        working-directory: ./src/ifctester
-        run: |
-          sudo apt update && sudo apt install -y nodejs
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          make webapp-build
-      - name: Commit and push
-        run: |
-          cp -r src/ifctester/webapp/dist/* ifctester_org_static_html/
-          git -C ifctester_org_static_html add .
-          git -C ifctester_org_static_html commit --allow-empty -m "$(git log --oneline -1)"
-          git -C ifctester_org_static_html push

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

@@ -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 }}

.github/workflows/ci.yml

@@ -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,9 +47,9 @@ 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 git+https://github.com/zdhoward/aud
-          pip install pytest-xdist==3.8.0
+          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
 
       - name: Install C++ dependencies
         run: |
@@ -70,30 +69,9 @@ jobs:
           libhdf5-dev libcgal-dev libeigen3-dev
           
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1
         with:
-          key: ubuntu-22.04-${{ runner.arch }}
-
-      # 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
-          # rocksdb is using ccache automatically.
-          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
+          key: ${GITHUB_WORKFLOW}
 
       - name: Build ifcopenshell
         run: |
@@ -101,10 +79,9 @@ jobs:
           echo ${{ env.pythonLocation }}
           
           mkdir build && cd build
-          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
-          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
           cmake \
-               -DCMAKE_CXX_STANDARD=17 \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -114,31 +91,34 @@ jobs:
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
                -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
                -DCOLLADA_SUPPORT=Off \
-               -DUSE_MMAP=On \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
                -DGLTF_SUPPORT=On \
-               -DWITH_ROCKSDB=On \
+               -DJSON_INCLUDE_DIR=/usr/include \
+               -DCGAL_INCLUDE_DIR=/usr/include \
+               -DGMP_INCLUDE_DIR=/usr/include \
+               -DMPFR_INCLUDE_DIR=/usr/include \
+               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+               -DEIGEN_DIR=/usr/include/eigen3 \
              ../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 \
-      #       echo $i | tee -a log; \
-      #       timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
-      #       echo $i $? >> statuses; \
-      #     done) || true
-      #     echo Failed
-      #     grep -v 0$ statuses
-      #     grep -v 0$ statuses | wc -l
-      #     echo Succeeded
-      #     grep 0$ statuses
-      #     grep 0$ statuses | wc -l
-
-      - name: Run IfcConvert on Sample file
+      - name: Run IfcConvert on Sample files
         run: |
-          IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj
+          (find test/input src/bonsai/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; \
+          done) || true
+          echo Failed 
+          grep -v 0$ statuses
+          grep -v 0$ statuses | wc -l
+          echo Succeeded
+          grep 0$ statuses
+          grep 0$ statuses | wc -l
+
 
       - name: Test ifcopenshell-python
         run: |
@@ -146,22 +126,11 @@ 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-parallel || ERROR=1
-          cd ../bcf && make test || ERROR=1
+          make test
+          cd ../bcf && make test
           pip install requests
-          cd ../bsdd && make test || ERROR=1
+          cd ../bsdd && make test
           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 ../ifcdiff && make test
+          cd ../ifcpatch && make test
+          cd ../ifctester && make test

.github/workflows/docs-deployment-unstable.yml

@@ -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

.github/workflows/docs-deployment.yml

@@ -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

.github/workflows/publish-pyodide-demo-app.yml

@@ -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

.github/workflows/release.yml

@@ -4,7 +4,6 @@ on:
   push:
     tags:
       - 'v[0-9].[0-9].[0-9]*'
-  workflow_dispatch:
 
 jobs:
   activate:
@@ -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 \

.gitignore

@@ -81,18 +81,11 @@ src/bonsai/test/files/temp
 src/bonsai/test/files/basic.ifc.cache.blend
 src/bonsai/test/files/basic.ifc.cache.sqlite
 
-# 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
-
 src/bonsai/drawings
 src/bonsai/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
@@ -105,11 +98,3 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # Brickschema
 src/bonsai/bonsai/bim/schema/Brick.ttl
-
-bonsaiDecoratorForLoads.code-workspace
-dev_environment.bat
-
-.pixi/
-
-src/ifcopenshell-python/ifcopenshell/express/*.exp
-src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat

.gitmodules

@@ -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

README.md

@@ -6,7 +6,6 @@ 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
@@ -37,25 +36,25 @@ Contents
 
 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| [bcf](https://docs.ifcopenshell.org/bcf.html)                       | 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](https://docs.ifcopenshell.org/bonsai.html)                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
-| [bsdd](https://docs.ifcopenshell.org/bsdd.html)                      | 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](https://docs.ifcopenshell.org/ifc2ca.html)                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
-| [ifc4d](https://docs.ifcopenshell.org/ifc4d.html)                     | 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/) |
-| [ifc5d](https://docs.ifcopenshell.org/ifc5d.html)                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
-| [ifcbimtester](https://docs.ifcopenshell.org/bimtester.html)              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
+| 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/) |
+| 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/) |
+| ifc5d                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
+| ifcbimtester              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
-| [ifccityjson](https://docs.ifcopenshell.org/ifccityjson.html)               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
-| [ifcclash](https://docs.ifcopenshell.org/ifcclash.html)                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
-| [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
-| [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
-| [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
-| [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
-| [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
-| [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
+| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
+| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
+| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
+| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
+| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
+| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
+| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
+| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
+| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
+| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
 
 The IfcOpenShell C++ codebase is split into multiple interal libraries:
 

VERSION

@@ -1 +1 @@
-0.8.4
+0.8.1

cmake/CMakeLists.txt

@@ -18,26 +18,24 @@
 ################################################################################
 
 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)
 
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+endif()
+
 add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
 
-if(POLICY CMP0141) # 3.25+
-  cmake_policy(SET CMP0141 NEW) # Support for `CMAKE_MSVC_DEBUG_INFORMATION_FORMAT`.
-endif()
-if(POLICY CMP0144) # 3.27
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0078 NEW)
+cmake_policy(SET CMP0086 NEW)
+if (POLICY CMP0144)
     cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
 endif()
-if(POLICY CMP0167) # 3.30
-    cmake_policy(SET CMP0167 OLD)
-endif()
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
@@ -66,7 +64,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)
@@ -79,20 +77,12 @@ 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, requires git" OFF)
-option(VERSION_OVERRIDE "Override the version defined in buildinfo.cpp 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."
-)
+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)
 
 if (VERSION_OVERRIDE)
     file(READ "../VERSION" "RELEASE_VERSION_")
@@ -121,28 +111,6 @@ if((BUILD_CONVERT OR BUILD_GEOMSERVER OR BUILD_IFCPYTHON) AND(NOT BUILD_IFCGEOM)
     set(BUILD_IFCGEOM ON)
 endif()
 
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    message(STATUS "`ccache` is found, using it as a compiler launcher.")
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_FOUND}")
-    if(MSVC)
-        # By default Visual Studio generators will use /Zi which is not compatible
-        # with ccache, so tell Visual Studio to use /Z7 instead.
-        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
-        # Not needed for Ninja.
-        if(CMAKE_GENERATOR MATCHES "Visual Studio")
-            file(COPY_FILE
-                ${CCACHE_FOUND} ${CMAKE_BINARY_DIR}/cl.exe
-                ONLY_IF_DIFFERENT)
-            set(CMAKE_VS_GLOBALS
-                "CLToolExe=cl.exe"
-                "CLToolPath=${CMAKE_BINARY_DIR}"
-                "UseMultiToolTask=true"
-            )
-        endif()
-    endif()
-endif()
-
 if(MSVC AND MSVC_PARALLEL_BUILD)
     add_definitions("/MP")
 endif()
@@ -208,8 +176,6 @@ if(NOT MINIMAL_BUILD)
     UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
     UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
     UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR)
-    UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR)
-    UNIFY_ENVVARS_AND_CACHE(PYTHON_LIBRARY)
     UNIFY_ENVVARS_AND_CACHE(PYTHON_EXECUTABLE)
     UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
     UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
@@ -230,46 +196,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 CGAL_INCLUDE_DIR)
-	# CGAL is not respecting default Boost_USE_STATIC_LIBS value
-	# and sometiems it's getting in the way.
-	if(NOT DEFINED Boost_USE_STATIC_LIBS)
-		set(CGAL_Boost_USE_STATIC_LIBS OFF)
-	else()
-		set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
-	endif()
-        find_package(CGAL REQUIRED)
-        if(NOT CGAL_DIR)
-            message(
-                FATAL_ERROR
-                "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
-            )
-        endif()
-        message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
-        link_libraries(CGAL::CGAL)
-    endif()
-
     add_definitions(-DIFOPSH_WITH_CGAL)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
 
@@ -288,33 +223,20 @@ endif()
 
 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
     UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    if(NOT JSON_INCLUDE_DIR)
-        find_package(nlohmann_json CONFIG)
-        if(nlohmann_json_DIR)
-            link_libraries(nlohmann_json::nlohmann_json)
-        else()
-            message(STATUS "Unable to find nlohmann_json package, trying to find it as a header-only library.")
-        endif()
-    endif()
+    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+    set(JSON_INCLUDE_DIR ${json_header_path})
 
-    if(NOT nlohmann_json_DIR)
-        clear_wasm_sysroot()
-        find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-        restore_wasm_sysroot()
-        set(JSON_INCLUDE_DIR ${json_header_path})
-
-        if(json_header_path)
-            message(STATUS "JSON for Modern C++ header file found in '${JSON_INCLUDE_DIR}'.")
-        else()
-            message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
-        endif()
+    if(json_header_path)
+        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
+    else()
+        message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
     endif()
 
     add_definitions(-DWITH_GLTF)
     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)
@@ -337,13 +259,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
         )
 
@@ -361,38 +283,6 @@ if(USD_SUPPORT)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
 endif(USD_SUPPORT)
 
-if (WITH_ROCKSDB)
-    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
-    # find it's zstd dependency on Windows.
-    # Only do it on Windows, otherwise it might create problems as
-    # findzstd and zstd-config target names do not match.
-    if(WIN32)
-        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-    endif()
-    find_package(RocksDB CONFIG REQUIRED)
-    if(WIN32)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
-    endif()
-
-    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 ""))
@@ -426,7 +316,7 @@ if(WASM_BUILD)
 else()
     # @todo review this, shouldn't this be all possible header-only now?
     # ... or rewritten using C++17 features?
-    set(BOOST_COMPONENTS system program_options regex thread date_time iostreams)
+    set(BOOST_COMPONENTS system program_options regex thread date_time)
 endif()
 
 if(USE_MMAP)
@@ -440,44 +330,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)
-            # CONFIG is provided using root path, so no need to clear sysroot here.
-            restore_wasm_sysroot()
-            find_package(LibXml2 REQUIRED CONFIG)
-            clear_wasm_sysroot()
-
-            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)
@@ -486,73 +345,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)
-    if(OCC_INCLUDE_DIR)
+    if("${OCC_INCLUDE_DIR}" STREQUAL "")
+        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+            PATHS
+                /usr/include/occt
+                /usr/include/oce
+                /usr/include/opencascade
+            REQUIRED
+        )
+
+        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)
-        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 OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-            "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
-        )
-        # Parse OCC_VERSION_STRING.
+    if(OCC_INCLUDE_DIR)
         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.*"
+          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.*"
+          REGEX "#define OCC_VERSION_MAINTENANCE.*"
         )
         string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
         set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-    elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-        # OCE is not supported for find_package, because it's using a different name (`oce`)
-        # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
-        find_package(OpenCASCADE CONFIG REQUIRED)
-        set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
-        # Do not use OpenCASCADE_LIBRARY_DIR for OCC_LIBRARY_DIR - check target property explicitly.
-        # On Windows there is a case with OpenCASCADE_LIBRARY_DIR points to `lib` folder,
-        # while TKernel is actually in `libi`.
-        get_target_property(TKERNEL_LIB_PATH TKernel LOCATION)
-        get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
-        set(OCC_VERSION_STRING ${OpenCASCADE_VERSION})
-        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}'."
-        )
-    else()
-        message(
-            FATAL_ERROR
-            "Couldn't find Open CASCADE installation. "
-            "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-            "must be specified or OpenCASCADE package should be discoverable. "
-            "If you're using OCE, then providing a package is not available "
-            "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
-        )
-    endif()
+    endif(OCC_INCLUDE_DIR)
 
-    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
 
@@ -566,17 +400,30 @@ 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")
     else()
-        message(
-            FATAL_ERROR
-            "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting"
-        )
+        message(FATAL_ERROR "Unable to find Open Cascade library files, aborting")
     endif()
 
     # Use the found libTKernel as a template for all other OCC libraries
@@ -607,7 +454,7 @@ if(BUILD_IFCGEOM)
 
     if(OCCT_STATIC)
         find_package(Threads)
-
+        
         if(WASM_BUILD)
             set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
         else()
@@ -619,7 +466,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()
@@ -630,18 +477,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")
@@ -674,7 +510,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
@@ -722,12 +559,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 "")
@@ -794,32 +626,26 @@ if(HDF5_SUPPORT)
         endif()
     endif()
 
-    if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
-        # First try to find it as a config.
-        find_package(HDF5 CONFIG)
-        if(HDF5_DIR)
-            message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
-            set(HDF5_LIBRARIES hdf5_cpp-static)
-        else()
-            # If it failed, still try to find as a module.
-            # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
-            # Will automatically fill HDF5_LIBRARIES and HDF5_INCLUDE_DIR.
-            find_package(HDF5 COMPONENTS CXX)
-            if(NOT HDF5_INCLUDE_DIR)
-                message(
-                    FATAL_ERROR
-                    "HDF5_INCLUDE_DIR is not provided (current value: '${HDF5_INCLUDE_DIR}'). "
-                    "HDF5_LIBRARY_DIR is not provided (current value: '${HDF5_LIBRARY_DIR}'). "
-                    "Also could not find HDF5 package (neither module or config)."
-                )
-            endif()
-        endif()
+    if(NOT HDF5_LIBRARIES)
+        # 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,
@@ -930,23 +756,6 @@ else()
     endif()
 endif(MSVC)
 
-
-# Ensure other dependencies are provided.
-if(NOT EXISTS "${EIGEN_DIR}")
-    find_package(Eigen3 CONFIG)
-    if(Eigen3_DIR)
-        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
-    else()
-        message(
-            FATAL_ERROR
-            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
-            "Also couldn't find Eigen3 as a package."
-        )
-    endif()
-    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}
@@ -956,7 +765,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()
@@ -1044,7 +853,11 @@ if(BUILD_IFCGEOM)
 	foreach(schema ${SCHEMA_VERSIONS})
 		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
 	endforeach()
-    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
+	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})	
+	endif()
 endif()
 
 if(BUILD_CONVERT OR BUILD_IFCPYTHON)
@@ -1058,14 +871,12 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
             set(GEOM_SERIALIZER_SCHEMA_LIBRARIES ${GEOM_SERIALIZER_SCHEMA_LIBRARIES} GeometrySerializers_ifc${schema})
 
             add_library(geometry_serializer_ifc${schema} STATIC ../src/ifcgeom/Serialization/schema/Serialization.cpp)
-            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS -DIfcSchema=Ifc${schema}")
-            target_link_libraries(geometry_serializer_ifc${schema} ${OPENCASCADE_LIBRARIES})
+            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
             list(APPEND geometry_serializer_libraries geometry_serializer_ifc${schema})
         endforeach()
 
-        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.h ../src/ifcgeom/Serialization/Serialization.cpp)
-        set_target_properties(geometry_serializer PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS")
-        target_link_libraries(geometry_serializer ${geometry_serializer_libraries} IfcParse)
+        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.cpp)
+        target_link_libraries(geometry_serializer ${geometry_serializer_libraries})
         set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} geometry_serializer ${geometry_serializer_libraries})
     endif()
 endif()
@@ -1104,12 +915,8 @@ endforeach()
 set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})
 
 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()
@@ -1117,15 +924,9 @@ else()
 endif()
 
 if(BUILD_IFCGEOM)
-    # CGAL::CGAL target already has dependencies resolved.
-    if(WITH_CGAL AND CGAL_DIR)
-        set(CGAL_LIBRARIES CGAL::CGAL)
-        message(STATUS "Using found CGAL package at '${CGAL_DIR}'")
-    elseif(WITH_CGAL AND NOT CGAL_DIR)
-	clear_wasm_sysroot()
+    if(WITH_CGAL)
         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()
@@ -1142,24 +943,24 @@ 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} ../src/ifcgeom/kernels/ifc_geomlibrary_api.h)
-        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOMLIBRARY_EXPORTS")
+        
+        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
+        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
         # needed?
         # if(NOT WASM_BUILD)
         # endif()
-        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES} IfcGeom IfcParse)
+        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")
 
             add_library(geometry_kernel_${kernel}_simple ${IFCGEOM_FILES})
-            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOMLIBRARY_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
+            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
             # needed?
             # if(NOT WASM_BUILD)
             # endif()
-            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES} IfcGeom IfcParse)
+            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES})
             list(APPEND kernel_libraries geometry_kernel_${kernel}_simple)
         endif()
     endforeach()
@@ -1170,13 +971,10 @@ 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)
-        if (NOT BUILD_SHARED_LIBS)
-            target_link_libraries(geometry_mapping_ifc${schema} IfcGeom)
-        endif()
         list(APPEND mapping_libraries geometry_mapping_ifc${schema})
     endforeach()
 
@@ -1192,7 +990,11 @@ if(BUILD_IFCGEOM)
         find_package(Threads)
     endif()
 
-    target_link_libraries(IfcGeom IfcParse ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+    if(WASM_BUILD)
+        target_link_libraries(IfcGeom ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+    else()
+        target_link_libraries(IfcGeom IfcParse ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+    endif()
 
 endif(BUILD_IFCGEOM)
 
@@ -1207,8 +1009,8 @@ 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 "-DSERIALIZERS_EXPORTS -DIfcSchema=Ifc${schema}")
-
+        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()
@@ -1217,7 +1019,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
     endforeach()
 
     add_library(Serializers ${SERIALIZERS_FILES})
-    set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DSERIALIZERS_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+    set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
     if(WITH_PROJ)
         target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
@@ -1228,7 +1030,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
         target_link_libraries(Serializers ${PROJ_LIBRARIES})
     endif()
 
-    target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES} IfcGeom ${OPENCASCADE_LIBRARIES} ${kernel_libraries} IfcParse)
+    target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES})
 
 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
 
@@ -1275,7 +1077,7 @@ if(BUILD_CONVERT)
     set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
     add_executable(IfcConvert ${IFCCONVERT_FILES})
 
-    target_link_libraries(IfcConvert IfcGeom IfcParse Serializers ${kernel_libraries} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
+    target_link_libraries(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
 	if (WITH_RELATIONSHIP_VALIDATION)
         set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DWITH_RELATIONSHIP_VALIDATION")
     endif()
@@ -1300,16 +1102,11 @@ 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})
     add_executable(IfcGeomServer ${SOURCE_FILES})
-    target_link_libraries(IfcGeomServer IfcGeom IfcParse Serializers ${kernel_libraries} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES})
+    target_link_libraries(IfcGeomServer ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES})
 
     if((NOT WIN32) AND BUILD_SHARED_LIBS)
         SET_INSTALL_RPATHS(IfcGeomServer "${IFCOPENSHELL_LIBRARY_DIR};${OCC_LIBRARY_DIR};${Boost_LIBRARY_DIRS}")
@@ -1325,10 +1122,6 @@ endif(BUILD_GEOMSERVER)
 if(ADD_COMMIT_SHA)
     find_package(Git)
 
-    if(NOT GIT_FOUND)
-        message(FATAL_ERROR "Failed to find Git for ADD_COMMIT_SHA option.")
-    endif()
-
     if(GIT_FOUND)
         if (VERSION_OVERRIDE)
             set (git_branch ${RELEASE_VERSION})
@@ -1336,7 +1129,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
             )
@@ -1354,22 +1146,13 @@ 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()
-
-        target_compile_definitions(IfcParse PRIVATE
-            -DIFCOPENSHELL_BRANCH=${git_branch}
-            -DIFCOPENSHELL_COMMIT=${git_sha}
-        )
+        add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
+        add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
     endif()
 endif(ADD_COMMIT_SHA)
 
@@ -1399,7 +1182,7 @@ if(BUILD_IFCMAX)
 endif()
 
 if(WITH_CGAL)
-    add_subdirectory(../src/svgfill svgfill)
+    add_subdirectory(../src/svgfill svgfill)        
 endif()
 
 if(BUILD_QTVIEWER)
@@ -1418,26 +1201,14 @@ 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
     )
 
-    file(GLOB SERIALIZATION_H_FILES ../src/ifcgeom/serialization/*.h)
-    install(FILES ${SERIALIZATION_H_FILES}
-        DESTINATION ${INCLUDEDIR}/ifcgeom/serialization
+    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
+        DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
     )
 
-    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(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
         ARCHIVE DESTINATION ${LIBDIR}
         LIBRARY DESTINATION ${LIBDIR}
@@ -1452,25 +1223,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(
@@ -1486,8 +1247,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}")

cmake/CMakePresets.json

@@ -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"
-      }
-    }
-  ]
-}

cmake/utilities.cmake

@@ -121,4 +121,4 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
         ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
         PARENT_SCOPE
     )
-endfunction()
+endfunction()

conda/bld.bat

@@ -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

conda/build.sh

@@ -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

conda/conda_build_config.yaml

@@ -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]

conda/meta.yaml

@@ -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
     ============
@@ -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:

conda/update_version_init.py

@@ -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)

nix/patches/occt/no_ExpToCasExe_7_9_1.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34300d41ad..09b2e0d45f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -721,6 +721,8 @@ else()
-   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
- endif()
- 
-+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-+
- # bison
- if (BUILD_YACCLEX)
-   list (APPEND OCCT_3RDPARTY_CMAKE_LIST "adm/cmake/bison")

nix/patches/opencollada/allow_static_libraries_config_on_unix.patch

@@ -1,13 +0,0 @@
-diff --git a/OpenCOLLADAConfig.cmake.in b/OpenCOLLADAConfig.cmake.in
-index d765b108..6800c2a7 100644
---- a/OpenCOLLADAConfig.cmake.in
-+++ b/OpenCOLLADAConfig.cmake.in
-@@ -31,7 +31,7 @@ set(OPENCOLLADA_INCLUDE_DIRS
- include("@PACKAGE_OPENCOLLADA_INST_CMAKECONFIG@/OpenCOLLADATargets.cmake")
- 
- # Set the library variable
--if(UNIX)
-+if(0)
- 	set(OPENCOLLADA_LIBRARIES
- 		ftoa_shared
- 		buffer_shared

pixi.toml

@@ -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"]

pyodide/README.md

@@ -1,33 +0,0 @@
-
-There are two ways to build pyodide ifcopenshell Python wrapper wheel.
-
-1. Using pyodide build system (`build_pyodide.yml` does it):
-
-- install prebuilt pyodide build and emscripten environment (see `build_pyodide.sh`)
-- clone IfcOpenShell to `IfcOpenShell` folder
-- create `packages/ifcopenshell` folder that will be used by pyodide build system
-- from `IfcOpenShell` move building recipe `pyodide/meta.yaml` to `packages/ifcopenshell`
-- run `pyodide build-recipes ifcopenshell --install`, it will
-    - execute `meta.yaml` recipe - it will:
-        - copy IfcOpenShell source to build folder `packages/ifcopenhell/build/ifcopenshell-0.8.0`
-        - build ifcopenshell and its dependencies
-        - note that rerunning `pyodide build-recipes` will remove previous build folder and rebuild all dependencies.  
-        The way to avoid it, if build fails, is to use `pyodide build-recipes-no-deps ifcopenshell --continue` instead.
-    - run `setup.py` in `IfcOpenShell` root, producing a wheel in `IfcOpenShell/dist`
-    - copy that wheel to `packages/ifcopenshell/dist`
-    - `--install` it to current build envrionment
-        - copy the wheel next to `dist` folder (in root directory, next to `packages`)
-        - add wheel to `dist/pyodide-lock.json`
-
-2. Build it outside of pyodide build system.
-
-Building inside pyodide build system should be preferred, option to build it outside is useful for debugging purposes,
-since it's pure cmake without any additional moving parts.
-
-- setup pyodide environment, see above
-- clone IfcOpenShell repo next to it to `IfcOpenShell` folder
-- setup debug build environment using `source pyodide/debug_build_env.sh /path/to/pyodide_root`
-- run `python nix/build-all.py -wasm -py-313` in `IfcOpenShell`
-    - it will produce Python package in `IfcOpenShell/ifcopenshell`
-- run `pyodide build`
-    - it will produce a wheel in `IfcOpenShell/dist`

pyodide/build_pyodide.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/bash
-set -ex
-
-# Install uv.
-curl -LsSf https://astral.sh/uv/install.sh | sh
-uv venv --python 3.13
-source .venv/bin/activate
-
-# Install pyodide cross build environment.
-# Instructions: https://pyodide.org/en/stable/development/building-packages.html
-uv pip install pyodide-build
-# `uv run` is required, so xbuildenv would skip using `pip`.
-uv run pyodide xbuildenv install
-
-# Emscripten doesn't come with xbuildenv.
-git clone https://github.com/emscripten-core/emsdk
-pushd emsdk
-PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
-./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
-./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
-source emsdk_env.sh
-which emcc
-popd
-
-mkdir -p packages/ifcopenshell
-VERSION=`cat IfcOpenShell/VERSION`
-cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell
-sed -i s/0.8.0/$VERSION/g packages/ifcopenshell/meta.yaml
-
-# Use custom build ifcopenshell directory in build-all to make caching simpler
-# Otherwise pyodide build path typically includes package version, so cached cmake configs might break.
-export BUILD_DIR=`readlink -f ifcopenshell_build`
-
-# Use build-recipes-no-deps first, so logs would be printed to stdout.
-pyodide build-recipes-no-deps ifcopenshell
-pyodide build-recipes ifcopenshell --install

pyodide/cache_dependencies.py

@@ -1,64 +0,0 @@
-"""
-Cache built dependencies for builds.
-
-This script is finding common install directory and either
-packs each folder into a tar.gz archive, if it wasn't packed before,
-or unpacks existing archives.
-
-Usage: python cache_dependencies.py [pack|unpack]
-"""
-
-import tarfile
-import sys
-from pathlib import Path
-from typing import Literal
-
-
-CACHE_PREFIX = "cache-"
-
-
-def get_install_dir() -> Path:
-    for data in Path.cwd().glob("*/*/install"):
-        return data
-    raise Exception("No install dir found")
-
-
-def pack_dependencies(install_dir: Path) -> None:
-    # Process each install_dir
-    for dependency_path in install_dir.iterdir():
-        if not dependency_path.is_dir():
-            continue
-        dependency_name = dependency_path.name
-        tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
-        if tar_path.exists():
-            print(f"Skipping existing cache: '{tar_path}'")
-        else:
-            with tarfile.open(tar_path, "w:gz") as tar:
-                tar.add(dependency_path, arcname=dependency_path.name)
-            print(f"Created cache: '{tar_path}'")
-
-
-def unpack_dependencies(install_dir: Path) -> None:
-    # `filter` argument was fully introduced in 3.12
-    # and results in deprecation warnings in 3.12-3.13, if not provided.
-    tar_filter: "dict[Literal['filter'], Literal['data']]" = (
-        {"filter": "data"} if bool(sys.version_info >= (3, 12)) else {}
-    )
-    for tar_path in install_dir.glob(f"{CACHE_PREFIX}*.tar.gz"):
-        with tarfile.open(tar_path, "r:gz") as tar:
-            tar.extractall(path=install_dir, **tar_filter)
-        print(f"Extracted cache: '{tar_path.name}'.")
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 2 or (action := sys.argv[1].lower()) not in ("pack", "unpack"):
-        print(__doc__)
-        sys.exit(1)
-
-    install_dir = get_install_dir()
-    print(f"Found install dir: '{install_dir}'")
-
-    if action == "pack":
-        pack_dependencies(install_dir)
-    else:
-        unpack_dependencies(install_dir)

pyodide/debug_build_env.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-if [ $# -ne 1 ]; then
-  echo "Usage: $0 <pyodide_root>"
-  exit 1
-fi
-export PYODIDE_ROOT=$(readlink -f "$1")
-export PATH="$PYODIDE_ROOT/emsdk/emsdk:$PYODIDE_ROOT/emsdk/emsdk/node/22.16.0_64bit/bin:$PYODIDE_ROOT/emsdk/emsdk/upstream/emscripten:$PATH"
-# build-all.py vars.
-export WASM_PYTHON_PATH="$PYODIDE_ROOT/cpython/installs/python-3.13.2"
-export WASM_TOOLCHAIN_FILE="$PYODIDE_ROOT/pyodide-build/pyodide_build/tools/cmake/Modules/Platform/Emscripten.cmake"

pyodide/meta.yaml

@@ -3,12 +3,12 @@ package:
   version: 0.8.0
 
 source:
-  # meta.yaml is placed as `packages/ifcopenshell/meta.yaml`.
-  path: ../../IfcOpenShell
+  path: IfcOpenShell
 
 build:
   script: |
-    BUILD_CFG=Release python nix/build-all.py -v --wasm --py313
+    python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py310 IfcOpenShell-Python
+    cp pyodide/setup.py .
 
 about:
   home: http://ifcopenshell.org

pyodide/setup.py

@@ -1,48 +1,11 @@
-# setup.py is getting deprecated, but we still use it,
-# because `tool.setuptools.ext-modules` is still experimental in pyproject.toml
-# and we need it to get the wheel suffix right.
-import os
-from pathlib import Path
+from setuptools import setup, find_packages
 
-import tomllib
-from setuptools import Extension, setup
-
-
-REPO_FOLDER = Path(__file__).parent
-
-
-def get_version() -> str:
-    if "PKG_VERSION" in os.environ:
-        # Inside pyodide build environment.
-        return os.environ["PKG_VERSION"]
-    return (REPO_FOLDER / "VERSION").read_text().strip()
-
-
-# Read dependencies from pyproject.toml
-def get_dependencies() -> list[str]:
-    pyproject_toml = REPO_FOLDER / "src" / "ifcopenshell-python" / "pyproject.toml"
-    pyproject_data = tomllib.loads(pyproject_toml.read_text())
-    dependencies = pyproject_data["project"]["dependencies"]
-    return dependencies
-
-
-setup(
-    name="ifcopenshell",
-    version=get_version(),
-    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="https://ifcopenshell.org",
-    install_requires=get_dependencies(),
-    packages=["ifcopenshell"],
-    package_data={
-        # "*.so" is needed to include prebuilt binary extension. Otherwise it would try to build it and fail.
-        "ifcopenshell": ["util/schema/*.json", "util/schema/*.ifc", "*.so"],
-        "": ["*.json", "*.ifc"],
-    },
-    # Has to provide extension to get the correct wheel suffix.
-    ext_modules=[Extension("ifcopenshell._ifcopenshell_wrapper", sources=[])],
+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']},
 )

pyproject.toml

@@ -1,64 +1,35 @@
 [tool.black]
 line-length = 120
 include = '''
-    src/.*.pyi?$
-    |nix/.*.pyi?$
+    src/(
+        bcf
+        |bcfserver
+        |bonsai
+        |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]
-preview = true
-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
-]

src/bcf/bcf/agnostic/extensions.py

@@ -20,7 +20,7 @@ def get_extensions_attributes(extensions: Extensions) -> dict[str, AttributeData
     - subattribute name"""
     possible_attributes = {}
     for field in fields(type(extensions)):
-        field_type = field.type.__args__[0]  # pyright: ignore [reportAttributeAccessIssue]
+        field_type = field.type.__args__[0]  # type: ignore [reportAttributeAccessIssue]
         subfield = next(iter(fields(field_type)))
         xsd_name = subfield.metadata["name"]
         possible_attributes[field.name] = AttributeData(field_type, subfield.name, xsd_name)

src/bcf/bcf/geometry.py

@@ -6,7 +6,7 @@ from numpy.typing import NDArray
 
 def camera_vectors_from_element_placement(
     elem_placement: NDArray[np.float64],
-) -> tuple[list[float], list[float], list[float]]:
+) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
     """
     Calculate the vectors of a camera pointing to an element.
 
@@ -22,7 +22,7 @@ def camera_vectors_from_element_placement(
 
 def camera_vectors_from_target_position(
     target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None
-) -> tuple[list[float], list[float], list[float]]:
+) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
     """
     Calculate the vectors of a camera pointing to a target point.
 
@@ -38,7 +38,16 @@ def camera_vectors_from_target_position(
     camera_direction = unit_vector(-camera_offset)  # pylint: disable=invalid-unary-operand-type
     camera_right = unit_vector(np.cross(np.array([0.0, 0.0, 1.0]), camera_direction))
     camera_up = unit_vector(np.cross(camera_direction, camera_right))
-    return camera_position.tolist(), camera_direction.tolist(), camera_up.tolist()
+    return camera_position, camera_direction, camera_up
+    # rotation_transform = np.eye(4)
+    # rotation_transform[0, :3] = camera_right
+    # rotation_transform[1, :3] = camera_up
+    # rotation_transform[2, :3] = camera_direction
+    # translation_transform = np.eye(4)
+    # translation_transform[:3, -1] = -camera_position
+    # look_at_transform = np.matmul(rotation_transform, translation_transform)
+    # mat = np.linalg.inv(look_at_transform)
+    # return camera_position, -mat[:3, 2], mat[:3, 1]
 
 
 def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]:

src/bcf/bcf/inmemory_zipfile.py

@@ -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:

src/bcf/bcf/v2/bcfxml.py

@@ -1,6 +1,5 @@
 """BCF XML V2 handler."""
 
-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -32,7 +31,7 @@ class BcfXml:
         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:
@@ -100,7 +99,7 @@ class BcfXml:
             extensions = mdl_extensions.Extensions()
 
             xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO(self.extension_schema))
+            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()}
@@ -149,7 +148,7 @@ class BcfXml:
         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 +172,7 @@ class BcfXml:
         cls,
         project_name: Optional[str] = None,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
         """
         Create a new BcfXml object.
 
@@ -262,7 +261,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()

src/bcf/bcf/v2/model/__init__.py

@@ -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",

src/bcf/bcf/v2/model/extensions.py

@@ -14,20 +14,16 @@
 # Currently extensions support for v2 is only read-only.
 
 
-import sys
 from dataclasses import dataclass, field, fields
-from typing import Optional
+from typing import List, NamedTuple, 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 ExtensionsPriorities:
     class Meta:
         global_type = False
 
-    priority: list[str] = field(
+    priority: List[str] = field(
         default_factory=list,
         metadata={
             "name": "Priority",
@@ -39,12 +35,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",
@@ -56,12 +52,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",
@@ -73,12 +69,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",
@@ -90,12 +86,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",
@@ -107,12 +103,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",
@@ -124,12 +120,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": "UserIdType",
@@ -141,7 +137,7 @@ class ExtensionsUsers:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Extensions:
     topic_types: Optional[ExtensionsTopicTypes] = field(
         default=None,

src/bcf/bcf/v2/model/markup.py

@@ -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",

src/bcf/bcf/v2/model/project.py

@@ -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,

src/bcf/bcf/v2/model/version.py

@@ -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,

src/bcf/bcf/v2/model/visinfo.py

@@ -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",

src/bcf/bcf/v2/topic.py

@@ -1,6 +1,5 @@
 """BCF XML V2 Topic handler."""
 
-from __future__ import annotations
 import datetime
 import tempfile
 import uuid
@@ -153,7 +152,7 @@ class TopicHandler:
         topic_type: str = "",
         topic_status: str = "",
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
         """
         Create a new BCF topic.
 
@@ -192,8 +191,6 @@ class TopicHandler:
             bcf_zip: The BCF zip file to save to.
         """
         topic_dir = self.guid
-        # simulating directory creation (ZipFile in python < 3.11 doesn't have mkdir)
-        destination_zip.writestr(f"{topic_dir}/", "")
         self._save_xml(destination_zip, self._markup, "markup.bcf")
         self._save_viewpoints(destination_zip, topic_dir)
         self._save_bim_snippet(destination_zip)

src/bcf/bcf/v2/visinfo.py

@@ -1,7 +1,6 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from typing import Any, Iterable, Optional, Literal, Union
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -319,7 +318,9 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     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[:3, 3] *= unit_scale
+    elem_placement[0][3] *= unit_scale
+    elem_placement[1][3] *= unit_scale
+    elem_placement[2][3] *= unit_scale
 
     return mdl.VisualizationInfo(
         guid=str(uuid.uuid4()),
@@ -379,7 +380,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: list[float], camera_dir: list[float], camera_up: list[float]
+    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.

src/bcf/bcf/v3/bcfapi.py

@@ -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",

src/bcf/bcf/v3/bcfxml.py

@@ -1,6 +1,5 @@
 """BCF XML V3 handlers."""
 
-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -31,7 +30,7 @@ class BcfXml:
         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:
@@ -117,7 +116,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 +141,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 +239,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()

src/bcf/bcf/v3/model/__init__.py

@@ -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",

src/bcf/bcf/v3/model/documents.py

@@ -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,

src/bcf/bcf/v3/model/extensions.py

@@ -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,

src/bcf/bcf/v3/model/markup.py

@@ -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,

src/bcf/bcf/v3/model/project.py

@@ -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={

src/bcf/bcf/v3/model/version.py

@@ -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={

src/bcf/bcf/v3/model/visinfo.py

@@ -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.

src/bcf/bcf/v3/topic.py

@@ -1,6 +1,5 @@
 """BCF XML V3 Topic handler."""
 
-from __future__ import annotations
 import datetime
 import uuid
 import zipfile
@@ -92,12 +91,12 @@ class TopicHandler:
         self._bim_snippet = value
 
     @property
-    def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+    def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
         if self._viewpoints is None:
             self._viewpoints = self._load_viewpoints()
         return self._viewpoints
 
-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+    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 {}
@@ -140,7 +139,7 @@ class TopicHandler:
         topic_type: str = "",
         topic_status: str = "",
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
         """
         Create a new BCF topic.
 
@@ -179,8 +178,6 @@ class TopicHandler:
             bcf_zip: The BCF zip file to save to.
         """
         topic_dir = self.guid
-        # simulating directory creation (ZipFile in python < 3.11 doesn't have mkdir)
-        destination_zip.writestr(f"{topic_dir}/", "")
         self._save_xml(destination_zip, self._markup, "markup.bcf")
         self._save_viewpoints(destination_zip, topic_dir)
         self._save_bim_snippet(destination_zip)

src/bcf/bcf/v3/visinfo.py

@@ -1,7 +1,6 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from typing import Any, Iterable, Optional, Literal, Union
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -319,7 +318,9 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     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[:3, 3] *= unit_scale
+    elem_placement[0][3] *= unit_scale
+    elem_placement[1][3] *= unit_scale
+    elem_placement[2][3] *= unit_scale
 
     return mdl.VisualizationInfo(
         guid=str(uuid.uuid4()),
@@ -379,7 +380,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: list[float], camera_dir: list[float], camera_up: list[float]
+    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.

src/bcf/bcf/xml_parser.py

@@ -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.
 

src/bcf/pyproject.toml

@@ -16,7 +16,6 @@ dependencies = [
     "xsdata>=24.4",
     "numpy",
     "ifcopenshell",
-    "requests",
 ]
 version = "0.0.0"
 classifiers = [

src/bonsai/Makefile

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL := sh
 PYTHON:=python3.11
 PIP:=pip3.11
 PATCH:=patch
@@ -47,7 +46,6 @@ 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
 
@@ -87,7 +85,7 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=6924012
+OLD:=0e5008d
 .PHONY: bump
 bump:
 ifndef NEW
@@ -127,7 +125,7 @@ endif
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download GitPython --dest=./wheels
 	# Provides audio playback for costing
 	# This is a REALLY IMPORTANT feature
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/zdhoward/aud --wheel-dir=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/Andrej730/aud.git --wheel-dir=./wheels
 	# IfcOpenShell dependency - support for new typing features
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download typing_extensions --dest=./wheels
 	# Required by IfcCSV
@@ -138,7 +136,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
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --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
 	# Provides express rule validation for ifcopenshell.validate
@@ -179,8 +177,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 +188,14 @@ 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
 
 	# 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
 
 	# 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/bonsai/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,16 +226,8 @@ endif
 		)" bdist_wheel
 	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/
 
-	# folder for executable files
-	mkdir -p build/bonsai/libs/bin
-
-	# 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
+	# Required for Desktop icon and file association
+	cp -r bonsai/libs/desktop build/bonsai/libs/
 
 	# Generate translations module for Bonsai build
 	git clone https://github.com/IfcOpenShell/bonsai-translations.git build/working
@@ -260,7 +244,6 @@ ifeq ($(IS_STABLE), TRUE)
 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/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
 endif
 
@@ -285,11 +268,54 @@ endif
 	fi
 	mv build/wheels/*.whl build/bonsai/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'.
+	# 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/bonsai/wheels/lxml-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
 	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";
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has only universal build.
+	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+endif
+ifeq ($(PLATFORM), macos)
+	# Has universal and arm64 builds.
+	prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# has universal and arm builds.
+	prev_whl_name=$$(find build/bonsai/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/bonsai/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,
@@ -307,7 +333,6 @@ endif
 	rm -rf build/bonsai/bim/
 	rm -rf build/bonsai/core/
 	rm -rf build/bonsai/tool/
-	rm -rf build/bonsai/libs/
 
 ifeq ($(IS_STABLE), TRUE)
 	cd build && zip -r bonsai_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./bonsai
@@ -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 .

src/bonsai/bonsai/__init__.py

@@ -28,10 +28,6 @@ IN_BLENDER = sys.modules.get("bpy", None)
 if IN_BLENDER:
     import bpy
 
-# This file is executed twice - first as a bonsai-extension
-# and then as a bonsai-package.
-IN_PACKAGE = __package__ == "bonsai"
-
 import re
 import platform
 import traceback
@@ -40,12 +36,10 @@ import uuid
 import shutil
 from collections import deque
 from pathlib import Path
-from typing import Union, Any
-from collections.abc import Generator
+from typing import Union, Any, Generator
 
 
 last_commit_hash = "8888888"
-last_commit_date = "9999999"
 
 
 def get_last_commit_hash() -> Union[str, None]:
@@ -57,12 +51,6 @@ def get_last_commit_hash() -> Union[str, None]:
     return last_commit_hash[:7]
 
 
-def get_last_commit_date() -> Union[str, None]:
-    if last_commit_date == str(9_999999):
-        return None
-    return last_commit_date
-
-
 # Accessed from bonsai extension:
 bbim_semver: dict[str, Any] = {}
 
@@ -108,7 +96,6 @@ def get_debug_info():
         "blender_version": bpy.app.version_string,
         "bonsai_version": bbim_version,
         "bonsai_commit_hash": get_last_commit_hash(),
-        "bonsai_commit_date": get_last_commit_date(),
         "last_actions": last_actions,
         "last_error": last_error,
     }
@@ -223,21 +210,16 @@ if IN_BLENDER:
         info["binary_python_version"] = version
         return info
 
-    def update_commit_data() -> None:
-        try:
-            import git
+    try:
+        import git
 
-            global last_commit_hash
-            global last_commit_date
-            path = Path(__file__).resolve().parent
-            repo = git.Repo(str(path), search_parent_directories=True)
-            last_commit_hash = repo.head.object.hexsha
-            last_commit_date = repo.head.object.committed_datetime.isoformat()
-        except:
-            pass
-
-    if IN_PACKAGE:
-        update_commit_data()
+        # We can't just use __file__ as bonsai/__init__.py is typically not symlinked
+        # as Blender have errors symlinking main addon package file.
+        path = Path(__file__).resolve().parent
+        repo = git.Repo(str(path), search_parent_directories=True)
+        last_commit_hash = repo.head.object.hexsha
+    except:
+        pass
 
     try:
         import ifcopenshell.api
@@ -253,12 +235,6 @@ if IN_BLENDER:
 
         ifcopenshell.api.add_pre_listener("*", "action_logger", log_api)
 
-        def purge_cache():
-            """Purge cache left from previous session (e.g. after reload or update)."""
-            import bonsai.tool as tool
-
-            tool.Blender.get_bonsai_version.cache_clear()
-
         def register():
             if platform.system() == "Windows":
                 clean_up_dlls_safe_links()
@@ -276,7 +252,6 @@ if IN_BLENDER:
                 bonsai.REINSTALLED_BBIM_VERSION = current_version
 
             bonsai.bim.register()
-            purge_cache()
 
         def unregister():
             if platform.system() == "Windows":
@@ -342,7 +317,7 @@ if IN_BLENDER:
                     # But Blender currently doesn't support separate builds for different Python version,
                     # so those issues might still slip in.
                     box.label(text="Bonsai installed for wrong Python version.")
-                    box.label(text=f"Expected binary version: {py}. Got: {binary_py}.")
+                    box.label(text=f"Expected: {py}. Got: {binary_py}.")
                     # On reinstallation, dependencies versions doesn't change, so Blender will just ignore new dependencies.
                     # So, we need to make user will disable an extension (just uninstallation won't remove dependencies).
                     # Blender restart doesn't seem to be required in that case
@@ -350,13 +325,7 @@ if IN_BLENDER:
                     box.label(text="Try reinstalling with the correct Python version.")
                     box.label(text="Before reinstallation make sure to")
                     box.label(text="DISABLE Bonsai (uninstallation won't help).")
-                    if py == "3.11":
-                        box.label(text="You can download correct version below.")
-                    else:
-                        box.label(text="Since you're using Python >3.11,")
-                        box.label(text="installation from Blender extensions platform")
-                        box.label(text="is not supported and you need to download")
-                        box.label(text="and install Bonsai from the link below.")
+                    box.label(text="You can download correct version below.")
 
                 layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
                 op = layout.operator("bim.open_uri", text="How Can I Fix This?")

src/bonsai/bonsai/bim/.gitignore

@@ -0,0 +1,2 @@
+# addon writes tmp stuff directly to its dir
+/data/

src/bonsai/bonsai/bim/__init__.py

@@ -20,10 +20,9 @@ import os
 import bpy
 import bpy.utils.previews
 import importlib
-from bpy_extras.io_utils import ImportHelper, ExportHelper
-from . import handler, ui, prop, operator
-from typing import Union
-from collections.abc import Callable
+from pathlib import Path
+from . import handler, ui, prop, operator, helper
+from typing import Callable, Union
 
 try:
     from bonsai.translations import translations_dict
@@ -85,7 +84,6 @@ modules = {
     "covering": None,
     "web": None,
     "light": None,
-    "alignment": None,
     # Uncomment this line to enable loading of the demo module. Happy hacking!
     # The name "demo" must correlate to a folder name in `bim/module/`.
     # "demo": None,
@@ -97,57 +95,49 @@ for name in modules.keys():
 
 
 classes = [
+    operator.AddIfcFile,
     operator.BIM_OT_add_section_plane,
     operator.BIM_OT_delete_object,
     operator.BIM_OT_remove_section_plane,
-    operator.BIM_OT_select_entity,
-    operator.BIM_OT_select_entity_by_guid,
     operator.BIM_OT_select_object,
     operator.BIM_OT_show_description,
     operator.BIM_OT_multiple_file_selector,
-    operator.BIM_OT_attribute_add_subitem,
-    operator.BIM_OT_attribute_remove_subitem,
     operator.ClippingPlaneCutWithCappings,
     operator.CloseBlendWarning,
     operator.CloseError,
-    operator.CreateMacBonsaiApp,
-    operator.CopyTextToClipboard,
     operator.EditBlenderCollection,
     operator.FileAssociate,
     operator.FileUnassociate,
-    operator.OpenPath,
     operator.OpenUpstream,
     operator.OpenUri,
     operator.ReloadIfcFile,
+    operator.RemoveIfcFile,
     operator.RevertClippingPlaneCut,
-    operator.SelectDir,
+    operator.SelectDataDir,
     operator.SelectIfcFile,
+    operator.SelectSchemaDir,
     operator.SelectURIAttribute,
     operator.SetTab,
     operator.SwitchTab,
-    operator.ShowSystemInfo,
     prop.StrProperty,
     operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
-    operator.BIM_OT_attribute_search_values,
     prop.ObjProperty,
     prop.MultipleFileSelect,
     prop.Attribute,
-    prop.ISODuration,
     prop.BIMAreaProperties,
     prop.BIMTabProperties,
     prop.BIMProperties,
     prop.IfcParameter,
     prop.PsetQto,
+    prop.GlobalId,
     prop.BIMObjectProperties,
     prop.BIMCollectionProperties,
     prop.BIMMeshProperties,
     prop.BIMFacet,
     prop.BIMFilterGroup,
-    prop.BIMSnapProperties,
-    prop.BIMSnapGroups,
     ui.BIM_UL_clipping_plane,
     ui.BIM_UL_generic,
-    ui.DocPreferences,
+    ui.BIM_UL_topics,
     ui.BIM_ADDON_preferences,
     # Tabs panel
     ui.BIM_PT_tabs,
@@ -155,10 +145,10 @@ classes = [
     ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
     ui.BIM_PT_tab_spatial,
-    ui.BIM_PT_tab_grouping_and_filtering,
     ui.BIM_PT_tab_project_setup,
     ui.BIM_PT_tab_geometry,
     ui.BIM_PT_tab_stakeholders,
+    ui.BIM_PT_tab_grouping_and_filtering,
     # Object information
     ui.BIM_PT_tab_object_metadata,
     ui.BIM_PT_tab_misc,
@@ -200,8 +190,6 @@ classes = [
     # TODO: move this somewhere else and clean it up
     ui.BIM_PT_section_plane,
     ui.BIM_PT_section_with_cappings,
-    ui.BIM_PT_decorators_overlay,
-    ui.BIM_PT_snappping,
 ]
 
 for mod in modules.values():
@@ -227,20 +215,13 @@ def on_register(scene):
 
 def register():
     for cls in classes:
-        # Prevent crashes in Blender 4.4.0, see #6420.
-        if issubclass(cls, (ImportHelper, ExportHelper)):
-            assert getattr(cls, "bl_description", "") or cls.__doc__, cls
-
         bpy.utils.register_class(cls)
-
     bpy.app.handlers.depsgraph_update_post.append(on_register)
     bpy.app.handlers.undo_post.append(handler.undo_post)
     bpy.app.handlers.redo_post.append(handler.redo_post)
     bpy.app.handlers.load_post.append(handler.load_post)
     bpy.app.handlers.load_post.append(handler.loadIfcStore)
     bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
-    bpy.types.Scene.BIMSnapProperties = bpy.props.PointerProperty(type=prop.BIMSnapProperties)
-    bpy.types.Scene.BIMSnapGroups = bpy.props.PointerProperty(type=prop.BIMSnapGroups)
     bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
     bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
     bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
@@ -275,12 +256,6 @@ def register():
     icons = icon_preview
     bpy.app.translations.register("bonsai", translations_dict)
 
-    import bonsai.tool as tool
-
-    tool.Blender.ensure_bin_in_path()
-    # RestrictedContext doesn't allow accessing scene attribute, postpone it for a bit.
-    bpy.app.timers.register(tool.Blender.setup_user_data_dir, first_interval=0.1)
-
 
 def unregister():
     global icons

src/bonsai/bonsai/bim/data/assets/shading_styles.json

@@ -47,6 +47,8 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -145,7 +147,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "THEME",
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -160,6 +162,7 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -186,6 +189,7 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -204,6 +208,7 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": false,
             "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,
@@ -293,6 +298,8 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -391,7 +398,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "THEME",
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -406,6 +413,7 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -432,6 +440,7 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -450,6 +459,7 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": false,
             "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,
@@ -499,10 +509,6 @@
                 0.05087608844041824,
                 0.05087608844041824
             ],
-            "scene.eevee.use_shadows": true,
-            "scene.eevee.shadow_ray_count": 1,
-            "scene.eevee.shadow_step_count": 6,
-            "scene.eevee.shadow_resolution_scale": 1.0,
             "scene.render.bake_bias": 0.0010000000474974513,
             "scene.render.bake_margin": 16,
             "scene.render.bake_margin_type": "ADJACENT_FACES",
@@ -514,7 +520,7 @@
             "scene.render.border_min_x": 0.0,
             "scene.render.border_min_y": 0.0,
             "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_EEVEE_NEXT",
+            "scene.render.engine": "BLENDER_EEVEE",
             "scene.render.film_transparent": false,
             "scene.render.filter_size": 1.5,
             "scene.render.fps": 24,
@@ -543,6 +549,8 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -641,7 +649,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "THEME",
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -656,6 +664,7 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -682,6 +691,7 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -700,6 +710,7 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": true,
             "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,

src/bonsai/bonsai/bim/data/brick/.gitignore

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

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

@@ -1 +0,0 @@
-This directory stores Brickschema definitions in TTL format.

src/bonsai/bonsai/bim/data/diagrams/.gitignore

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

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

@@ -1 +0,0 @@
-This directory stores generated drawings in SVG format.