build_osx - separate arm64 ccache to avoid override

Not sure which patch version exactly fixed it, but 3.13.6 works.

.gersemirc

@@ -1,12 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/0.24.0/gersemi/configuration.schema.json
-
-# Gersemi doesn't support autodetection of macros/functions from other files or from the current one
-# and requires to explicitly list directories/cmake files that define them.
-definitions: ["./cmake", "./src"]
-disable_formatting: false
-extensions: []
-indent: 4
-line_length: 120
-list_expansion: favour-inlining
-unsafe: false
-warn_about_unknown_commands: true

.github/dependabot.yml

@@ -1,12 +0,0 @@
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/black_to_github_annotations.py

@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-import json
-import os
-import sys
-from typing import TypedDict
-
-import github_action_utils as gha_utils
-
-
-class Entry(TypedDict):
-    location: Location
-
-
-class Location(TypedDict):
-    path: str
-    lines: Lines
-
-
-class Lines(TypedDict):
-    begin: int
-    end: int
-
-
-json_data: list[Entry] = json.load(sys.stdin)
-
-if os.getenv("RUNNER_DEBUG"):
-    print("Debug: Black formatting JSON data:")
-    print(json.dumps(json_data, indent=2))
-
-for change in json_data:
-    location = change["location"]
-    path = location["path"]
-    lines = location["lines"]
-    gha_utils.error(
-        f"Black formatting issue in {path}",
-        title="Black Format Issue",
-        file=path,
-        line=lines["begin"],
-        end_line=lines["end"],
-    )

.github/workflows/build_osx.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
@@ -34,14 +34,17 @@ jobs:
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+        
       - name: Install Dependencies
         run: |
           brew update
           # preinstalled: xz, cmake
           brew install git bison autoconf automake libffi findutils
           echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-          # Mac is using bison 2.5 by default, but we need 3.5+ for swig.
-          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
 
       - name: Install aws cli
         run: |
@@ -49,11 +52,11 @@ jobs:
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          python ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
+        uses: hendrikmuhs/ccache-action@v1
         with:
           key: mac-${{ matrix.arch }}
 
@@ -69,10 +72,6 @@ jobs:
             # 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
@@ -83,7 +82,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: build-logs-osx-${{ matrix.arch }}
           path: |
@@ -95,7 +94,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          python ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
 
       - name: Commit and Push Changes to Build Repository
         run: |
@@ -139,7 +140,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_pyodide.yml

@@ -9,75 +9,41 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           submodules: recursive
           path: IfcOpenShell
 
-      - name: Checkout Build Repository
-        uses: actions/checkout@v6
+      - name: Checkout Pyodide
+        uses: actions/checkout@v3
         with:
-          repository: IfcOpenShell/build-outputs
-          path: ifcopenshell_build
-          ref: wasm
-          lfs: true
+          submodules: recursive
+          repository: pyodide/pyodide
+          ref: '0.28.0a3'
           token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/nix/cache_dependencies.py unpack
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}
+          path: pyodide
 
       - 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@v7
-        with:
-          name: build-logs-pyodide
-          path: |
-            ifcopenshell_build/*/*/logs/*.log
-          retention-days: 30
-
-      - name: Run wheel tests
-        run: |
-          cp -r IfcOpenShell/pyodide/test test
-          # venv set up in build_pyodide.sh.
-          source .venv/bin/activate
-          uv pip install pytest-pyodide
-          PYODIDE_ROOT_DIST=`pyodide config get pyodide_root`/dist
-          # `pytest-pyodide` requires pyodide in 'pyodide' directory in cwd, when running `pytest`.
-          cp -r $PYODIDE_ROOT_DIST test/pyodide
-          cp dist/ifcopenshell-*.whl test/pyodide
-          cd test
-          pytest --capture=no
-
-      - name: Pack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/nix/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"
+          VERSION=`cat IfcOpenShell/VERSION`
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
+          echo '#!/usr/bin/bash' > script.sh
+          echo 'cd pyodide' >> script.sh
+          echo 'make' >> script.sh
+          echo 'cd ..' >> script.sh
+          echo 'mkdir -p packages/ifcopenshell' >> script.sh
+          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
+          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
+          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
+          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
+          chmod +x script.sh
+          sed -i s/--tty// pyodide/run_docker
+          pyodide/run_docker ./script.sh
+          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp313-cp313-emscripten_4_0_9_wasm32.whl
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_rocky.yml

@@ -6,13 +6,13 @@ on:
 jobs:
   build_ifcopenshell:
     runs-on: ubuntu-22.04
-    container: rockylinux:9
+    container: rockylinux:8
 
     steps:
       - name: Install Dependencies
         run: |
-          dnf update -y
-          dnf install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
                          bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                          sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                          readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
@@ -29,28 +29,29 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
-          ref: rockylinux9-x64
+          ref: rockylinux8-x64
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          python3 ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
       - name: Run Build Script
         shell: bash
@@ -60,7 +61,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: build-logs-rocky
           path: |
@@ -71,7 +72,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          python3 ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
 
       - name: Commit and Push Changes to Build Repository
         run: |
@@ -115,7 +118,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_rocky_arm.yml

@@ -6,13 +6,13 @@ on:
 jobs:
   build_ifcopenshell:
     runs-on: ubuntu-22.04-arm
-    container: arm64v8/rockylinux:9
+    container: arm64v8/rockylinux:8
 
     steps:
       - name: Install Dependencies
         run: |
-          dnf update -y
-          dnf install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
                          bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                          sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                          readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
@@ -29,28 +29,29 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
-          ref: rockylinux9-arm64
+          ref: rockylinux8-arm64
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          python3 ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
       - name: Run Build Script
         shell: bash
@@ -60,7 +61,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: build-logs-rocky-arm64
           path: |
@@ -71,7 +72,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          python3 ../nix/cache_dependencies.py pack
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
 
       - name: Commit and Push Changes to Build Repository
         run: |
@@ -115,7 +118,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_win.yml

@@ -5,38 +5,24 @@ on:
 
 jobs:
   build_ifcopenshell:
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - arch: x64
-            runs_on: windows-2022
-            deps_dir: _deps-vs2022-x64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
-            build_branch: windows-x64
-            zip_suffix: win64
-
-          - arch: ARM64
-            runs_on: windows-11-arm
-            deps_dir: _deps-vs2022-ARM64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"'
-            build_branch: windows-arm64
-            zip_suffix: win-arm64
-
-    runs-on: ${{ matrix.runs_on }}
-
+        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
+        arch: ['x64']
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           repository: IfcOpenShell/build-outputs
-          path: ${{ matrix.deps_dir }}
-          ref: ${{ matrix.build_branch }}
+          path: _deps-vs2022-x64-installed
+          ref: windows-${{ matrix.arch }}
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
@@ -44,33 +30,40 @@ jobs:
         run: |
           choco install -y sed 7zip.install awscli
 
+      - name: Install Python
+        run: |
+          $installer = "python-${{ matrix.python }}-amd64.exe"
+          $url = "https://www.python.org/ftp/python/${{ matrix.python }}/$installer"
+          Invoke-WebRequest -Uri $url -OutFile $installer
+          Start-Process -Wait -FilePath .\$installer -ArgumentList '/quiet InstallAllUsers=0 PrependPath=0 Include_test=0 TargetDir=C:\Python\${{ matrix.python }}'
+          Remove-Item .\$installer
+
       - name: Unpack Dependencies
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
             7z x $_.FullName
           }
 
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
-        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
+      - name: Run Build Script
         shell: cmd
-        env:
-          TARGET_ARCH: ${{ matrix.arch }}  # lets the Python script know which arch to target (optional override)
         run: |
-          call ${{ matrix.vcvars }}
+          setlocal EnableDelayedExpansion
+          SET PYTHON_VERSION=${{ matrix.python }}
+          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
+              set PY_VER_MAJOR_MINOR=%%a%%b
+          )
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          SET IFCOS_INSTALL_PYTHON=FALSE
           cd win
-          python build-all-win.py
+          echo y | call build-deps.cmd vs2022-x64 Release
+          SET PYTHONHOME=C:\Python\${{ matrix.python }}
+          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
+          call install-ifcopenshell.bat vs2022-x64 Release
 
       - name: Pack Dependencies
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           Get-ChildItem -Path . -Directory | ForEach-Object {
             $cacheFile = "cache-$($_.Name).zip"
             echo $cacheFile
@@ -81,16 +74,44 @@ jobs:
 
       - name: Commit and Push Changes to Build Repository
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           git config user.name "IfcOpenBot"
           git config user.email "ifcopenbot@ifcopenshell.org"
-          git checkout -B ${{ matrix.build_branch }}
           git add *.zip
           git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push --set-upstream origin ${{ matrix.build_branch }} || echo "Push failed"
+          git push || echo "Push failed"
+
+      - name: Package .zip Archives
+        run: |
+          $VERSION = 'v' + ((Get-Content VERSION).Trim())
+          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
+          $OUTPUT_DIR = "$env:USERPROFILE\output"
+          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
+
+          if ("${{ matrix.python }}" -eq "3.9.11") {
+            # only for the first python version the executables are assembled for upload
+            cd _installed-vs2022-x64/bin
+            Get-ChildItem -Path . | ForEach-Object {
+              echo $_
+              $exe = $_.Name
+              $baseName = $exe.Substring(0, $exe.Length - 4)
+              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
+              7z a $zipName $exe
+            }
+            mv *.zip $OUTPUT_DIR
+          }
+
+          $pyVersion = "${{ matrix.python }}"
+          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
+          cd C:\Python\${{ matrix.python }}\Lib\site-packages
+          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
+          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
+          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
+          7z a $zipName ifcopenshell
+          mv $zipName $OUTPUT_DIR
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/check_repo_ci_jobs.py

@@ -1,9 +1,9 @@
-import os
 import pathlib
 import shutil
-import zipfile
 
 import requests
+import zipfile
+import os
 
 # To test this locally, set these environment variables
 REPO_OWNER = os.environ.get("REPO_OWNER", "IfcOpenShell/IfcOpenShell")

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

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

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

@@ -7,90 +7,48 @@ on:
 jobs:
   lint-formatting:
     runs-on: ubuntu-latest
-    env:
-      MIN_IOS_PY_VERSION: "3.10"
-      MIN_BLENDER_PY_VERSION: "3.11"
     steps:
       - name: Action - checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4.2.2
 
       - name: Action - install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5.3.0
         with:
-          python-version: ${{ env.MIN_IOS_PY_VERSION }}
+          python-version: "3.9"
 
       - name: Action - install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5.3.0
         with:
-          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
           curl -LsSf https://astral.sh/uv/install.sh | sh
           uv tool install ruff
           uv tool install black
-          uv tool install poethepoet
 
       # black doesn't catch all syntax errors, so we check them explicitly.
       - name: Check syntax errors
         id: syntax-errors
         run: |
           ERROR=0
-          # Using 2 Python versions - one minimum required for IfcOpenShell
-          # and other that's used by Blender currently.
-          python${{ env.MIN_IOS_PY_VERSION }} -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python${{ env.MIN_BLENDER_PY_VERSION }} -W error -m compileall -q src/bonsai || ERROR=1
+          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
-        uses: psf/black@stable
-        continue-on-error: true
-
-      # Same check as above, but just for creating github annotations.
-      - name: Black formatter annotations
-        id: black-annotations
         run: |
-          uv tool install black-codeclimate
-          pip install github_action_utils
-          black --diff --check . | black-codeclimate | python .github/workflows/black_to_github_annotations.py
+          uvx black --diff --check .
         continue-on-error: true
 
       - name: Ruff check
         id: ruff
         run: |
-          # Ensure execution continues, since we need to cache the output.
-          set +e
-
-          ERROR=0
-          # Keep colored output inside action logs, strip it from color codes for summary.
-          uv tool install ansi2txt
-          # `ruff` disables color output in CI by default.
-          export FORCE_COLOR="1"
-
-          run_check() {
-            local out
-            out="$("$@" 2>&1)"
-            local exit_code=$?
-
-            if [ "$exit_code" -ne 0 ]; then
-              ERROR=1
-            fi
-
-            # Rerun just for GitHub annotations.
-            "$@" --output-format=github || true
-
-            echo "$out"
-            echo "\`\`\`python" >> $GITHUB_STEP_SUMMARY
-            echo "$out" | ansi2txt >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          }
-
-          run_check poe ruff-main
-          run_check poe ruff-old
-
-          exit $ERROR
+          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
@@ -100,9 +58,9 @@ jobs:
             echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
           fi
           if [ "${{ steps.black.outcome }}" != "success" ]; then
-            echo "::error::Black formatting check failed, see Summary or 'black' step for the details." && ERROR=1
+            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 Summary or 'ruff' step for the details." && ERROR=1
+            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
           fi
           exit $ERROR

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

@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-tags: true
           fetch-depth: 0

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

@@ -24,15 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell'
-    outputs:
-      timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-    - name: Get current timestamp
-      id: timestamp
-      # Include hours and minutes to release tag
-      # to avoid possibility of unstable repo's index.json
-      # pointing to the new file when index.json itself wasn't yet updated.
-      run: echo "timestamp=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
+    - name: Set env
+      run: echo ok go
 
   build:
     needs: activate
@@ -41,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -59,20 +53,21 @@ jobs:
             name: "MacOS ARM Build",
             short_name: macosm1,
           }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
       - name: Get current version
         id: version
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - name: Get current date
+        id: date
+        # Include hours and minutes to release tag
+        # to avoid possibility of unstable repo's index.json
+        # pointing to the new file when index.json itself wasn't yet updated.
+        run: echo "date=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
           cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
@@ -88,8 +83,8 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.find_zip.outputs.filepath }}
           asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }} (unstable)"
-          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }}"
+          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
           overwrite: true
           body: "See README in https://github.com/IfcOpenShell/bonsai_unstable_repo/ on how to setup autoupdates for daily Bonsai builds."
 
@@ -98,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
         with:
           repository: IfcOpenShell/bonsai_unstable_repo
           token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -109,7 +104,7 @@ jobs:
           # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
 
           # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender5.0/blender-5.0.1-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
           tar -xf blender.tar.xz
 
           # Setup Blender.

.github/workflows/ci-bonsai.yml

@@ -43,8 +43,8 @@ jobs:
             short_name: macosm1,
           }
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcconvert.yml

@@ -37,8 +37,8 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -24,7 +24,7 @@ jobs:
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell'
     steps:
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-

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

@@ -21,7 +21,7 @@ jobs:
       date: ${{ steps.date.outputs.date }}
       verdate: ${{ steps.verdate.outputs.verdate }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - name: Set env
         run: echo ok go
       
@@ -54,7 +54,8 @@ jobs:
         platform: [
           { name: win, distver: windows-latest, pkg_dir: 'win-64' },
           { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' }
+          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' },
+          { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' }
         ]
     steps:
       - name: Set Swap Space
@@ -75,7 +76,7 @@ jobs:
             echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
           fi
       
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -84,7 +85,7 @@ jobs:
         run: |
           curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
 
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-

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

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: activate
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
       with:
         submodules: recursive
 
@@ -35,13 +35,16 @@ jobs:
 
     -
       name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.22
+      uses: hendrikmuhs/ccache-action@v1.2
 
     - 
       name: Build ifcopenshell
       run: |
         mkdir build && cd build
         cmake \
+         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_STANDARD=17 \
          -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
          -DCMAKE_BUILD_TYPE=Release \
          -DCMAKE_PREFIX_PATH=/usr \
@@ -73,7 +76,7 @@ jobs:
         make package
       working-directory: build
     - name: Upload 
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -86,31 +89,31 @@ jobs:
     name: Docker Build, Tag, Push
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
       with:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v8.0.1
+      uses: actions/download-artifact@v4.1.7
       with:
         # Artifact name
         name: ifcos-artifacts
         path: artifacts/
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v4
+      uses: docker/setup-qemu-action@v1
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4        
+      uses: docker/setup-buildx-action@v1        
     - 
       name: Login to Dockerhub
-      uses: docker/login-action@v4 
+      uses: docker/login-action@v1 
       with:
         username: aecgeeks
         password: ${{ secrets.DOCKER_HUB_TOKEN }}
     - 
       name: Build container image
-      uses: docker/build-push-action@v7
+      uses: docker/build-push-action@v2
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313]
         config:
           - {
             name: "Windows 64bit",
@@ -34,10 +34,6 @@ jobs:
             name: "Linux 64bit",
             short_name: linux64
           }
-          - {
-            name: "Linux ARM 64bit",
-            short_name: linuxarm64
-          }
           - {
             name: "MacOS Intel 64bit",
             short_name: macos64
@@ -47,10 +43,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

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

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313]
         config:
           - {
             name: "Windows 64bit",
@@ -38,10 +38,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

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

@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'

.github/workflows/ci-ifcsverchok.yml

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'

.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@v6
-      - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v6
-        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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci.yml

@@ -34,17 +34,13 @@ jobs:
   compile-and-test:
     runs-on: ubuntu-22.04
     needs: activate
-    env:
-      # Colored output for cmake.
-      CLICOLOR_FORCE: "1"
-      CMAKE_COLOR_DIAGNOSTICS: "ON"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
             submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -53,16 +49,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
           pip install src/bcf --no-deps
-          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: |
           sudo apt update
-          # `occt-misc` is only needed for 22.04, since it has cmake configs.
-          # In 24.04+, the needed files were moved `libocct-foundation-dev` and `occt-misc` can be removed.
-          # Other libs in `OCCT_CMAKE_DEPS` are needed only for cmake config to work properly, they're not used directly.
-          OCCT_CMAKE_DEPS="occt-misc libocct-draw-dev tcl-dev tk-dev libxi-dev"
-
           sudo apt-get install --no-install-recommends \
           git cmake gcc g++ \
           libboost-date-time-dev \
@@ -72,26 +63,22 @@ jobs:
           libboost-regex-dev \
           libboost-system-dev \
           libboost-thread-dev \
-          libpcre3-dev libxml2-dev \
+          swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          ${OCCT_CMAKE_DEPS} \
           libhdf5-dev libcgal-dev libeigen3-dev
           
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.22
+        uses: hendrikmuhs/ccache-action@v1
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 
-      # RTTI is only enabled by default in Debug builds of rocksdb.
-      # Distros are using Release builds, so we're compiling it ourselves with RTTI forced on.
-      # https://github.com/facebook/rocksdb/blob/a3aa44a7167b8336f9bc15c8aba063260268ff68/CMakeLists.txt#L433
+      # 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 \
@@ -106,65 +93,6 @@ jobs:
             ..
           sudo make -j$(nproc) install
 
-      # OpenCOLLADA is ancient, but we still have it in the main build.
-      # So adding it to CI to catch any breakages.
-      - name: build OpenCOLLADA
-        run: |
-          git clone https://github.com/KhronosGroup/OpenCOLLADA
-          cd OpenCOLLADA
-          git checkout v1.6.68
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/pr622_and_disable_subdirs.patch
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/allow_static_libraries_config_on_unix.patch
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_FLAGS_INIT="-fPIC"
-          sudo make -j$(nproc) install
-
-      # We need zstd and libxml2 just for cmake config files to test the examples build.
-      # zslibzstd-dev has cmake config only on Ubuntu 24.04+.
-      - name : Build zstd
-        run: |
-          git clone https://github.com/facebook/zstd --depth 1 --branch v1.5.7
-          cd zstd
-          # `build` already exists.
-          mkdir build_ && cd build_
-          cmake ../build/cmake -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
-      # libxml2-dev doesn't have cmake configs even on Ubuntu 24.04+.
-      - name: Build libxml2
-        run: |
-          git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch v2.13.8 --depth 1
-          cd libxml2
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
-      # Ubuntu has `swig` package, but we build it to match the version we use in the main build.
-      # To avoid failing tests when checking stub generation.
-      - name: build swig
-        run: |
-          # Remove default swig to avoid conflicts.
-          sudo apt remove --purge swig swig4.0
-          sudo apt-get install -y libpcre2-dev bison
-          git clone https://github.com/swig/swig --branch v4.1.0 --depth 1
-          cd swig
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo make -j$(nproc) install
-
       - name: Build ifcopenshell
         run: |
           echo $Python3_ROOT_DIR
@@ -172,70 +100,47 @@ jobs:
           
           mkdir build && cd build
           cmake \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_STANDARD=17 \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
-               -DUSE_MMAP=On \
+               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
+               -DCOLLADA_SUPPORT=Off \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
                -DGLTF_SUPPORT=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 \
                -DWITH_ROCKSDB=On \
-               -DBUILD_EXAMPLES=ON \
              ../cmake
           sudo make -j $(nproc)
           sudo make install
 
-      # - name: Run IfcConvert on Sample files
-      #   run: |
-      #     (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
-      #       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: Build standalone examples to test cmake package
-        run: |
-          set -x
-          cd src/examples
-          mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build .
-          ./arbitrary_open_profile_def  && test -f arbitrary_open_profile_def.ifc
-          ./composite_profile_def       && test -f composite_profile_def.ifc
-          ./csg_primitive               && test -f csg_primitive.ifc
-          ./ellipse_pies                && test -f ellipse_pies.ifc
-          ./faces                       && test -f faces.ifc
-          ./ifc_curve_rebar             && test -f ifc_curve_rebar.ifc
-          ./profiles
-          test -f IfcUShapeProfileDef.ifc
-          test -f IfcTShapeProfileDef.ifc
-          test -f IfcZShapeProfileDef.ifc
-          test -f IfcEllipseProfileDef.ifc
-          test -f IfcIShapeProfileDef.ifc
-          test -f IfcLShapeProfileDef.ifc
-          test -f IfcCShapeProfileDef.ifc
-          test -f IfcCircleProfileDef.ifc
-          test -f IfcRectangleProfileDef.ifc
-          test -f IfcTrapeziumProfileDef.ifc
-          ./IfcParseExamples "../IfcParseExamples_test.ifc"
-          ./IfcOpenHouse                && test -f IfcOpenHouse.ifc
-          ./IfcAdvancedHouse            && test -f IfcAdvancedHouse.ifc 
-          ./IfcAlignment                && test -f IfcAlignment.ifc 
-          ./IfcSimplifiedAlignment      && test -f IfcSimplifiedAlignment.ifc
-          ./triangulated_faceset        && test -f triangulated_faceset.ifc 
 
       - name: Test ifcopenshell-python
         run: |
@@ -245,7 +150,7 @@ jobs:
           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
+          make test || ERROR=1
           cd ../bcf && make test || ERROR=1
           pip install requests
           cd ../bsdd && make test || ERROR=1
@@ -254,7 +159,6 @@ jobs:
           cd ../ifcpatch && make test || ERROR=1
           pip install -e ../ifctester --no-deps
           cd ../ifctester && make test || ERROR=1
-          make build-ids-docs || ERROR=1
           # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
           cd ../ifcopenshell-python
           pip install mathutils

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

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 

.github/workflows/docs-deployment.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 

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

@@ -26,15 +26,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout (recursive)
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
       - name: Setup Pages
-        uses: actions/configure-pages@v6
+        uses: actions/configure-pages@v5
       - name: Upload static files as artifact
         id: deployment
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v3
         with:
           path: src/pyodide/demo-app/
 
@@ -47,4 +47,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v5
+        uses: actions/deploy-pages@v4

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Install C++ dependencies
@@ -46,6 +46,7 @@ jobs:
           mkdir build && cd build
           cmake \
            -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
+           -DCMAKE_CXX_STANDARD=17 \
            -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_PREFIX_PATH=/usr \
            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \

.gitignore

@@ -4,9 +4,6 @@
 /_deps-vs*-x*-installed/
 /_installed-vs*-x*/
 /build/
-/src/examples/build/
-# ifctester docs output
-/src/ifctester/test/build/
 
 # output directories
 /cmake/out/
@@ -14,19 +11,15 @@
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/
-/src/ifctester/webapp/public/pyodide/
 
 /win/BuildDepsCache*.txt
 
 # General Python residue
 __pycache__
 *.py.bak
-venv
 
 # Visual Studio Code files
 .vscode
-!.vscode/launch.json
-!.vscode/tasks.json
 .vs
 
 # PyCharm files
@@ -83,14 +76,10 @@ src/ifcopenshell-python/test/build
 # bonsai i18n
 src/bonsai/bonsai/translations.py
 
-# bonsai external dependencies (cloned for just ty checks)
-src/bonsai/external_dependencies/
-
-# bonsai test temp/cache files
+# bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/*.cache.blend
-src/bonsai/test/files/*.cache.json
-src/bonsai/test/files/*.cache.sqlite
+src/bonsai/test/files/basic.ifc.cache.blend
+src/bonsai/test/files/basic.ifc.cache.sqlite
 
 # bonsai data
 src/bonsai/bonsai/bim/data/build/
@@ -98,7 +87,9 @@ src/bonsai/bonsai/bim/data/gantt/index.html
 src/bonsai/bonsai/bim/data/gantt/jsgantt.js
 src/bonsai/bonsai/bim/data/gantt/jsgantt.css
 src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js
-src/bonsai/bonsai/bim/data/webui/running_pid.json
+
+src/bonsai/drawings
+src/bonsai/layouts
 
 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
@@ -118,13 +109,4 @@ 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
-
-
-# temp files from AI coding tools
-*.claude
-*.py.tmp*
-*.json.tmp*
+.pixi/

.gitmodules

@@ -5,9 +5,15 @@
 [submodule "src/ifcopenshell-python/ifcopenshell/mvd"]
 	path = src/ifcopenshell-python/ifcopenshell/mvd
 	url = https://github.com/opensourceBIM/python-mvdxml/
+[submodule "src/svgfill"]
+	path = src/svgfill
+	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
 	url = https://github.com/IfcOpenShell/ids-test-files
+[submodule "src/ifcconvert/cityjson"]
+	path = src/ifcconvert/cityjson
+	url = https://github.com/IfcOpenShell/ifc-to-cityjson
 [submodule "docs/cpp-api/assets/doxygen-awesome-css"]
 	path = docs/cpp-api/assets/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
@@ -17,6 +23,3 @@
 [submodule "src/pyodide/demo-app/wheels"]
 	path = src/pyodide/demo-app/wheels
 	url = https://github.com/IfcOpenShell/wasm-wheels
-[submodule "src/svgfill/3rdparty/svgpp"]
-	path = src/svgfill/3rdparty/svgpp
-	url = https://github.com/svgpp/svgpp

.vscode/launch.json

@@ -1,24 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "name": "Python Debugger: Remote Attach",
-            "type": "debugpy",
-            "request": "attach",
-            "connect": {
-                "host": "localhost",
-                "port": 5678
-            },
-            "pathMappings": [
-                {
-                    "localRoot": "${config:bonsai.localRoot}",
-                    "remoteRoot": "${config:bonsai.remoteRoot}"
-                }
-            ]
-        }
-    ]
-}

.vscode/tasks.json

@@ -1,53 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Configure bonsai/vscode development environment",
-            "type": "shell",
-            "command": "${input:blenderPath}",
-            "args": [
-                "--background",
-                "--python", "${workspaceFolder}/src/bonsai/scripts/dev_environment_vscode_config.py"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Launch blender with debugpy",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--python-expr",
-                "import debugpy; debugpy.listen(5678)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Install debugpy in Blender",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--background",
-                "--python-expr",
-                "import os, sys, subprocess; path=os.path.abspath(sys.executable); subprocess.call([path, '-m', 'ensurepip']); subprocess.call([path, '-m', 'pip', 'install', '--upgrade', 'debugpy'])"
-            ],
-            "problemMatcher": []
-        }
-         
-    ],
-    "inputs": [
-        {
-            "id": "blenderPath",
-            "type": "promptString",
-            "description": "Enter the path to the blender executable",
-            "default": "blender"
-        }
-    ]
-}

AGENTS.md

@@ -1,153 +0,0 @@
-<!-- This file was generated with the assistance of an AI coding tool. -->
-
-# AGENTS.md
-
-Guidelines for AI coding agents contributing to IfcOpenShell. This file is
-intended to be read by all AI agents regardless of platform (Claude Code,
-Copilot, Cursor, etc.) in addition to any tool-specific configuration files.
-
-Human contributors using AI tools should also read this document carefully,
-as they are responsible for ensuring their contributions comply with these
-guidelines.
-
-## Project Overview
-
-IfcOpenShell is an open source library for working with Industry Foundation
-Classes (IFC). It provides C++ and Python APIs, geometry processing, and an
-ecosystem of tools including IfcConvert and the Bonsai Blender add-on.
-
-## Licensing
-
-All contributions must be compatible with the project's licensing:
-
-- **Library code** (everything except Bonsai): **LGPL-3.0-or-later**
-- **Bonsai** (`src/bonsai/`): **GPL-3.0-or-later**
-
-There is no Contributor License Agreement (CLA). By submitting a pull request,
-you agree that your contribution is licensed under the applicable license above.
-
-## Indicating AI-Generated Code
-
-Contributors must clearly indicate when code has been generated or
-substantially written by an AI tool.
-
-### Commits
-
-Commits that modify existing code must include a note in the **body** of the
-commit message (not the subject line) indicating that the change was
-AI-generated. For example:
-
-```
-Fix off-by-one error in element iteration
-
-The loop termination condition was incorrect when processing
-IfcRelAggregates relationships.
-
-Generated with the assistance of an AI coding tool.
-```
-
-### New Files
-
-New files that are AI-generated must include a comment near the top of the
-file indicating this. Use the appropriate comment syntax for the language:
-
-```python
-# This file was generated with the assistance of an AI coding tool.
-```
-
-```cpp
-// This file was generated with the assistance of an AI coding tool.
-```
-
-### Pull Requests
-
-Pull requests containing AI-generated code must indicate in the PR description
-which parts of the contribution are AI-generated. If the entire PR is
-AI-generated, state that clearly. If only specific commits or files are
-AI-generated, identify them.
-
-## Pull Request Guidelines
-
-### Scope and Size
-
-- Each pull request should address a **single issue or feature**.
-- Do not mix unrelated changes (e.g., bug fixes with refactoring or style
-  changes) in the same PR.
-- Large pull requests should be broken down into **multiple small, standalone
-  commits** that are each easy to review independently. Rewrite commit history
-  for this purpose if necessary.
-- PRs that are minimal, focused solutions to a specific problem are much more
-  likely to be accepted.
-
-### What to Avoid
-
-- **Over-engineering**: Do not add features, abstractions, or configurability
-  beyond what is needed to solve the immediate problem.
-- **Scope creep**: Do not make changes to files or code that are not directly
-  related to the task at hand.
-- **Unnecessary additions**: Do not add docstrings, comments, type annotations,
-  or error handling to code you did not otherwise need to change.
-- **Cosmetic changes**: Do not reformat, rename, or reorganize code that is
-  unrelated to your change.
-
-## Commit Messages
-
-- The **subject line** must be **50 characters or less**.
-- Use the **imperative mood** (e.g., "Fix crash in geometry kernel", not
-  "Fixed crash" or "Fixes crash").
-- A commit message can be a single line if the purpose is obvious from the
-  subject alone.
-- Otherwise, add a blank line after the subject followed by a short explanation
-  of a few lines in the body.
-
-## Code Style
-
-### Python
-
-- **Line length**: 120 characters
-- **Formatter**: black
-- **Linter**: ruff
-- Configuration is in `pyproject.toml`
-
-### C++
-
-- **Standard**: C++17 minimum
-- **Formatter**: clang-format (configuration in `.clang-format`)
-- **Linter**: clang-tidy (configuration in `.clang-tidy`)
-
-Run linters and formatters **before submitting** your pull request. Do not rely
-on CI to catch formatting issues.
-
-## Testing
-
-- Pull requests with test coverage are **much more likely to be merged**.
-- If tests are appropriate and feasible for your change, they should be
-  included.
-- Tests are not required for every change (e.g., documentation-only changes),
-  but the expectation is that testable code changes come with tests.
-- Python tests use **pytest** and are located in `test/` or `tests/` directories
-  within each package under `src/`.
-- Run the existing test suite for the package you modified before submitting.
-
-## Architecture Quick Reference
-
-### Directory Structure
-
-- `src/ifcparse/` — C++ IFC file parsing
-- `src/ifcgeom/` — C++ geometry processing (OpenCASCADE and CGAL kernels)
-- `src/serializers/` — Output format serializers (glTF, Collada, SVG, etc.)
-- `src/ifcwrap/` — SWIG Python bindings
-- `src/ifcconvert/` — CLI conversion tool
-- `src/ifcopenshell-python/` — Python API (`ifcopenshell` package)
-- `src/bonsai/` — Blender add-on (GPL-3.0-or-later)
-- `src/ifctester/` — IDS model auditing
-- `src/ifcpatch/` — IFC file manipulation scripts
-- `src/ifcdiff/` — IFC model comparison
-- `src/ifcclash/` — Clash detection
-- `src/ifccsv/` — Schedule import/export
-
-### IFC Schema Versions
-
-The library supports IFC2x3 TC1, IFC4 Add2 TC1, IFC4x1, IFC4x2, and
-IFC4x3 Add2. Schema-specific code is compiled conditionally. Be aware of
-which schema versions your change affects.

README.md

@@ -37,25 +37,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) [Pyodide WASM Wheels](https://github.com/IfcOpenShell/wasm-wheels#pyodide-test-wheels) |
-| [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [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.5
+0.8.4

aws/lambda/example_handler/__init__.py

@@ -1,6 +1,6 @@
-import boto3
 import ifcopenshell
 import ifcopenshell.util.element
+import boto3
 
 s3 = boto3.client('s3')
 

choco/bonsai/choco_release.py

@@ -13,15 +13,13 @@ import hashlib
 import os
 import pathlib
 import re
-import subprocess
-from typing import NoReturn
 from urllib import request
-
 from github import Github
+from typing import NoReturn
 
 
 def get_repo_tag_names() -> list[str]:
-    git_return = subprocess.check_output("git tag -l", text=True)
+    git_return = os.popen("git tag -l").read()
     tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
     print(f"{len(tag_names)} tag_names found in repo")
     return tag_names
@@ -79,10 +77,6 @@ def get_release_zip(tag: str) -> tuple[str, str]:
     raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
 
 
-def run(command: str) -> None:
-    subprocess.check_output(command)
-
-
 start = datetime.datetime.now()
 
 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
@@ -102,7 +96,7 @@ should_release = False
 target_release_tag = ""
 TARGET_OS = "windows-x64"
 
-git_status = subprocess.check_output("git status", text=True)
+git_status = os.popen("git status").read()
 print(git_status)
 
 for tag_name in get_repo_tag_names():
@@ -152,7 +146,7 @@ blenderbim_build_version = target_release_tag.replace("blenderbim-", "")
 
 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-subprocess.check_call(f"wget {url_blenderbim_py3x_win_zip} --no-verbose")
+os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
 
 # sha256sum_blenderbim_py310_win_zip
 sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
@@ -206,13 +200,13 @@ print("[INFO] inserting dynamic chocolatey package parameters successful")
 print("\n_____ build choco.exe with mono")
 
 choco_version = "1.1.0"
-run(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet")
-run(f"tar -xzf {choco_version}.tar.gz")
+os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
+os.popen(f"tar -xzf {choco_version}.tar.gz").read()
 print("choco tar unpack successful")
 os.chdir("choco-1.1.0")
-run("./build.sh")
+os.popen("./build.sh").read()
 
-run("cp -r build_output/chocolatey /opt/chocolatey")
+os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
 os.chdir(BLENDERBIM_DIR)
 
 if pathlib.Path("/opt/chocolatey/choco.exe").exists():
@@ -220,15 +214,11 @@ if pathlib.Path("/opt/chocolatey/choco.exe").exists():
 
 print("\n_____ build choco pack")
 
-run("mono /opt/chocolatey/choco.exe pack --allow-unofficial")
-run(
-    'mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial'
-)
+os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
+os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()
 
 print("\n_____ build choco push")
-run(
-    'mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose'
-)
+os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()
 
 print(f"choco push of version: {target_release_tag} successful!")
 print(f"it took: {datetime.datetime.now() - start}")

choco/bonsai/tools/disable_blenderbim_addon.py

@@ -1,5 +1,6 @@
 import bpy
 
+
 bpy.ops.preferences.addon_disable(module='blenderbim')
 bpy.ops.wm.save_userpref()
 

choco/bonsai/tools/enable_blenderbim_addon.py

@@ -1,5 +1,6 @@
 import bpy
 
+
 bpy.ops.preferences.addon_enable(module='blenderbim')
 bpy.ops.wm.save_userpref()
 

cmake/CMakePresets.json

@@ -17,6 +17,7 @@
         "IFCXML_SUPPORT": "ON",
         "HDF5_SUPPORT": "ON",
         "SCHEMA_VERSIONS": "4x3_add2",
+        "CITYJSON_SUPPORT": "OFF",
         "CMAKE_GENERATOR_PLATFORM": "",
         "CMAKE_GENERATOR_TOOLSET": ""
       }

cmake/FindCGAL.cmake

@@ -1,68 +0,0 @@
-#
-# Input variables:
-# - `CGAL_INCLUDE_DIR`
-# - `CGAL_LIBRARY_DIR`
-# - `GMP_INCLUDE_DIR`
-# - `GMP_LIBRARY_DIR`
-# - `MPFR_INCLUDE_DIR`
-# - `MPFR_LIBRARY_DIR`
-# If input variables are not specified, try to find HDF5 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `IFCOPENSHELL_CGAL`
-#
-
-if(TARGET IFCOPENSHELL_CGAL)
-    return()
-endif()
-
-UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
-
-if(CGAL_INCLUDE_DIR)
-    find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-    find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
-    if(NOT libGMP)
-        message(FATAL_ERROR "Unable to find GMP library files, aborting")
-    endif()
-    if(NOT libMPFR)
-        message(FATAL_ERROR "Unable to find MPFR library files, aborting")
-    endif()
-
-    add_library(CGAL::CGAL INTERFACE IMPORTED)
-    target_include_directories(CGAL::CGAL INTERFACE "${CGAL_INCLUDE_DIR}")
-    target_include_directories(CGAL::CGAL INTERFACE "${GMP_INCLUDE_DIR}" "${MPFR_INCLUDE_DIR}")
-    target_link_libraries(CGAL::CGAL INTERFACE "${libMPFR}" "${libGMP}")
-else()
-    # CGAL is not respecting default Boost_USE_STATIC_LIBS value
-    # and sometiems it's getting in the way.
-    if(NOT DEFINED Boost_USE_STATIC_LIBS)
-        set(CGAL_Boost_USE_STATIC_LIBS OFF)
-    else()
-        set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
-    endif()
-    # Annoyingly this is producing CMP0167 boost warnings, because it's unsetting cmake policies
-    # and using FindBoost module. But there's nothing we can do about it,
-    # since everything happens in the scope of CGAL config. I guess it's be resolved in CGAL 6.1.0.
-    find_package(CGAL CONFIG)
-    if(NOT CGAL_FOUND)
-        message(
-            FATAL_ERROR
-            "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
-        )
-    endif()
-    message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
-endif()
-
-# Adding another `IFCOPENSHELL_CGAL` target, because we want to add compile definitions to it,
-# but in `CGALconfig.cmake` `CGAL::CGAL` is an alias, so you can't add properties to it.
-add_library(IFCOPENSHELL_CGAL INTERFACE)
-target_link_libraries(IFCOPENSHELL_CGAL INTERFACE CGAL::CGAL)
-target_compile_definitions(IFCOPENSHELL_CGAL INTERFACE IFOPSH_WITH_CGAL)
-set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
-install(TARGETS IFCOPENSHELL_CGAL EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})

cmake/FindEigen3.cmake

@@ -1,27 +0,0 @@
-#
-# Input variables:
-# - `EIGEN_DIR`
-# If input variables are not specified, try to find Eigen3 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `Eigen3::Eigen`
-
-UNIFY_ENVVARS_AND_CACHE(EIGEN_DIR)
-
-if(EXISTS "${EIGEN_DIR}")
-    # Mimic Eigen3Config.cmake target.
-    add_library(Eigen3::Eigen INTERFACE IMPORTED)
-    target_include_directories(Eigen3::Eigen INTERFACE "${EIGEN_DIR}")
-else()
-    find_package(Eigen3 CONFIG)
-    if(Eigen3_DIR)
-        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
-    else()
-        message(
-            FATAL_ERROR
-            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
-            "Also couldn't find Eigen3 as a package."
-        )
-    endif()
-endif()

cmake/FindHDF5.cmake

@@ -1,109 +0,0 @@
-#
-# Input variables:
-# - `HDF5_INCLUDE_DIR`
-# - `HDF5_LIBRARY_DIR`
-# - `HDF5_LIBRARIES`
-# If input variables are not specified, try to find HDF5 config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `HDF5_INCLUDE_DIR`
-# - `HDF5_LIBRARY_DIR`
-# - `HDF5_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-if(NOT HDF5_INCLUDE_DIR)
-    message(STATUS "No HDF5 include directory specified")
-else()
-    set(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
-endif()
-
-if(NOT HDF5_LIBRARY_DIR)
-    message(STATUS "No HDF5 library directory specified")
-else()
-    set(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
-endif()
-
-if(HDF5_LIBRARY_DIR)
-    # result of the HDF5 ctest package
-    # Find zlib using cmake find_library. How should this be implemented?
-    # FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
-    if(NOT DEFINED ENV{CONDA_BUILD})
-        # result of the HDF5 ctest package
-        if(WIN32)
-            set(zlib_post lib)
-            set(lib_ext lib)
-        else()
-            set(lib_ext a)
-        endif()
-
-        if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-            set(debug_postfix "_debug")
-        endif()
-
-        set(HDF5_LIBRARIES
-            "${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libz${zlib_post}${debug_postfix}.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
-        )
-    else()
-        message(STATUS "Packaging hdf5 and zlib for conda distribution")
-
-        if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-            # macOS
-            set(zlib_post libz)
-            set(lib_ext dylib)
-            set(HDF5_LIBRARIES
-                "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
-            )
-        else()
-            # linux and windows
-            # Find HDF5 package
-            find_package(HDF5 REQUIRED COMPONENTS C CXX)
-            # Find ZLIB package
-            find_package(ZLIB REQUIRED)
-            # Include directories
-            include_directories(${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-            # Link libraries
-            set(HDF5_LIBRARIES ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES})
-            message(STATUS "HDF5 libraries: ${HDF5_LIBRARIES}")
-        endif()
-    endif()
-endif()
-
-if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
-    # First try to find it as a config.
-    find_package(HDF5 CONFIG)
-    mark_as_advanced(HDF5_DIR)
-    if(HDF5_DIR)
-        message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
-        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()
-endif()
-
-# Restore module path.
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindLibXml2.cmake

@@ -1,47 +0,0 @@
-#
-# Input variables:
-# - `LIBXML2_INCLUDE_DIR`
-# - `LIBXML2_LIBRARIES`
-# If input variables are not specified, try to find LibXml2 config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `LibXml2::LibXml2`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
-
-if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
-    # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04)
-    # CONFIG is provided using root path, so no need to clear sysroot here.
-    find_package(LibXml2 QUIET CONFIG)
-
-    if(NOT LibXml2_FOUND)
-        # Fallback to CMake's builtin FindLibXml2 module (works on Ubuntu)
-        find_package(LibXml2 REQUIRED)
-    else()
-        message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
-    endif()
-else()
-    find_package(LibXml2 REQUIRED)
-    if(MSVC)
-        # Unset `IMPORTED_LOCATION` and set it manually.
-        set_property(TARGET LibXml2::LibXml2 PROPERTY IMPORTED_LOCATION)
-        get_release_variant(LIBXML2_RELEASE_LIB "${LIBXML2_LIBRARIES}" "d")
-        get_debug_variant(LIBXML2_DEBUG_LIB "${LIBXML2_LIBRARIES}" "d")
-        set_target_properties(
-            LibXml2::LibXml2
-            PROPERTIES
-                IMPORTED_CONFIGURATIONS "Release;Debug"
-                IMPORTED_LOCATION_RELEASE "${LIBXML2_RELEASE_LIB}"
-                IMPORTED_LOCATION_DEBUG "${LIBXML2_DEBUG_LIB}"
-        )
-    endif()
-endif()
-
-# Restore module path.
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindOpenCASCADE.cmake

@@ -1,191 +0,0 @@
-#
-# Input variables:
-# - `OCC_INCLUDE_DIR`
-# - `OCC_LIBRARY_DIR`
-# If input variables are not specified, try to find OpenCASCADE config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables
-# - `OpenCASCADE_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
-
-if(OCC_INCLUDE_DIR)
-    set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
-    message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
-endif()
-
-if(OCC_LIBRARY_DIR)
-    set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
-    message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-endif()
-
-if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-    # OCE is not supported for find_package, because it's using a different name (`oce`)
-    # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
-    # find_package creates variables:
-    # - `OpenCASCADE_INCLUDE_DIR`
-    # - `OpenCASCADE_LIBRARIES`
-
-    # OpenCASCADE may be built with VTK support. Try to find VTK first to avoid
-    # CMake errors when OpenCASCADE's config references VTK targets.
-    find_package(VTK QUIET)
-    mark_as_advanced(VTK_DIR)
-
-    find_package(OpenCASCADE CONFIG REQUIRED)
-    mark_as_advanced(OpenCASCADE_DIR)
-    message(STATUS "Found OpenCASCADE config: ${OpenCASCADE_DIR}")
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-
-    if(
-        OpenCASCADE_VERSION VERSION_LESS "7.9.0"
-        AND CMAKE_VERSION GREATER_EQUAL "3.24"
-        AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-    )
-        # Before 7.9.0 targets in OCCT cmake configs are not linked to each other
-        # leading to missing symbols on Unix. Link them as a single group as a workaround.
-        # Only needed for gcc, because other compilers (e.g. Apple Clang, MSVC) do rescan automatically.
-        set(OpenCASCADE_LIBRARIES "$<LINK_GROUP:RESCAN,${OpenCASCADE_LIBRARIES}>")
-    endif()
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.9.0" AND WIN32)
-        # Bug in OCCT cmake configs < 7.9.0 - missing linked library.
-        list(APPEND OpenCASCADE_LIBRARIES WSOCK32.lib)
-    endif()
-
-    return()
-endif()
-
-# No specific paths specified, try to find package.
-if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
-    message(
-        STATUS
-        "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-        "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
-    )
-    # Parse OCC_VERSION_STRING.
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR REGEX "#define OCC_VERSION_MAJOR.*")
-    string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR REGEX "#define OCC_VERSION_MINOR.*")
-    string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT REGEX "#define OCC_VERSION_MAINTENANCE.*")
-    string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
-    set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-else()
-    message(
-        FATAL_ERROR
-        "Couldn't find Open CASCADE installation. "
-        "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-        "must be specified or OpenCASCADE package should be discoverable. "
-        "If you're using OCE, then providing a package is not available "
-        "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
-    )
-endif()
-
-set(OpenCASCADE_LIBRARIES
-    TKernel
-    TKMath
-    TKBRep
-    TKGeomBase
-    TKGeomAlgo
-    TKG3d
-    TKG2d
-    TKShHealing
-    TKTopAlgo
-    TKMesh
-    TKPrim
-    TKBool
-    TKBO
-    TKFillet
-    TKXSBase
-    TKOffset
-    TKHLR
-    # @todo investigate the exact conditions when this is necessary
-    TKBin
-)
-
-if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(
-        APPEND OpenCASCADE_LIBRARIES
-        TKIGES
-        TKSTEPBase
-        TKSTEPAttr
-        TKSTEP209
-        TKSTEP
-    )
-else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OpenCASCADE_LIBRARIES TKDESTEP TKDEIGES)
-endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-
-find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
-
-if(libTKernel)
-    message(STATUS "Required Open Cascade Library files found")
-else()
-    message(FATAL_ERROR "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting")
-endif()
-
-if(MSVC)
-    add_definitions(-DHAVE_NO_DLL)
-    add_debug_variants(OpenCASCADE_LIBRARIES "${OpenCASCADE_LIBRARIES}" d)
-endif()
-
-if(WIN32)
-    # OCC might require linking to Winsock depending on the version and build configuration
-    list(APPEND OpenCASCADE_LIBRARIES ws2_32.lib)
-endif()
-
-# Make sure cross-referenced symbols between static OCC libraries get
-# resolved. Also add thread and rt libraries.
-get_filename_component(libTKernelExt ${libTKernel} EXT)
-if("${libTKernelExt}" STREQUAL ".a")
-    set(OCCT_STATIC ON)
-endif()
-
-if(OCCT_STATIC)
-    find_package(Threads)
-
-    if(WASM_BUILD)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    else()
-        # OpenCASCADE_LIBRARIES repeated N times below in order to fix cyclic dependencies
-        # tfk: --start-group ... --end-group didn't work on the apple linker when last tested
-        if(APPLE)
-            set(OpenCASCADE_LIBRARIES
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
-        else()
-            set(OpenCASCADE_LIBRARIES
-                -Wl,--start-group
-                ${OpenCASCADE_LIBRARIES}
-                -Wl,--end-group
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
-        endif()
-    endif()
-
-    if(NOT APPLE AND NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "rt")
-    endif()
-    if(NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "dl")
-    endif()
-endif()
-
-add_library(OpenCASCADE_INTERFACE INTERFACE)
-target_include_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_INCLUDE_DIR}")
-target_link_libraries(OpenCASCADE_INTERFACE INTERFACE ${OpenCASCADE_LIBRARIES})
-target_link_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_LIBRARY_DIR}")
-set(OpenCASCADE_LIBRARIES OpenCASCADE_INTERFACE)
-install(TARGETS OpenCASCADE_INTERFACE EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})

cmake/FindOpenCOLLADA.cmake

@@ -1,145 +0,0 @@
-#
-# Input variables:
-# - `OPENCOLLADA_INCLUDE_DIR`
-# - `OPENCOLLADA_LIBRARY_DIR`
-# - `PCRE_LIBRARY_DIR`
-# If input variables are not specified, try to find OpenCOLLADA config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `OPENCOLLADA_INCLUDE_DIR`
-# - `OPENCOLLADA_LIBRARY_DIR`
-# - `OPENCOLLADA_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR)
-
-if(NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR)
-    # If package is found, automatically sets
-    # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
-    find_package(OpenCOLLADA CONFIG)
-    mark_as_advanced(OpenCOLLADA_DIR)
-    if(OpenCOLLADA_DIR)
-        message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
-        set(OPENCOLLADA_FOUND TRUE)
-    else()
-        message(STATUS "OpenCOLLADA package not found, falling back to manual search.")
-    endif()
-endif()
-
-if(NOT OpenCOLLADA_DIR)
-    # Find OpenCOLLADA
-    if("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
-        message(STATUS "No OpenCOLLADA include directory specified")
-        set(OPENCOLLADA_INCLUDE_DIR "/usr/include/opencollada" CACHE FILEPATH "OpenCOLLADA header files")
-    else()
-        set(OPENCOLLADA_INCLUDE_DIR "${OPENCOLLADA_INCLUDE_DIR}" CACHE FILEPATH "OpenCOLLADA header files")
-    endif()
-
-    if("${OPENCOLLADA_LIBRARY_DIR}" STREQUAL "")
-        message(STATUS "No OpenCOLLADA library directory specified")
-        find_library(
-            OPENCOLLADA_FRAMEWORK_LIB
-            NAMES OpenCOLLADAFramework
-            PATHS /usr/lib64/opencollada /usr/lib/opencollada /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
-        )
-        get_filename_component(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_FRAMEWORK_LIB} PATH)
-    endif()
-
-    find_library(
-        OpenCOLLADAFramework
-        NAMES OpenCOLLADAFramework OpenCOLLADAFrameworkd
-        PATHS ${OPENCOLLADA_LIBRARY_DIR}
-        NO_DEFAULT_PATH
-    )
-
-    if(OpenCOLLADAFramework)
-        message(STATUS "OpenCOLLADA library files found")
-    else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA libraries. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
-    endif()
-
-    set(OPENCOLLADA_LIBRARY_DIR "${OPENCOLLADA_LIBRARY_DIR}" CACHE FILEPATH "OpenCOLLADA library files")
-
-    set(OPENCOLLADA_INCLUDE_DIRS
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils"
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter"
-    )
-
-    find_file(COLLADASWStreamWriter_h "COLLADASWStreamWriter.h" ${OPENCOLLADA_INCLUDE_DIRS})
-
-    if(COLLADASWStreamWriter_h)
-        message(STATUS "OpenCOLLADA header files found")
-        set(OPENCOLLADA_FOUND TRUE)
-
-        set(OPENCOLLADA_LIBRARY_NAMES
-            GeneratedSaxParser
-            MathMLSolver
-            OpenCOLLADABaseUtils
-            OpenCOLLADAFramework
-            OpenCOLLADASaxFrameworkLoader
-            OpenCOLLADAStreamWriter
-            UTF
-            buffer
-            ftoa
-        )
-
-        # Use the found OpenCOLLADAFramework as a template for all other OpenCOLLADA libraries
-        foreach(lib ${OPENCOLLADA_LIBRARY_NAMES})
-            # Make sure we'll handle the Windows/MSVC debug postfix convention too.
-            string(REPLACE OpenCOLLADAFrameworkd "${lib}" lib_path "${OpenCOLLADAFramework}")
-            string(REPLACE OpenCOLLADAFramework "${lib}" lib_path "${lib_path}")
-            list(APPEND OPENCOLLADA_LIBRARIES "${lib_path}")
-        endforeach()
-
-        if("${PCRE_LIBRARY_DIR}" STREQUAL "")
-            if(WIN32)
-                find_library(pcre_library NAMES pcre pcred PATHS ${OPENCOLLADA_LIBRARY_DIR} NO_DEFAULT_PATH)
-            else()
-                find_library(pcre_library NAMES pcre PATHS ${OPENCOLLADA_LIBRARY_DIR})
-            endif()
-
-            get_filename_component(PCRE_LIBRARY_DIR ${pcre_library} PATH)
-        else()
-            find_library(pcre_library NAMES pcre pcred PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH)
-        endif()
-
-        if(pcre_library)
-            set(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR})
-
-            if(MSVC)
-                # Add release lib regardless whether release or debug found. Debug version will be appended below.
-                list(APPEND OPENCOLLADA_LIBRARIES "${PCRE_LIBRARY_DIR}/pcre.lib")
-            else()
-                list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
-            endif()
-        else()
-            message(
-                FATAL_ERROR
-                "COLLADA_SUPPORT enabled, but unable to find PCRE. "
-                "Disable COLLADA_SUPPORT or fix PCRE_LIBRARY_DIR path to proceed."
-            )
-        endif()
-
-        if(MSVC)
-            add_debug_variants(OPENCOLLADA_LIBRARIES "${OPENCOLLADA_LIBRARIES}" d)
-        endif()
-    else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
-    endif()
-endif(NOT OpenCOLLADA_DIR)
-
-if(OPENCOLLADA_FOUND)
-    add_definitions(-DWITH_OPENCOLLADA)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
-endif()

cmake/FindPROJ.cmake

@@ -1,56 +0,0 @@
-#
-# Input variables:
-# - `PROJ_INCLUDE_DIR`
-# - `PROJ_LIBRARIES`
-# If input variables are not specified, try to find PROJ config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `PROJ::proj`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(PROJ_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(PROJ_LIBRARIES)
-
-if((NOT PROJ_INCLUDE_DIR AND NOT PROJ_LIBRARIES))
-    find_package(PROJ QUIET CONFIG)
-
-    if(NOT PROJ_FOUND)
-        find_path(PROJ_INCLUDE_DIR proj.h PATHS /usr/include/proj REQUIRED)
-        if(PROJ_INCLUDE_DIR)
-            message(STATUS "Found PROJ include files in: ${PROJ_INCLUDE_DIR}")
-        else()
-            message(FATAL_ERROR "Unable to find PROJ include directory, specify PROJ_INCLUDE_DIR manually.")
-        endif()
-
-        find_library(PROJ_LIBRARY NAMES proj PATHS /usr/lib/x86_64-linux-gnu)
-        if(PROJ_LIBRARY)
-            message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-            set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-        else()
-            message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-        endif()
-
-        add_library(PROJ::proj INTERFACE IMPORTED)
-        target_include_directories(PROJ::proj INTERFACE "${PROJ_INCLUDE_DIR}")
-        target_link_libraries(PROJ::proj INTERFACE ${PROJ_LIBRARIES})
-        target_link_directories(PROJ::proj INTERFACE "${PROJ_LIBRARY}")
-    endif()
-else()
-    find_library(PROJ_LIBRARY NAMES proj PATHS ${PROJ_LIBRARY_DIR})
-    if(PROJ_LIBRARY)
-        message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-        set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-    else()
-        message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-    endif()
-
-    set(PROJ_INCLUDE_DIR ${PROJ_INCLUDE_DIR} CACHE FILEPATH "PROJ header files")
-    message(STATUS "Looking for PROJ include files in: ${PROJ_INCLUDE_DIR}")
-    include_directories(${PROJ_INCLUDE_DIR})
-endif()
-
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindUSD.cmake

@@ -1,86 +0,0 @@
-#
-# Input variables:
-# - `USD_INCLUDE_DIR`
-# - `USD_LIBRARY_DIR`
-# - `TBB_INCLUDE_DIR`
-# - `TBB_LIBRARY_DIR`
-# Input variables could also be provided as environment variables.
-# If `USD_INCLUDE_DIR` and `USD_LIBRARY_DIR` are not provided,
-# try to find USD by locating its config file.
-#
-# Output targets:
-# - `pxr::USD`
-
-UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_LIBRARY_DIR)
-
-if(NOT USD_LIBRARY_DIR AND NOT USD_INCLUDE_DIR)
-    find_package(pxr CONFIG)
-    if(pxr_FOUND)
-        add_library(pxr::USD INTERFACE IMPORTED)
-        target_link_libraries(pxr::USD INTERFACE ${PXR_LIBRARIES})
-        include(FindPackageHandleStandardArgs)
-        find_package_handle_standard_args(USD REQUIRED_VARS pxr_DIR)
-        return()
-    endif()
-endif()
-
-if(NOT USD_INCLUDE_DIR)
-    find_path(USD_INCLUDE_DIR pxr.h PATHS /usr/include/pxr /usr/local/include/pxr REQUIRED)
-    if(USD_INCLUDE_DIR)
-        message(STATUS "Found USD include files in: ${USD_INCLUDE_DIR}")
-    else()
-        message(FATAL_ERROR "Unable to find USD include directory, specify USD_INCLUDE_DIR manually.")
-    endif()
-else()
-    set(USD_INCLUDE_DIR ${USD_INCLUDE_DIR} CACHE FILEPATH "USD header files")
-    message(STATUS "Looking for USD include files in: ${USD_INCLUDE_DIR}")
-endif()
-
-set(USD_LIBRARIES
-    usd_usd
-    usd_usdGeom
-    usd_usdShade
-    usd_usdLux
-    usd_vt
-    usd_sdf
-    usd_tf
-    usd_gf
-    usd_kind
-    usd_pcp
-    usd_arch
-    usd_ar
-    usd_plug
-    usd_js
-    usd_sdr
-    usd_work
-    usd_trace
-    usd_ndr
-    usd_ts
-)
-
-find_library(USD_LIBRARY NAMES ${USD_LIBRARIES} PATHS ${USD_LIBRARY_DIR})
-if(USD_LIBRARY)
-    message(STATUS "USD libraries ${USD_LIBRARIES} found in: ${USD_LIBRARY_DIR}")
-    link_directories(${USD_LIBRARY_DIR})
-else()
-    message(FATAL_ERROR "Unable to find USD libraries in: ${USD_LIBRARY_DIR}")
-endif()
-
-add_library(pxr::USD INTERFACE IMPORTED)
-target_link_directories(pxr::USD INTERFACE ${USD_LIBRARY_DIR} ${TBB_LIBRARY_DIR})
-target_include_directories(pxr::USD INTERFACE ${USD_INCLUDE_DIR} ${TBB_INCLUDE_DIR})
-
-# We don't link TBB libraries - on Windows they're provided using `pragma(lib)`.
-# On Unix there's no `pragma(lib)`, so in theory it will break.
-target_link_libraries(pxr::USD INTERFACE ${USD_LIBRARIES})
-
-if(MSVC)
-    target_link_libraries(pxr::USD INTERFACE debug DbgHelp.lib)
-endif()
-
-target_compile_definitions(pxr::USD INTERFACE PXR_STATIC WITH_USD)
-
-set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)

cmake/Findnlohmann_json.cmake

@@ -1,30 +0,0 @@
-#
-# Input variables:
-# - `JSON_INCLUDE_DIR`
-# If input variables are not specified, try to find nlohmann_json config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `nlohmann_json::nlohmann_json`
-
-UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-
-if(NOT JSON_INCLUDE_DIR)
-    find_package(nlohmann_json CONFIG)
-    mark_as_advanced(nlohmann_json)
-    if(nlohmann_json_DIR)
-        return()
-    endif()
-endif()
-
-find_path(json_header_path "nlohmann/json.hpp" HINTS "${JSON_INCLUDE_DIR}")
-mark_as_advanced(json_header_path)
-
-if(json_header_path)
-    message(STATUS "JSON for Modern C++ header file found in '${json_header_path}'.")
-    add_library(nlohmann_json::nlohmann_json INTERFACE IMPORTED)
-    target_include_directories(nlohmann_json::nlohmann_json INTERFACE ${json_header_path})
-    return()
-endif()
-
-message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")

cmake/IfcOpenShellConfig.cmake.in

@@ -1,63 +0,0 @@
-@PACKAGE_INIT@
-
-# Variable to inspect installed schema versions.
-set(IFCOPENSHELL_SCHEMA_VERSIONS @SCHEMA_VERSIONS@)
-
-set(IFCOPENSHELL_WITH_OPENCASCADE @WITH_OPENCASCADE@)
-set(IFCOPENSHELL_WITH_CGAL @WITH_CGAL@)
-set(IFCOPENSHELL_IFCXML @IFCXML_SUPPORT@)
-set(IFCOPENSHELL_WITH_ROCKSDB @WITH_ROCKSDB@)
-
-include(CMakeFindDependencyMacro)
-
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_COMPONENTS
-    system
-    program_options
-    regex
-    thread
-    date_time
-    iostreams
-)
-find_dependency(Boost CONFIG COMPONENTS ${Boost_COMPONENTS})
-find_dependency(Eigen3 CONFIG)
-
-if(IFCOPENSHELL_WITH_ROCKSDB)
-    find_dependency(zstd CONFIG)
-
-    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
-    # find it's zstd dependency on Windows.
-    # Only do it on Windows, otherwise it might create problems as
-    # findzstd and zstd-config target names do not match.
-    # https://github.com/facebook/rocksdb/pull/13975
-    if(WIN32)
-        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-    endif()
-    find_dependency(RocksDB CONFIG)
-    if(WIN32)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
-    endif()
-endif()
-
-if(IFCOPENSHELL_IFCXML)
-    find_dependency(LibXml2 CONFIG)
-endif()
-
-if(IFCOPENSHELL_WITH_CGAL)
-    find_dependency(CGAL CONFIG)
-endif()
-
-if(IFCOPENSHELL_WITH_OPENCASCADE)
-    find_dependency(OpenCASCADE CONFIG)
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/@CONFIG_TARGETS_FILENAME@")
-
-check_required_components("@PROJECT_NAME@")

cmake/cmake_uninstall.cmake.in

@@ -25,12 +25,19 @@ file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")
 
 foreach(file ${files})
-    set(filepath "$ENV{DESTDIR}${file}")
-    message(STATUS "Uninstalling ${filepath}")
+    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
 
-    if(IS_SYMLINK "${filepath}" OR EXISTS "${filepath}")
-        file(REMOVE "${filepath}")
-    else(NOT EXISTS "${filepath}")
-        message(STATUS "File ${filepath} does not exist.")
+    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        exec_program(
+            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+            OUTPUT_VARIABLE rm_out
+            RETURN_VALUE rm_retval
+        )
+
+        if(NOT "${rm_retval}" STREQUAL 0)
+            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+        endif()
+    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
     endif()
 endforeach()

cmake/package_export.cmake

@@ -1,22 +0,0 @@
-set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(CONFIG_NAMESPACE "${PROJECT_NAME}")
-set(CONFIG_TARGETS_FILENAME ${PROJECT_NAME}Targets.cmake)
-set(CONFIG_VERSION_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-set(CONFIG_PACKAGE_INPUT "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in")
-set(CONFIG_PACKAGE_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
-
-# Allow linking against build directory.
-export(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} FILE ${CONFIG_TARGETS_FILENAME} NAMESPACE ${CONFIG_NAMESPACE}::)
-
-install(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} NAMESPACE ${CONFIG_NAMESPACE}:: DESTINATION "${CONFIG_PACKAGE_LOCATION}")
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(${CONFIG_VERSION_OUTPUT} COMPATIBILITY ExactVersion)
-
-configure_package_config_file(
-    ${CONFIG_PACKAGE_INPUT}
-    ${CONFIG_PACKAGE_OUTPUT}
-    INSTALL_DESTINATION ${CONFIG_PACKAGE_LOCATION}
-)
-
-install(FILES "${CONFIG_PACKAGE_OUTPUT}" "${CONFIG_VERSION_OUTPUT}" DESTINATION ${CONFIG_PACKAGE_LOCATION})

cmake/utilities.cmake

@@ -19,9 +19,8 @@
 
 # Create a cache entry if absent for environment variables
 macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if(NOT DEFINED ${VAR} AND DEFINED ENV{${VAR}} AND NOT ENV{${VAR}} STREQUAL "")
+    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
         set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-        mark_as_advanced(${VAR})
     endif()
 endmacro()
 
@@ -114,30 +113,6 @@ function(add_debug_variants NAME LIBRARIES POSTFIX)
     set(${NAME} ${LIBRARIES} PARENT_SCOPE)
 endfunction()
 
-# E.g.
-# - `get_release_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylib.lib"`
-# - `get_release_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylib.lib"`
-function(get_release_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if("${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$")
-        string(REPLACE "${DEBUG_SUFFIX}" "${RELEASE_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
-# E.g.
-# - `get_debug_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylibd.lib"`
-# - `get_debug_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylibd.lib"`
-function(get_debug_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if(NOT "${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$" AND "${LIBRARY}" MATCHES "${RELEASE_SUFFIX}$")
-        string(REPLACE "${RELEASE_SUFFIX}" "${DEBUG_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
 function(files_for_ifc_version IFC_VERSION RESULT_NAME)
     set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
     set(${RESULT_NAME}

conda/build.bat

@@ -9,6 +9,7 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
  -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
+ -D CMAKE_CXX_STANDARD=17 ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -41,8 +42,9 @@ cmake -G "Ninja" ^
  -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
  -D Boost_USE_STATIC_LIBS:BOOL=OFF ^
+ -D CITYJSON_SUPPORT:BOOL=OFF ^
  ../cmake
-
+ 
 if errorlevel 1 exit 1
 
 ninja install -j 1
@@ -51,4 +53,4 @@ if errorlevel 1 exit 1
 
 python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py
 
-if errorlevel 1 exit 1
+if errorlevel 1 exit 1

conda/build.sh

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

conda/update_version_init.py

@@ -1,8 +1,7 @@
-import argparse
 import re
+import argparse
 from pathlib import Path
 
-
 def update_version(file_path: str, version: str) -> None:
     """Update the version string in the given __init__.py file."""
     file_path = Path(file_path)

docs/conf.py

@@ -1,5 +1,4 @@
 import textwrap
-
 # The `extensions` list should already be in here from `sphinx-quickstart`
 extensions = [
     # there may be others here already, e.g. 'sphinx.ext.mathjax'

docs/cpp-api/CMakeLists.txt

@@ -1,10 +1,14 @@
 #Look for an executable called sphinx-build
-find_program(SPHINX_EXECUTABLE NAMES sphinx-build DOC "Path to sphinx-build executable")
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
 
 include(FindPackageHandleStandardArgs)
 
 #Handle standard arguments to find_package like REQUIRED and QUIET
-find_package_handle_standard_args(Sphinx "Failed to find sphinx-build executable" SPHINX_EXECUTABLE)
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)
 
 find_package(Doxygen REQUIRED)
 #find_package(Sphinx REQUIRED)
@@ -12,24 +16,25 @@ find_package(Doxygen REQUIRED)
 set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
 set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/docs/sphinx)
 
-message(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
+MESSAGE(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
 
 file(MAKE_DIRECTORY ./output/doxygen)
 
-if(DOXYGEN_FOUND)
-    add_custom_target(
-        Sphinx
-        ALL
-        COMMAND ${SPHINX_EXECUTABLE} -v -T -b html ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
-        COMMENT "Generating documentation with Sphinx"
-    )
+if (DOXYGEN_FOUND)
 
-    # add_custom_target(ifcopenshell_python_docs ALL
-    # COMMAND make html
-    # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
-    # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
-    # COMMENT "Generating documentation with Sphinx")
-else(DOXYGEN_FOUND)
-    message("Doxygen need to be installed to generate the doxygen documentation")
-endif(DOXYGEN_FOUND)
+add_custom_target(Sphinx ALL
+                  COMMAND
+                  ${SPHINX_EXECUTABLE} -v -T -b html
+				  ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
+				  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
+                  COMMENT "Generating documentation with Sphinx")
+					  
+# add_custom_target(ifcopenshell_python_docs ALL
+                  # COMMAND make html
+                  # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+				  # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+                  # COMMENT "Generating documentation with Sphinx")
+	
+else (DOXYGEN_FOUND)
+  message("Doxygen need to be installed to generate the doxygen documentation")
+endif (DOXYGEN_FOUND)

docs/generate_docs.py

@@ -1,10 +1,10 @@
 # This program requires doxygen, sphinx, breathe and exhale.
 
-import multiprocessing
 import os
+import sys
 import shutil
 import subprocess
-import sys
+import multiprocessing
 
 # some extra check to see if we can find sphinx in pypy bin dir
 sphinx_build = os.path.join(os.path.dirname(sys.executable), 'sphinx-build')

nix/build-all.py

@@ -31,7 +31,6 @@ Available arguments:
     ``-py-313`` - build for specific Python version
         (building for all supported Python version by default).
     ``-wasm`` - compile for wasm
-    ``-without-xxx`` - do not build dependency ``xxx`` (e.g. ``--without-swig``)
     ``-mac-cross-compile-intel`` - cross compile for Intel Mac on Apple Silicon host
     ``-shared`` - build shared libraries. By default will build static.
     ``-diskcleanup`` - clean up build directories after finishing building dependencies
@@ -51,11 +50,6 @@ Used environment variables:
     - ``IFCOS_SCHEMAS`` - schemas to be built; defaults to cmake default (IFC2X3; IFC4; IFC4X3_ADD2) - to be supplied as `2x3;4`
     - ``USE_OCCT`` - whether to use official Open CASCADE instead of Community Edition
     (`true` by default, any other value is considered `false`)
-    - ``WASM_PYTHON_PATH`` - path to WASM Python installation,
-    used to deduce `PYVERSION` (e.g. '3.13.2'), `PYTHONINCLUDE`,
-    `SIDE_MODULE_CFLAGS`, `SIDE_MODULE_LDFLAGS`.
-    Allows to build wasm without pyodide build environment, which can be useful for debugging build issues.
-    Example value: 'pyodide/cpython/installs/python-3.13.2'
     - ``ADD_COMMIT_SHA`` - if defined with any non-empty value then
     `ADD_COMMIT_SHA` and `VERSION_OVERRIDE` will be set to `ON` while configuring IfcOpenShell
 
@@ -75,63 +69,59 @@ Used environment variables:
 #                                                                             #
 #   for python37 to install correctly additionally:                           #
 #     * libffi(-dev[el])                                                      #
-#   for Python build we also needs ssl and zlib                               #
+#   for Python build we also needs ssl                                        #
 #   (since we do `pip install numpy` at the end)                              #
 #     * libssl-dev                                                            #
 #                                                                             #
 #     on debian 7.8 these can be obtained with:                               #
 #          $ apt-get install git gcc g++ autoconf bison bzip2 cmake           #
 #            mesa-common-dev libffi-dev libfontconfig1-dev                    #
-#            libssl-dev xz zlib1g-dev                                         #
+#            libssl-dev xz                                                    #
 #                                                                             #
 #     on ubuntu 14.04:                                                        #
 #          $ apt-get install git gcc g++ autoconf bison make cmake            #
 #            mesa-common-dev libffi-dev libfontconfig1-dev                    #
-#            libssl-dev xz-utils zlib1g-dev                                   #
+#            libssl-dev xz-utils                                              #
 #                                                                             #
 #     on OS X El Capitan with homebrew:                                       #
 #          $ brew install git bison autoconf automake libffi cmake            #
-#          $ # `bison` shipped with Mac is too old for swig build,            #
-#          $ # so we use `brew`.                                              #
-#          $ export PATH=$(brew --prefix bison)/bin:$PATH                     #
 #                                                                             #
 #     on RHEL-related distros:                                                #
-#          $ dnf install git gcc gcc-c++ autoconf bison make cmake            #
+#          $ yum install git gcc gcc-c++ autoconf bison make cmake            #
 #            mesa-libGL-devel libffi-devel fontconfig-devel bzip2             #
-#            automake patch byacc xz zlib-devel openssl-devel                 #
+#            automake patch byacc xz                                          #
 
 """
 
-import glob
 import logging
-import multiprocessing
 import os
-import platform
 import re
+import sys
+import glob
+import subprocess as sp
 import shutil
+import tarfile
+import multiprocessing
+import platform
+import threading
+import sysconfig
+from datetime import datetime
 
 # @todo temporary for expired mpfr.org certificate on 2023-04-08
 import ssl
-import subprocess as sp
-import sys
-import sysconfig
-import tarfile
-import threading
-from datetime import datetime
 
 ssl._create_default_https_context = ssl._create_unverified_context
 
 import time
+from urllib.request import urlretrieve
 from collections.abc import Generator, Sequence
 from pathlib import Path
-from urllib.request import urlretrieve
 
 try:
-    from typing import Literal, Union
+    from typing import Union, Literal
 except:
     # python 3.6 compatibility for rocky 8
     from typing import Union
-
     from typing_extensions import Literal
 
 logger = logging.getLogger(__name__)
@@ -143,19 +133,20 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.10.3", "3.11.8", "3.12.1", "3.13.6", "3.14.0"]
+PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.6"]
 JSON_VERSION = "3.11.3"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.8.1"
 BOOST_VERSION = "1.86.0"
 EIGEN_VERSION = "3.4.0"
 PCRE_VERSION = "8.41"
+PCRE2_VERSION = "10.32"
 LIBXML2_VERSION = "2.13.8"
-SWIG_VERSION = "4.2.1"
+SWIG_VERSION = "4.1.0"
 OPENCOLLADA_VERSION = "v1.6.68"
 HDF5_VERSION = "1.13.1"
 
-GMP_VERSION = "6.3.0"
+GMP_VERSION = "6.2.1"
 MPFR_VERSION = "3.1.6"  # latest is 4.1.0
 CGAL_VERSION = "v5.6.3"
 USD_VERSION = "23.05"
@@ -202,54 +193,19 @@ def cecho(message, color=NO_COLOR):
     logger.info(f"{color}{message}\033[0m")
 
 
+def which(cmd: str) -> Union[str, None]:
+    PATH = os.getenv("PATH")
+    assert PATH
+    for path in PATH.split(":"):
+        if os.path.exists(path) and cmd in os.listdir(path):
+            return cmd
+    return None
+
+
 # Flags.
-APPLE = platform.system() == "Darwin"
 MAC_CROSS_COMPILE_INTEL = "mac-cross-compile-intel" in flags
 assert platform.system() == "Darwin" or not MAC_CROSS_COMPILE_INTEL
-
 WASM = "wasm" in flags
-"""Build WASM outside pyodide build environment."""
-WASM_CMAKE_IS_USING_INIT_VARS = False
-if WASM:
-
-    def get_pyodide_config_var(var_name: str) -> str:
-        output = sp.check_output(["pyodide", "config", "get", var_name], encoding="utf-8").strip()
-        return output
-
-    if "PYODIDE_ROOT" not in os.environ:
-        cecho("WARNING. Couldn't find 'PYODIDE_ROOT' in environment variables.", YELLOW)
-        cecho("Assuming building wasm outside pyodide build environment and resetting necessary variables.", YELLOW)
-        os.environ["SIDE_MODULE_CFLAGS"] = get_pyodide_config_var("cflags")
-        os.environ["SIDE_MODULE_LDFLAGS"] = get_pyodide_config_var("ldflags")
-        # Override cmake toolchain for all `emcmake` calls,
-        # needed for shared libraries (resulting .so wrapper)
-        # and to ensure compilation is pyodide compatible (e.g. `-fwasm-exceptions` is used in compilation flags).
-        os.environ["CMAKE_TOOLCHAIN_FILE"] = get_pyodide_config_var("cmake_toolchain_file")
-    required_vars = (
-        "SIDE_MODULE_CFLAGS",
-        "SIDE_MODULE_LDFLAGS",
-        "CMAKE_TOOLCHAIN_FILE",
-    )
-    missing_vars = [v for v in required_vars if v not in os.environ]
-    assert not missing_vars, f"Some variables required for WASM compilation are missing: {', '.join(missing_vars)}"
-
-    def get_pyodide_build_version() -> "tuple[int, ...]":
-        pyodide_build_suffix = "pyodide-build version:"
-        output = sp.check_output(["pyodide", "--version"], encoding="utf-8").strip()
-        assert pyodide_build_suffix in output, output
-        version_line = next(l for l in output.splitlines() if l.startswith(pyodide_build_suffix))
-        version = version_line.partition(":")[2].strip()
-        return tuple(map(int, version.split(".")))
-
-    # Pyodide still in transition from `FLAGS` to `FLAGS_INIT`.
-    # `FLAGS_INIT` allow us to provide flags using environment variables
-    # and providing `FLAGS` directly would break pyodide toolchain.
-    # NOTE: changes in pyodide-build currently got postponed:
-    # https://github.com/pyodide/pyodide-build/pull/249
-    WASM_CMAKE_IS_USING_INIT_VARS = get_pyodide_build_version() >= (99, 0, 0)
-
-    # 0.31 is required for SIDE_MODULE_CXXFLAGS to be provided.
-    assert get_pyodide_build_version() >= (0, 31)
 
 # Set defaults for missing empty environment variables
 
@@ -265,11 +221,9 @@ if platform.system() == "Darwin":
 
 IFCOS_NUM_BUILD_PROCS = os.getenv("IFCOS_NUM_BUILD_PROCS", multiprocessing.cpu_count() + 1)
 
-SCRIPT_PATH = Path(__file__).parent
-REPO_PATH = SCRIPT_PATH.parent
-CMAKE_DIR = (REPO_PATH / "cmake").resolve().__str__()
+CMAKE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "cmake"))
 
-BUILD_DIR = os.environ.get("BUILD_DIR", (REPO_PATH / "build").__str__())
+build_dir = os.environ.get("BUILD_DIR", os.path.join(os.path.dirname(__file__), "..", "build"))
 
 
 if WASM:
@@ -278,7 +232,7 @@ elif MAC_CROSS_COMPILE_INTEL:
     arch = "x86_64"
 else:
     arch = platform.machine()
-DEFAULT_DEPS_DIR = Path(BUILD_DIR) / platform.system() / arch
+DEFAULT_DEPS_DIR = Path(build_dir) / platform.system() / arch
 
 if TOOLSET:
     DEFAULT_DEPS_DIR = DEFAULT_DEPS_DIR / TOOLSET
@@ -289,7 +243,6 @@ DEPS_DIR = os.getenv("DEPS_DIR", DEFAULT_DEPS_DIR)
 if not os.path.exists(DEPS_DIR):
     os.makedirs(DEPS_DIR)
 
-INSTALL_DIR = Path(DEPS_DIR) / "install"
 BUILD_CFG = os.getenv("BUILD_CFG", "RelWithDebInfo")
 
 
@@ -311,22 +264,22 @@ if USE_OCCT:
     cecho(" - Compiling against official Open Cascade")
 else:
     cecho(" - Compiling against Open Cascade Community Edition")
-cecho(f"* Build Directory   = {BUILD_DIR}", MAGENTA)
 cecho(f"* Dependency Directory   = {DEPS_DIR}", MAGENTA)
 cecho(f" - The directory where {PROJECT_NAME} dependencies are installed.")
 cecho(f"* Build Config Type      = {BUILD_CFG}", MAGENTA)
-cecho(""" - The used build configuration type for the dependencies.
-   Defaults to RelWithDebInfo if not specified.""")
+cecho(
+    """ - The used build configuration type for the dependencies.
+   Defaults to RelWithDebInfo if not specified."""
+)
 
 if BUILD_CFG == "MinSizeRel":
     cecho("     WARNING: MinSizeRel build can suffer from a significant performance loss.", RED)
 
 cecho(f"* IFCOS_NUM_BUILD_PROCS  = {IFCOS_NUM_BUILD_PROCS}", MAGENTA)
-cecho(""" - How many compiler processes may be run in parallel.
-""")
-cecho(f" * IFCOS_SCHEMAS = '{os.environ.get('IFCOS_SCHEMAS')}'", MAGENTA)
-cecho(""" - IFC Schemas to compile. If not provided, fallback to default provided in cmake.
-""")
+cecho(
+    """ - How many compiler processes may be run in parallel.
+"""
+)
 
 dependency_tree: "dict[str, tuple[str, ...]]" = {
     "IfcParse": ("boost", "libxml2", "hdf5", "rocksdb"),
@@ -335,16 +288,18 @@ dependency_tree: "dict[str, tuple[str, ...]]" = {
     "OpenCOLLADA": ("libxml2", "pcre"),
     "IfcGeomServer": ("IfcGeom",),
     "IfcOpenShell-Python": ("python", "swig", "IfcGeom"),
-    "swig": (),
+    "swig": ("pcre2",),
     "boost": (),
     "libxml2": (),
     "python": (),
-    "occ": (),
+    "occ": ("freetype",),
     "pcre": (),
+    "pcre2": (),
     "json": (),
     "hdf5": (),
     "cgal": (),
     "eigen": (),
+    "freetype": (),
     "rocksdb": ("zstd",),
     "zstd": (),
     # 'usd': ('boost', 'oneTBB')
@@ -371,13 +326,11 @@ if MAC_CROSS_COMPILE_INTEL:
     MAC_CROSS_COMPILE_INTEL_BJAM_ARGS = ["architecture=x86"]
     MAC_CROSS_COMPILE_INTEL_CXX = "clang++ -arch x86_64"
     MAC_CROSS_COMPILE_INTEL_CC = "clang -arch x86_64"
-    MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS = ["--host=x86_64-apple-darwin"]
 else:
     MAC_CROSS_COMPILE_INTEL_ARGS = []
     MAC_CROSS_COMPILE_INTEL_BJAM_ARGS = []
     MAC_CROSS_COMPILE_INTEL_CXX = ""
     MAC_CROSS_COMPILE_INTEL_CC = ""
-    MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS = []
 
 OFF_ON = ["OFF", "ON"]
 BUILD_STATIC = "shared" not in flags
@@ -391,57 +344,27 @@ PIC = "-fPIC" if BUILD_STATIC else ""
 if any(f.startswith("py-") for f in flags):
     PYTHON_VERSIONS = [pyv for pyv in PYTHON_VERSIONS if f"py-{''.join(pyv.split('.')[:2])}" in flags]
 
-if any(f.startswith("occt-") for f in flags):
-    OCCT_VERSION = next(f.split("-", 1)[1] for f in flags if f.startswith("occt-"))
-
 if explicit_targets:
     targets = {dep for target in explicit_targets for dep in gather_dependencies(target)}
 else:
     targets = set(dependency_tree.keys())
 
 targets = set(t for t in targets if "without-%s" % t.lower() not in flags)
-if WASM:
-    SKIP_TARGETS_FOR_WASM = {
-        "hdf5",
-        "rocksdb",
-        "opencollada",
-        "swig",
-        "pcre",
-        "IfcGeom",
-        "IfcConvert",
-        "IfcGeomServer",
-    }
-    SKIP_TARGETS_FOR_WASM = {t.lower() for t in SKIP_TARGETS_FOR_WASM}
-    skip_targets = {t for t in targets if t.lower() in SKIP_TARGETS_FOR_WASM}
-    if skip_targets:
-        cecho(f"Skipping targets for wasm build: {', '.join(sorted(skip_targets))}", YELLOW)
-    targets.difference_update(skip_targets)
 
 print("Building:", *sorted(targets, key=lambda t: len(list(gather_dependencies(t)))))
 
 # Check that required tools are in PATH
 yacc = "yacc"  # Used during swig building process, installed with `bison` on Debian / `byacc` on Red Hat.
-bison = "bison"
-
 missing_commands: "list[str]" = []
-required_commands = [git, bunzip2, tar, cc, cplusplus, autoconf, automake, make, "patch", "cmake", yacc, xz, bison]
-if "wasm" in flags:
-    # Skip swig build for WASM.
-    required_commands.append("swig")
-    required_commands.append("pyodide")
-    required_commands.remove(yacc)
-    required_commands.remove(bison)
-
-for cmd in required_commands:
-    if shutil.which(cmd) is None:
+for cmd in [git, bunzip2, tar, cc, cplusplus, autoconf, automake, make, "patch", "cmake", yacc, xz]:
+    if which(cmd) is None:
         missing_commands.append(cmd)
 
 if missing_commands:
     raise ValueError(f"Required tools not installed or not added to PATH: {', '.join(missing_commands)}")
 
-MAC_INTEL_BIN_PATH = "/usr/local/bin"
 if MAC_CROSS_COMPILE_INTEL:
-    brew = f"{MAC_INTEL_BIN_PATH}/brew"
+    brew = "/usr/local/bin/brew"
     assert os.path.exists(brew), f"For intel cross compilation the brew path is expected to be '{brew}'."
 
 # identifiers for the download tool (could be less memory consuming as ints, but are more verbose as strings)
@@ -465,13 +388,6 @@ except:
     pass
 
 
-def restore_env(var_name: str, old_value: Union[str, None]) -> None:
-    if old_value is None:
-        del os.environ[var_name]
-    else:
-        os.environ[var_name] = old_value
-
-
 def run(cmds: "Sequence[str]", cwd: "Union[str, None]" = None, can_fail: bool = False) -> str:
     """
     Wraps `subprocess.Popen.communicate()` and logs the command being executed,
@@ -489,7 +405,7 @@ def run(cmds: "Sequence[str]", cwd: "Union[str, None]" = None, can_fail: bool =
             collector.append(line)
         pipe.close()
 
-    logger.debug(f"running command `{' '.join(cmds)}` in directory '{cwd}'")
+    logger.debug(f"running command {' '.join(cmds)} in directory {cwd}")
     stdout: list[str] = []
     stderr: list[str] = []
 
@@ -535,14 +451,14 @@ BOOST_LOCATION = f"https://github.com/boostorg/boost/releases/download/boost-{BO
 # Helper functions
 
 
-def run_autoconf(dependency_name: str, configure_args: "list[str]", cwd: str) -> None:
+def run_autoconf(arg1: str, configure_args: "list[str]", cwd: str) -> None:
     configure_path = os.path.realpath(os.path.join(cwd, "..", "configure"))
     if not os.path.exists(configure_path):
         run(
             [bash, "./autogen.sh"], cwd=os.path.realpath(os.path.join(cwd, ".."))
         )  # only run autogen.sh in the directory it is located and use cwd to achieve that in order to not mess up things
     # Using `sh` over `bash` fixes issues with building swig
-    prefix = os.path.realpath(f"{DEPS_DIR}/install/{dependency_name}")
+    prefix = os.path.realpath(f"{DEPS_DIR}/install/{arg1}")
 
     wasm = []
     if "wasm" in flags:
@@ -571,27 +487,16 @@ def run_cmake(arg1, cmake_args: "list[str]", cmake_dir: Union[str, None] = None,
     if "wasm" in flags:
         wasm.append("emcmake")
 
-    cmake_flags: list[str] = []
-    if not WASM or not WASM_CMAKE_IS_USING_INIT_VARS:
-        # For WASM we provide flags using just environment variables.
-        # If we provide them using cmake vars, it will override emscripten toolchain flags.
-        # Unsure if we need this in general even for non-WASM builds.
-        cmake_flags.extend(
-            [
-                f"-DCMAKE_CXX_FLAGS='{os.environ['CXXFLAGS']}'",
-                f"-DCMAKE_C_FLAGS='{os.environ['CFLAGS']}'",
-            ]
-        )
-
     run(
         [
             *wasm,
             "cmake",
             P,
-            *cmake_flags,
             *cmake_args,
             f"-DCMAKE_BUILD_TYPE={BUILD_CFG}",
             f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}",
+            f"-DCMAKE_CXX_FLAGS='{os.environ['CXXFLAGS']}'",
+            f"-DCMAKE_C_FLAGS='{os.environ['CFLAGS']}'",
             f"-DCMAKE_SHARED_LINKER_FLAGS={os.environ['LDFLAGS']}",
         ],
         cwd=cwd,
@@ -722,7 +627,7 @@ def build_dependency(
         if isinstance(patch, str):
             patch = [patch]
         for p in patch:
-            patch_abs = (SCRIPT_PATH / p).absolute().__str__()
+            patch_abs = os.path.abspath(os.path.join(os.path.dirname(__file__), p))
             if os.path.exists(patch_abs):
                 try:
                     run(["patch", "-p1", "--batch", "--forward", "-i", patch_abs], cwd=extract_dir)
@@ -809,13 +714,12 @@ LDFLAGS = os.environ.get("LDFLAGS", "")
 
 ADDITIONAL_ARGS_STR = " ".join(ADDITIONAL_ARGS)
 
-CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
-CFLAGS_MINIMAL = f"{CFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
 if "wasm" in flags:
-    # WASM `SIDE_MODULE_` are absorbed by `emcmake` automatically.
-    CXXFLAGS = CXXFLAGS_MINIMAL
-    CFLAGS = CFLAGS_MINIMAL
+    CFLAGS_MINIMAL = CXXFLAGS_MINIMAL = CFLAGS = CXXFLAGS = os.environ["SIDE_MODULE_CFLAGS"]
+    LDFLAGS = os.environ["SIDE_MODULE_LDFLAGS"]
 elif sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev/null"]) != 0:
+    CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
+    CFLAGS_MINIMAL = f"{CFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
     if BUILD_STATIC:
         CXXFLAGS = f"{CXXFLAGS} {PIC} -fdata-sections -ffunction-sections -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
         CFLAGS = f"{CFLAGS}   {PIC} -fdata-sections -ffunction-sections -fvisibility=hidden {ADDITIONAL_ARGS_STR}"
@@ -824,6 +728,8 @@ elif sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev
         CFLAGS = CFLAGS_MINIMAL
     LDFLAGS = f"{LDFLAGS}  -Wl,--gc-sections {ADDITIONAL_ARGS_STR}"
 else:
+    CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
+    CFLAGS_MINIMAL = f"{CFLAGS}   {PIC} {ADDITIONAL_ARGS_STR}"
     if BUILD_STATIC:
         CXXFLAGS = f"{CXXFLAGS} {PIC} -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
         CFLAGS = f"{CFLAGS}   {PIC} -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
@@ -903,9 +809,9 @@ if "eigen" in targets:
     )
 
 if "pcre" in targets:
-    OLD_CC, OLD_CXX = None, None
+    OLD_CC, OLD_CCXX = None, None
     if MAC_CROSS_COMPILE_INTEL:
-        OLD_CC, OLD_CXX = os.environ.get("CC"), os.environ.get("CXX")
+        OLD_CC, OLD_CCXX = os.environ.get("CC"), os.environ.get("CXX")
         os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
         os.environ["CXX"] = MAC_CROSS_COMPILE_INTEL_CXX
     # Keep it autoconf as OpenCOLLADA is pretty old and might break
@@ -918,37 +824,61 @@ if "pcre" in targets:
         download_name=f"pcre-{PCRE_VERSION}.tar.bz2",
     )
     if MAC_CROSS_COMPILE_INTEL:
-        restore_env("CC", OLD_CC)
-        restore_env("CXX", OLD_CXX)
+        if OLD_CC is None:
+            del os.environ["CC"]
+        else:
+            os.environ["CC"] = OLD_CC
+        if OLD_CCXX is None:
+            del os.environ["CXX"]
+        else:
+            os.environ["CXX"] = OLD_CCXX
 
-if "swig" in targets:
-    dependency_name = f"swig-{SWIG_VERSION}"
+if "pcre2" in targets:
     build_dependency(
-        name=dependency_name,
-        mode="cmake",
-        build_tool_args=[
-            "-DWITH_PCRE=OFF",
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/{dependency_name}",
-        ],
+        name=f"pcre2-{PCRE2_VERSION}",
+        mode="autoconf",
+        build_tool_args=[DISABLE_FLAG],
+        download_url=f"https://downloads.sourceforge.net/project/pcre/pcre2/{PCRE2_VERSION}/",
+        download_name=f"pcre2-{PCRE2_VERSION}.tar.bz2",
+    )
+
+# An issue exists with swig-1.3 and python >= 3.2
+# Therefore, build a recent copy from source
+if "swig" in targets:
+    build_dependency(
+        name="swig",
+        mode="autoconf",
+        build_tool_args=["--disable-ccache", f"--with-pcre2-prefix={DEPS_DIR}/install/pcre2-{PCRE2_VERSION}"],
         download_url="https://github.com/swig/swig.git",
         download_name="swig",
         download_tool=download_tool_git,
         revision=f"v{SWIG_VERSION}",
     )
 
+if "freetype" in targets:
+    build_dependency(
+        name=f"freetype",
+        mode="cmake",
+        build_tool_args=[f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/freetype"],
+        download_url="https://github.com/freetype/freetype",
+        download_name="freetype2",
+        download_tool=download_tool_git,
+        revision="VER-2-11-1",
+    )
+
 if USE_OCCT and "occ" in targets:
-    occt_args: "list[str]" = []
-    patches: "list[str]" = []
+    patches = []
     if OCCT_VERSION < "7.4":
         patches.append("./patches/occt/enable-exception-handling.patch")
 
-    # Skip ExpToCasExe as we don't need it and it requires additional dependencies.
-    # Before 7.7.2 ExpToCasExe is part of DataExchange, DETools doesn't exist yet.
-    # Since we do need DataExchange (used for IgesSerializer), we use a patch to skip only ExpToCasExe.
-    if "7.7.2" > OCCT_VERSION >= "7.7":
+    if OCCT_VERSION == "7.7.1":
         patches.append("./patches/occt/no_ExpToCasExe.patch")
-    elif OCCT_VERSION >= "7.7.2":
-        occt_args.append("-DBUILD_MODULE_DETools=OFF")
+
+    if OCCT_VERSION == "7.7.2":
+        patches.append("./patches/occt/no_ExpToCasExe_7_7_2.patch")
+
+    if OCCT_VERSION == "7.8.1":
+        patches.append("./patches/occt/no_ExpToCasExe_7_8_1.patch")
 
     if "wasm" in flags:
         patches.append("./patches/occt/no_em_js.patch")
@@ -967,9 +897,9 @@ if USE_OCCT and "occ" in targets:
             f"-DUSE_FREETYPE=OFF",
             f"-DUSE_OPENGL=OFF",
             f"-DUSE_GLES2=OFF",
+            f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype",
             f"-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
             *MAC_CROSS_COMPILE_INTEL_ARGS,
-            *occt_args,
         ],
         download_url="https://github.com/Open-Cascade-SAS/OCCT",
         download_name="occt",
@@ -999,20 +929,17 @@ if "libxml2" in targets:
     if MAC_CROSS_COMPILE_INTEL:
         OLD_CC = os.environ.get("CC")
         os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
-    build_tool_args = [
-        "--without-python",
-        ENABLE_FLAG,
-        DISABLE_FLAG,
-        "--without-zlib",
-        "--without-iconv",
-        "--without-lzma",
-    ]
-    if "wasm" in flags:
-        build_tool_args.append("--without-threads")
     build_dependency(
         f"libxml2-{LIBXML2_VERSION}",
         "autoconf",
-        build_tool_args=build_tool_args,
+        build_tool_args=[
+            "--without-python",
+            ENABLE_FLAG,
+            DISABLE_FLAG,
+            "--without-zlib",
+            "--without-iconv",
+            "--without-lzma",
+        ],
         download_url=f"https://download.gnome.org/sources/libxml2/{'.'.join(LIBXML2_VERSION.split('.')[0:2])}/",
         download_name=f"libxml2-{LIBXML2_VERSION}.tar.xz",
     )
@@ -1069,7 +996,6 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
     # On OSX a dynamic python library is built or it would not be compatible
     # with the system python because of some threading initialization
     PYTHON_CONFIGURE_ARGS: "list[str]" = []
-    original_path = ""
     if platform.system() == "Darwin":
         PYTHON_CONFIGURE_ARGS = ["--enable-shared"]
         open_ssl_prefix = run([brew, "--prefix", "openssl@3"]).strip()
@@ -1078,30 +1004,27 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
         PYTHON_CONFIGURE_ARGS.append(f"--with-openssl={open_ssl_prefix}")
 
     if MAC_CROSS_COMPILE_INTEL:
-        original_path = os.environ["PATH"]
-        # Need to ensure python will pick up intel's `pkg-config`,
-        # otherwise it might attempt to use ARM libraries (e.g. `zstd`) and fail.
-        os.environ["PATH"] = f"{MAC_INTEL_BIN_PATH}{os.pathsep}{original_path}"
         PYTHON_CONFIGURE_ARGS.extend(["--with-universal-archs=intel-64", "--enable-universalsdk"])
 
     for PYTHON_VERSION in PYTHON_VERSIONS:
-        # Don't fail silently on missing Python dependencies (e.g. openssl or zlib),
-        # because later ifcopenshell-python build will fail too but in a more confusing way.
-        build_dependency(
-            f"python-{PYTHON_VERSION}",
-            "autoconf",
-            PYTHON_CONFIGURE_ARGS,
-            f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
-            f"Python-{PYTHON_VERSION}.tgz",
-        )
-        python_bin = INSTALL_DIR / f"python-{PYTHON_VERSION}" / "bin" / "python3"
-        # `_ssl` module is present -> we will be able to install `numpy` later
-        # to verify IfcOpenShell installation
-        run([str(python_bin), "-c", "import _ssl"])
+        try:
+            build_dependency(
+                f"python-{PYTHON_VERSION}",
+                "autoconf",
+                PYTHON_CONFIGURE_ARGS,
+                f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
+                f"Python-{PYTHON_VERSION}.tgz",
+            )
+        except RuntimeError as e:
+            # Sometimes setting up modules such as pip/lzma can cause
+            # the python installer script to return a non zero exit
+            # code where actually the headers and dynamic libraries
+            # are installed correctly. This is all we need so we catch
+            # the exception and only reraise if a partially successful
+            # install is not detected.
+            if not os.path.exists(os.path.join(DEPS_DIR, "install", f"python-{PYTHON_VERSION}")):
+                raise e
 
-    if MAC_CROSS_COMPILE_INTEL:
-        assert original_path
-        os.environ["PATH"] = original_path
     os.environ["CPPFLAGS"] = OLD_CPP_FLAGS
     os.environ["CXXFLAGS"] = OLD_CXX_FLAGS
     os.environ["CFLAGS"] = OLD_C_FLAGS
@@ -1147,25 +1070,14 @@ if "boost" in targets:
 if "cgal" in targets:
     gmp_args: "list[str]" = []
     mpfr_args: "list[str]" = []
-
-    OLD_HOST_CC = None
-    if WASM:
-        if APPLE:
-            # Override `HOST_CC`, otherwise `emcc` will try to use it's own `clang` which can only build
-            # wasm executables and build will fail.
-            os.environ["HOST_CC"] = "clang"
-        # Disable assembly, otherwise `emcc -c conftest.s` will crash due to assembly mismatch.
-        gmp_args.extend(("--disable-assembly", "--enable-cxx"))
+    if "wasm" in flags:
+        gmp_args.extend(("--disable-assembly", "--host", "none", "--enable-cxx"))
         mpfr_args.extend(("--host", "none"))
-    elif "x86" in arch:
-        gmp_args.append("--enable-fat")  # See issues #7458 #7556
 
     OLD_CC = None
     if MAC_CROSS_COMPILE_INTEL:
         OLD_CC = os.environ.get("CC")
-        # Otherwise it's using arm64 `gcc` and fails to build gmp.
         os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
-        gmp_args.extend(MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS)
 
     build_dependency(
         name=f"gmp-{GMP_VERSION}",
@@ -1174,14 +1086,10 @@ if "cgal" in targets:
         pre_compile_subs=(
             [("build/config.h", "HAVE_OBSTACK_VPRINTF 1", "HAVE_OBSTACK_VPRINTF 0")] if "wasm" in flags else []
         ),
-        # Sometimes ftp.gnu.org is very slow, use ftpmirror.gnu.org as a workaround.
-        download_url="https://ftpmirror.gnu.org/gnu/gmp/",
+        download_url="https://ftp.gnu.org/gnu/gmp/",
         download_name=f"gmp-{GMP_VERSION}.tar.bz2",
     )
 
-    if WASM and APPLE:
-        restore_env("HOST_CC", OLD_HOST_CC)
-
     build_dependency(
         name=f"mpfr-{MPFR_VERSION}",
         mode="autoconf",
@@ -1191,7 +1099,10 @@ if "cgal" in targets:
     )
 
     if MAC_CROSS_COMPILE_INTEL:
-        restore_env("CC", OLD_CC)
+        if OLD_CC is None:
+            del os.environ["CC"]
+        else:
+            os.environ["CC"] = OLD_CC
 
     build_dependency(
         name=f"cgal-{CGAL_VERSION}",
@@ -1300,6 +1211,7 @@ os.makedirs(executables_dir, exist_ok=True)
 
 
 cmake_args = [
+    "-DCMAKE_CXX_STANDARD=17",
     "-DUSE_MMAP=OFF",
     "-DBUILD_EXAMPLES=OFF",
     "-DBUILD_SHARED_LIBS=" + OFF_ON[not BUILD_STATIC],
@@ -1321,13 +1233,7 @@ def get_cmake_args_prefix_path(additional_paths: "Sequence[str]" = ()) -> "list[
     args_prefix_path = cmake_args_prefix_path.copy()
     args_prefix_path.extend(additional_paths)
     prefix_path = ";".join(args_prefix_path)
-    if WASM:
-        # `emcmake` is disabling search in PATH, so we provide root paths instead.
-        # Provide '/' to PATH, so it will be combined with provided root paths,
-        # otherwise, depending on environment, it might not search the root path itself.
-        return [f"-DCMAKE_FIND_ROOT_PATH={prefix_path}", "-DCMAKE_PREFIX_PATH=//"]
-    else:
-        return [f"-DCMAKE_PREFIX_PATH={prefix_path}"]
+    return [f"-DCMAKE_PREFIX_PATH={prefix_path}"]
 
 
 if "wasm" in flags:
@@ -1343,7 +1249,6 @@ if "cgal" in targets:
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/cgal-{CGAL_VERSION}")
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/gmp-{GMP_VERSION}")
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/mpfr-{MPFR_VERSION}")
-    cmake_args.append(f"-DCGAL_WITH_GMPXX=Off")
 
 if "occ" in targets and USE_OCCT:
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/occt-{OCCT_VERSION}")
@@ -1374,11 +1279,11 @@ else:
     cmake_args.append("-DHDF5_SUPPORT=Off")
 
 if "usd" in targets:
-    cmake_args.append("-DUSD_SUPPORT=ON")
-    cmake_args_prefix_path.extend(
+    cmake_args.extend(
         [
-            f"{DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"{DEPS_DIR}/install/usd-{USD_VERSION}",
+            f"-DUSD_SUPPORT=" "On",
+            f"-DUSD_INCLUDE_DIR={DEPS_DIR}/install/usd-{USD_VERSION}/include",
+            f"-DUSD_LIBRARY_DIR={DEPS_DIR}/install/usd-{USD_VERSION}/lib",
         ]
     )
 
@@ -1396,10 +1301,7 @@ if "rocksdb" in targets:
         ]
     )
 
-if "swig" in targets:
-    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/swig-{SWIG_VERSION}")
-
-if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets)):
+if not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets):
     logger.info("\rConfiguring executables...")
 
     exec_args = [
@@ -1414,18 +1316,18 @@ if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServe
 
     logger.info("\rBuilding executables...   ")
 
-    run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "VERBOSE=1"], cwd=executables_dir)
+    run([make, f"-j{IFCOS_NUM_BUILD_PROCS}"], cwd=executables_dir)
     run([make, "install/strip" if BUILD_CFG == "Release" else "install"], cwd=executables_dir)
 
 if "IfcOpenShell-Python" in targets:
     # On OSX the actual Python library is not linked against.
     ADDITIONAL_ARGS = ""
     if platform.system() == "Darwin":
-        ADDITIONAL_ARGS = "-Wl,-undefined,dynamic_lookup"
+        ADDITIONAL_ARGS = "-Wl,-flat_namespace,-undefined,suppress"
+
+    if "wasm" in flags:
+        ADDITIONAL_ARGS = f"-Wl,-undefined,suppress -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS=_PyInit__ifcopenshell_wrapper"
 
-    # NOTE: We don't use `CXXFLAGS` for wrappers, so wrapper is compiled with different flags
-    # (e.g. ` -fdata-sections` is missing, which is set by default for executables)
-    # So cache doesn't match and running build-all.py builds most of ifcopenshell libraries twice.
     os.environ["CPPFLAGS"] = f"{CXXFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
     os.environ["CXXFLAGS"] = f"{CXXFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
     os.environ["CFLAGS"] = f"{CFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
@@ -1435,44 +1337,40 @@ if "IfcOpenShell-Python" in targets:
     os.makedirs(python_dir, exist_ok=True)
 
     def compile_python_wrapper(
-        python_version: str,
-        python_include: Union[str, None] = None,
-        python_executable: Union[str, None] = None,
-        python_path: Union[Path, None] = None,
+        python_version: str, python_library: str, python_include: str, python_executable: Union[str, None]
     ) -> Union[str, None]:
         """
         :return: Path to module dir if ``python_executable`` was provided, otherwise ``None``.
         """
-        assert bool(python_path) ^ bool(python_include)
-
         logger.info(f"\rConfiguring python {python_version} wrapper...")
 
         cache_path = os.path.join(python_dir, "CMakeCache.txt")
         if os.path.exists(cache_path):
             os.remove(cache_path)
 
-        if python_path:
-            # We couldn't just prefix PATH and have to provide all variables explicitly,
-            # see ifcwrap/cmake for the details.
-            python_executable = (Path(python_path) / "bin" / "python3").__str__()
-            python_include = run(
-                [
-                    python_executable,
-                    "-c",
-                    "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))",
-                ]
-            )
+        os.environ["PYTHON_LIBRARY_BASENAME"] = os.path.basename(python_library)
+
+        swig_prefix_paths: list[str] = []
+        if "swig" in targets:
+            swig_prefix_paths.append(f"{DEPS_DIR}/install/swig")
 
-        assert python_include
         run_cmake(
             "",
             cmake_args
-            + get_cmake_args_prefix_path()
+            + get_cmake_args_prefix_path(swig_prefix_paths)
             + [
+                "-DPYTHON_LIBRARY=" + python_library,
                 *([f"-DPYTHON_EXECUTABLE={python_executable}"] if python_executable else []),
-                # Needed because pyodide is expecting setup.py to be in the root.
-                *([f"-DPYTHON_MODULE_INSTALL_DIR={REPO_PATH}"] * WASM),
-                f"-DPYTHON_INCLUDE_DIR={python_include}",
+                # *([f"-DPYTHON_MODULE_INSTALL_DIR={os.environ['PYTHONPATH']}/ifcopenshell"] if "wasm" in flags else []),
+                *(
+                    [
+                        "-DPYTHON_MODULE_INSTALL_DIR="
+                        + os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "package"))
+                    ]
+                    if "wasm" in flags
+                    else []
+                ),
+                "-DPYTHON_INCLUDE_DIR=" + python_include,
                 f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/ifcopenshell/tmp",
                 "-DUSERSPACE_PYTHON_PREFIX="
                 + ["Off", "On"][os.environ.get("PYTHON_USER_SITE", "").lower() in {"1", "on", "true"}],
@@ -1483,7 +1381,7 @@ if "IfcOpenShell-Python" in targets:
 
         logger.info(f"\rBuilding python {python_version} wrapper...   ")
 
-        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper", "VERBOSE=1"], cwd=python_dir)
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper"], cwd=python_dir)
         run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))
 
         if python_executable:
@@ -1510,22 +1408,32 @@ if "IfcOpenShell-Python" in targets:
 
     if "wasm" in flags:
         compile_python_wrapper(
-            run(["pyodide", "config", "get", "python_version"]),
-            run(["pyodide", "config", "get", "python_include_dir"]),
+            f"{os.environ['PYMAJOR']}.{os.environ['PYMINOR']}.{os.environ['PYMICRO']}",
+            f"{os.environ['TARGETINSTALLDIR']}/lib/libpython{os.environ['PYMAJOR']}.{os.environ['PYMINOR']}.a",
+            os.environ["PYTHONINCLUDE"],
+            None,
         )
-        # Copy setup.py where pyodide build system expects it.
-        shutil.copy(REPO_PATH / "pyodide" / "setup.py", REPO_PATH)
-        # Empty pyproject so it's contents won't affect the resulting wheelthe the
-        # otherwise the wheel will use version and dependencies from toml, not setup.py.
-        (REPO_PATH / "pyproject.toml").write_text("")
 
     elif USE_CURRENT_PYTHON_VERSION:
         python_info = sysconfig.get_paths()
-        compile_python_wrapper(platform.python_version(), python_info["include"], sys.executable)
+
+        py_path_components = [sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("INSTSONAME")]
+
+        if sysconfig.get_config_var("multiarchsubdir"):
+            py_path_components.insert(1, sysconfig.get_config_var("multiarchsubdir").replace("/", ""))
+
+        python_lib = os.path.join(*py_path_components)
+
+        compile_python_wrapper(platform.python_version(), python_lib, python_info["include"], sys.executable)
     else:
         for python_version in PYTHON_VERSIONS:
-            python_path = INSTALL_DIR / f"python-{python_version}"
-            module_dir = compile_python_wrapper(python_version, python_path=python_path)
+            python_library = run([bash, "-c", f"ls    {DEPS_DIR}/install/python-{python_version}/lib/libpython*.*"])
+            python_include = run([bash, "-c", f"ls -d {DEPS_DIR}/install/python-{python_version}/include/python*"])
+            python_executable = os.path.join(
+                DEPS_DIR, "install", f"python-{python_version}", "bin", f"python{python_version[0]}"
+            )
+
+            module_dir = compile_python_wrapper(python_version, python_library, python_include, python_executable)
             assert module_dir
             # Not sure why, but added after reading this in the logs
             # cp: /Users/runner/work/IfcOpenShell/IfcOpenShell/build/Darwin/x86_64/10.15/install/ifcopenshell/python-3.9.11: No such file or directory

nix/cache_dependencies.py

@@ -1,79 +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.
-
-Expected to be executed from 'build' directory (e.g. that might contain 'Linux/x86_64/install').
-
-Usage: python cache_dependencies.py [pack|unpack]
-"""
-
-import platform
-import subprocess
-import sys
-import tarfile
-from pathlib import Path
-from typing import Literal
-
-CACHE_PREFIX = "cache-"
-
-
-def get_install_dir() -> Path:
-    if platform.system() == "Darwin":
-        pattern = "Darwin/*/*/install"
-    else:
-        pattern = "*/*/install"
-    for data in Path.cwd().glob(pattern):
-        return data
-    raise Exception("No install dir found")
-
-
-def run(cmd: str) -> None:
-    print(f"Running command: `{cmd}`")
-    subprocess.check_call(cmd, shell=True)
-
-
-def pack_dependencies(install_dir: Path) -> None:
-    # Process each install_dir
-    for dependency_path in install_dir.iterdir():
-        if not dependency_path.is_dir():
-            continue
-        dependency_name = dependency_path.name
-        # Skip ifcopenshell - it's a build output, not a dependency to reuse across builds.
-        if dependency_name == "ifcopenshell":
-            continue
-        tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
-        if tar_path.exists():
-            print(f"Skipping existing cache: '{tar_path}'")
-        else:
-            # Python's `tarfile` is 10x slower than `tar` cli, so we use `tar`.
-            run(f'tar -czf "{tar_path}" -C "{install_dir}" "{dependency_name}"')
-            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)

nix/patches/occt/no_ExpToCasExe.patch

@@ -1,9 +1,13 @@
---- a/adm/MODULES
-+++ b/adm/MODULES
-@@ -3,5 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
- ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
- Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
- ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
--DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
-+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress
- Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd17283f77..6cecf9dad3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -826,6 +826,8 @@ if (EMSCRIPTEN)
+   list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+ endif()
+ 
++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
++
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

nix/patches/occt/no_ExpToCasExe_7_7_2.patch

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

nix/patches/occt/no_ExpToCasExe_7_8_1.patch

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

pyodide/README.md

@@ -1,32 +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
-- 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,41 +0,0 @@
-#!/usr/bin/bash
-set -ex
-
-# Script is assuming that it will be possible to execute it multiple times
-# therefore we're clearing venv each time and ignoring existing 'emsdk' folder.
-
-# Install uv.
-curl -LsSf https://astral.sh/uv/install.sh | sh
-uv venv --python 3.13 --clear
-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.
-if [ ! -d emsdk ]; then
-  git clone https://github.com/emscripten-core/emsdk
-fi
-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/meta.yaml

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

pyodide/setup.py

@@ -1,47 +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, find_packages, 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=find_packages(include=["ifcopenshell", "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', '*.json']},
 )

pyodide/test/test_wheel.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-WHEEL_FILENAME = next(
-    p.name for p in (Path.cwd() / "pyodide").iterdir() if p.name.startswith("ifcopenshell-") and p.suffix == ".whl"
-)
-
-
-def test_ifcopenshell_import(selenium):
-    selenium.load_package("micropip")
-    # Important to test it with `micropip.install`
-    # without any dependencies loaded to ensure micropip will load them automatically.
-    selenium.run_async(
-        f"""
-        import micropip
-        await micropip.install(f"./{WHEEL_FILENAME}")
-        import ifcopenshell
-        ifc_file = ifcopenshell.file()
-        wall = ifc_file.create_entity("IfcWall")
-        wall1 = ifc_file.by_type("IfcWall")[0]
-        print(wall, wall1)
-        assert wall == wall1, "Wall entity doesn't match"
-        wall.Name = "Test"
-        assert wall.Name == "Test", f"Entity name wasn't changed: {{wall}}"
-        print(wall)
-        """
-    )

pyproject.toml

@@ -1,13 +1,3 @@
-[project]
-name = "IfcOpenShell"
-version = "0.0.0"
-dependencies = [
-    "black==26.3.1",
-    "ruff==0.15.8",
-    "poethepoet",
-    "gersemi==0.26.1",
-]
-
 [tool.black]
 line-length = 120
 include = '''
@@ -15,32 +5,28 @@ include = '''
     |nix/.*.pyi?$
 '''
 extend-exclude = '''
-    src/ifcopenshell-python/ifcopenshell/express/rules/*
-    |src/ifcopenshell-python/ifcopenshell/express/express_parser.py
+    src/ifcopenshell-python/ifcopenshell/express/*
     |src/ifcopenshell-python/ifcopenshell/mvd/*
     |src/ifcopenshell-python/ifcopenshell/simple_spf/*
     |src/ifc2ca/templates/*
+    |src/ifcconvert/cityjson/*
     |src/svgfill
     |src/exterior-shell-extractor
+    |src/pyodide
 '''
 
 [tool.pyright]
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
 reportUnnecessaryTypeIgnoreComment = true
-# Pylance doesn't respect gitignore, so we have to exclude files manually here
-# to avoid VS Code slowing down.
-# https://github.com/microsoft/pylance-release/issues/5169
-exclude = [
-    "_deps",
-]
 
 # Define here general ruff settings,
-# then they will be inherited by projects' .toml files.
+# then they will be inherited projects .toml files.
 # This allows using assuming different Python version for different projects.
 [tool.ruff]
 exclude = [
     # Submodules.
+    "src/ifcconvert/cityjson",
     "src/ifcopenshell-python/ifcopenshell/express",
     "src/ifcopenshell-python/ifcopenshell/mvd",
     "src/ifcopenshell-python/ifcopenshell/simple_spf",
@@ -52,7 +38,6 @@ exclude = [
     "src/ifc2ca/templates",
 ]
 [tool.ruff.lint]
-preview = true
 select = [
     # Default Ruff rules.
     # "E4",        # imports
@@ -64,7 +49,6 @@ select = [
     "UP",          # pyupgrade
     "RUF015",      # next() > list_comprehension[0]
     "RUF022",      # sort __all__
-    "I",           # import sorting
 ]
 ignore = [
     "FA100", # Conflicts with Blender using annotations for props definitions.
@@ -76,191 +60,7 @@ ignore = [
     "UP030", # implicit references for positional format fields
     "UP031", # Replace % with .format
     "UP032", # Replace .format with f-string
+
+    # Deprecated Ruff rules.
+    "UP038", # Use X | Y in isinstance
 ]
-
-[tool.ty.rules]
-all = "ignore"
-
-# Structural rules (no deep type inference needed, easier to adapt).
-abstract-method-in-final-class = "error"
-ambiguous-protocol-member = "error"
-byte-string-type-annotation = "error"
-conflicting-declarations = "error"
-conflicting-metaclass = "error"
-cyclic-class-definition = "error"
-cyclic-type-alias-definition = "error"
-dataclass-field-order = "error"
-duplicate-base = "error"
-duplicate-kw-only = "error"
-empty-body = "error"
-escape-character-in-forward-annotation = "error"
-final-on-non-method = "error"
-final-without-value = "error"
-fstring-type-annotation = "error"
-ignore-comment-unknown-rule = "error"
-implicit-concatenated-string-type-annotation = "error"
-inconsistent-mro = "error"
-ineffective-final = "error"
-instance-layout-conflict = "error"
-invalid-dataclass = "error"
-invalid-dataclass-override = "error"
-invalid-enum-member-annotation = "error"
-invalid-explicit-override = "error"
-invalid-frozen-dataclass-subclass = "error"
-invalid-generic-class = "error"
-invalid-generic-enum = "error"
-invalid-ignore-comment = "error"
-invalid-legacy-positional-parameter = "error"
-invalid-legacy-type-variable = "error"
-invalid-named-tuple = "error"
-invalid-newtype = "error"
-invalid-overload = "error"
-invalid-paramspec = "error"
-invalid-protocol = "error"
-invalid-syntax-in-forward-annotation = "error"
-invalid-total-ordering = "error"
-invalid-type-alias-type = "error"
-invalid-type-checking-constant = "error"
-invalid-type-guard-definition = "error"
-invalid-type-variable-bound = "error"
-invalid-type-variable-constraints = "error"
-invalid-typed-dict-header = "error"
-invalid-typed-dict-statement = "error"
-override-of-final-method = "error"
-override-of-final-variable = "error"
-possibly-missing-import = "error"
-possibly-missing-submodule = "error"
-# Has false positives due to ty walrus operator bug.
-# possibly-unresolved-reference = "error"
-raw-string-type-annotation = "error"
-redundant-final-classvar = "error"
-shadowed-type-variable = "error"
-subclass-of-final-class = "error"
-super-call-in-named-tuple-method = "error"
-unavailable-implicit-super-arguments = "error"
-unbound-type-variable = "error"
-undefined-reveal = "error"
-unresolved-global = "error"
-unresolved-import = "error"
-unresolved-reference = "error"
-unused-ignore-comment = "error"
-unused-type-ignore-comment = "error"
-useless-overload-body = "error"
-
-# Non-structural rules:
-deprecated = "error"
-zero-stepsize-in-slice = "error"
-possibly-missing-implicit-call = "error"
-unused-awaitable = "error"
-
-# Function argument rules:
-# Conflicts with `ifcopenshell.api.geometry.add_representation` type of callables we have, confusing them with a module.
-# call-non-callable = "error"
-conflicting-argument-forms = "error"
-# Too many false positives.
-# invalid-argument-type = "error"
-missing-argument = "error"
-parameter-already-assigned = "error"
-positional-only-parameter-as-kwarg = "error"
-too-many-positional-arguments = "error"
-unknown-argument = "error"
-# Has a lot of warnings due to current ty walrus operator issues.
-# index-out-of-bounds = "error"
-# unresolved-attribute = "error"
-
-[tool.ty.environment]
-extra-paths = [
-    "src/bonsai/external_dependencies",
-    "src/bcf",
-    "src/bsdd",
-    "src/bonsai",
-    "src/ifc4d",
-    "src/ifc5d",
-    "src/ifccityjson",
-    "src/ifcclash",
-    "src/ifccsv",
-    "src/ifcdiff",
-    "src/ifcfm",
-    "src/ifcopenshell-python",
-    "src/ifcpatch",
-    "src/ifctester",
-]
-
-[tool.ty.src]
-exclude = [
-    # External dependencies cloned for type checking only.
-    "src/bonsai/external_dependencies",
-    # Submodules.
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill/3rdparty",
-    # Has special dependencies.
-    "src/ifcopenshell-python/ifcopenshell/geom/app.py",
-    "src/ifcopenshell-python/ifcopenshell/geom/code_editor_pane.py",
-    "src/ifcopenshell-python/ifcopenshell/util/doc.py",
-    "src/ifcopenshell-python/ifcopenshell/util/generate_pset_templates.py",
-    "src/ifcopenshell-python/ifcopenshell/util/ifc4x3dev_scrape_data_for_docs.py",
-    # Too esoteric.
-    "src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py",
-    "src/ifc2ca/templates",
-    # Too dev.
-    "src/bcf/setup.py",
-    "src/bsdd/yml_to_classes.py",
-    # Deprecated.
-    "src/ifc2ca/_deprecated",
-]
-
-[tool.poe.tasks]
-
-ruff-main = "ruff check --extend-exclude nix/build-all.py"
-# It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
-ruff-old = "ruff check nix/build-all.py --target-version py37"
-ruff.sequence = ["ruff-main", "ruff-old"]
-
-black = "black ."
-
-ty.sequence = ["ty-bonsai", "ty-ios"]
-ty.help = "Run ty type checker. Requires ty-venv to be set up first."
-ty-bonsai = "ty check src/bonsai --python=src/bonsai/.venv"
-
-ty-venv.sequence = ["ty-venv-bonsai", "ty-venv-ios"]
-
-ty-venv-bonsai.sequence = [
-    {cmd = "uv venv src/bonsai/.venv --python=3.11 --allow-existing"},
-    {cmd = "uv pip install -r src/bonsai/type-check-requirements.txt --python=src/bonsai/.venv"},
-]
-
-ty-venv-ios.sequence = [
-    {cmd = "uv venv src/ifcopenshell-python/.venv --python=3.10 --allow-existing"},
-    {cmd = "uv pip install -r src/ifcopenshell-python/type-check-requirements.txt --python=src/ifcopenshell-python/.venv"},
-]
-
-format.sequence = ["black", "ruff-main", "ruff-old"]
-
-cmake-format = "gersemi . --in-place"
-
-[tool.poe.tasks.ty-ios]
-# --ignore unresolved-reference: walrus operator false positives in ty.
-cmd = """
-    ty check
-    src/bcf
-    src/bsdd
-    src/ifc2ca
-    src/ifc4d
-    src/ifc5d
-    src/ifccityjson
-    src/ifcclash
-    src/ifccsv
-    src/ifcdiff
-    src/ifcfm
-    src/ifcopenshell-python
-    src/ifcpatch
-    src/ifctester
-    --python=src/ifcopenshell-python/.venv
-    --ignore unresolved-reference
-"""
-
-[tool.poe.tasks.bonsai-deps]
-help = "Clone or update Bonsai external dependencies."
-cmd = "python src/bonsai/scripts/bonsai_deps.py"

src/bcf/bcf/agnostic/extensions.py

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

src/bcf/bcf/agnostic/model.py

@@ -1,7 +1,6 @@
-from typing import Union
-
 import bcf.v2.model
 import bcf.v3.model
+from typing import Union
 
 BimSnippet = Union[bcf.v2.model.BimSnippet, bcf.v3.model.BimSnippet]
 BitMap = Union[bcf.v2.model.VisualizationInfoBitmap, bcf.v3.model.Bitmap]

src/bcf/bcf/agnostic/topic.py

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

src/bcf/bcf/agnostic/visinfo.py

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

src/bcf/bcf/bcfxml.py

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

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

@@ -7,7 +7,6 @@ original idea from https://stackoverflow.com/a/19722365/1307905
 """
 
 from __future__ import annotations
-
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -27,7 +26,7 @@ class InMemoryZipFile:
         self._file_name: Optional[str | Path] = str(file_name) if hasattr(file_name, "_from_parts") else file_name
         self.in_memory_data = BytesIO()
         # Create the in-memory zipfile
-        self.in_memory_zip = zipfile.ZipFile(self.in_memory_data, "w", compression, True)
+        self.in_memory_zip = zipfile.ZipFile(self.in_memory_data, "w", compression, False)
         self.in_memory_zip.debug = debug
 
     def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None:

src/bcf/bcf/v2/bcfxml.py

@@ -1,7 +1,6 @@
 """BCF XML V2 handler."""
 
 from __future__ import annotations
-
 import uuid
 import warnings
 import zipfile

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

@@ -14,11 +14,15 @@
 # Currently extensions support for v2 is only read-only.
 
 
-from dataclasses import dataclass, field
+import sys
+from dataclasses import dataclass, field, fields
 from typing import Optional
 
 
-@dataclass(slots=True, kw_only=True)
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+
+
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsPriorities:
     class Meta:
         global_type = False
@@ -35,7 +39,7 @@ class ExtensionsPriorities:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsSnippetTypes:
     class Meta:
         global_type = False
@@ -52,7 +56,7 @@ class ExtensionsSnippetTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsStages:
     class Meta:
         global_type = False
@@ -69,7 +73,7 @@ class ExtensionsStages:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicLabels:
     class Meta:
         global_type = False
@@ -86,7 +90,7 @@ class ExtensionsTopicLabels:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicStatuses:
     class Meta:
         global_type = False
@@ -103,7 +107,7 @@ class ExtensionsTopicStatuses:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicTypes:
     class Meta:
         global_type = False
@@ -120,7 +124,7 @@ class ExtensionsTopicTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsUsers:
     class Meta:
         global_type = False
@@ -137,7 +141,7 @@ class ExtensionsUsers:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Extensions:
     topic_types: Optional[ExtensionsTopicTypes] = field(
         default=None,

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

@@ -1,10 +1,13 @@
+import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
 from xsdata.models.datatype import XmlDateTime
 
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-@dataclass(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class BimSnippet:
     reference: str = field(
         metadata={
@@ -38,7 +41,7 @@ class BimSnippet:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class CommentViewpoint:
     class Meta:
         global_type = False
@@ -53,7 +56,7 @@ class CommentViewpoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class HeaderFile:
     class Meta:
         global_type = False
@@ -109,7 +112,7 @@ class HeaderFile:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicDocumentReference:
     class Meta:
         global_type = False
@@ -147,7 +150,7 @@ class TopicDocumentReference:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicRelatedTopic:
     class Meta:
         global_type = False
@@ -162,7 +165,7 @@ class TopicRelatedTopic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewPoint:
     viewpoint: Optional[str] = field(
         default=None,
@@ -198,7 +201,7 @@ class ViewPoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Comment:
     date: XmlDateTime = field(
         metadata={
@@ -258,7 +261,7 @@ class Comment:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Header:
     file: list[HeaderFile] = field(
         default_factory=list,
@@ -271,7 +274,7 @@ class Header:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Topic:
     reference_link: list[str] = field(
         default_factory=list,
@@ -425,7 +428,7 @@ class Topic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Markup:
     header: Optional[Header] = field(
         default=None,

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

@@ -1,8 +1,11 @@
+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(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class Project:
     name: Optional[str] = field(
         default=None,
@@ -21,7 +24,7 @@ class Project:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ProjectExtension:
     project: Optional[Project] = field(
         default=None,

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

@@ -1,8 +1,11 @@
+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(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class Version:
     detailed_version: Optional[str] = field(
         default=None,

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

@@ -1,14 +1,17 @@
+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}
+
 
 class BitmapFormat(Enum):
     PNG = "PNG"
     JPG = "JPG"
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Component:
     originating_system: Optional[str] = field(
         default=None,
@@ -35,7 +38,7 @@ class Component:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Direction:
     x: float = field(
         metadata={
@@ -60,7 +63,7 @@ class Direction:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Point:
     x: float = field(
         metadata={
@@ -85,7 +88,7 @@ class Point:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewSetupHints:
     spaces_visible: Optional[bool] = field(
         default=None,
@@ -110,7 +113,7 @@ class ViewSetupHints:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ClippingPlane:
     location: Point = field(
         metadata={
@@ -128,7 +131,7 @@ class ClippingPlane:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoringColor:
     class Meta:
         global_type = False
@@ -151,7 +154,7 @@ class ComponentColoringColor:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentSelection:
     component: list[Component] = field(
         default_factory=list,
@@ -163,7 +166,7 @@ class ComponentSelection:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibilityExceptions:
     class Meta:
         global_type = False
@@ -178,7 +181,7 @@ class ComponentVisibilityExceptions:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Line:
     start_point: Point = field(
         metadata={
@@ -196,7 +199,7 @@ class Line:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class OrthogonalCamera:
     """
     Attributes
@@ -236,7 +239,7 @@ class OrthogonalCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class PerspectiveCamera:
     """
     Attributes
@@ -281,7 +284,7 @@ class PerspectiveCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoBitmap:
     class Meta:
         global_type = False
@@ -330,7 +333,7 @@ class VisualizationInfoBitmap:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoring:
     color: list[ComponentColoringColor] = field(
         default_factory=list,
@@ -342,7 +345,7 @@ class ComponentColoring:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibility:
     exceptions: Optional[ComponentVisibilityExceptions] = field(
         default=None,
@@ -360,7 +363,7 @@ class ComponentVisibility:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoClippingPlanes:
     class Meta:
         global_type = False
@@ -374,7 +377,7 @@ class VisualizationInfoClippingPlanes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoLines:
     class Meta:
         global_type = False
@@ -389,7 +392,7 @@ class VisualizationInfoLines:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Components:
     view_setup_hints: Optional[ViewSetupHints] = field(
         default=None,
@@ -421,7 +424,7 @@ class Components:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfo:
     """
     VisualizationInfo documentation.

src/bcf/bcf/v2/topic.py

@@ -1,12 +1,12 @@
 """BCF XML V2 Topic handler."""
 
 from __future__ import annotations
-
 import datetime
+import tempfile
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional
+from typing import Any, NoReturn, Optional, Union
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -192,8 +192,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,12 +1,12 @@
 import uuid
 import zipfile
+from typing import Any, Optional, Literal, Union
 from collections.abc import Iterable
-from typing import Literal, Optional, Union
 
-import ifcopenshell.util.placement
-import ifcopenshell.util.unit
 import numpy as np
 from ifcopenshell import entity_instance
+import ifcopenshell.util.unit
+import ifcopenshell.util.placement
 from numpy.typing import NDArray
 
 import bcf.v2.model as mdl
@@ -319,7 +319,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 +381,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

@@ -24,6 +24,7 @@ import time
 import urllib.parse
 import uuid
 import webbrowser
+from re import A
 from typing import Any, Optional
 
 import requests
@@ -34,8 +35,8 @@ client_id, client_secret = "", ""
 class OAuthReceiver(http.server.BaseHTTPRequestHandler):
     def do_GET(self) -> None:
         query = urllib.parse.parse_qs(urllib.parse.urlparse(self.path).query)
-        self.server.auth_code = query.get("code", [""])[0]
-        self.server.auth_state = query.get("state", [""])[0]
+        self.server.auth_code = query.get("code", [""])[0]  # type:ignore
+        self.server.auth_state = query.get("state", [""])[0]  # type:ignore
         self.send_response(200)
         self.send_header("Content-type", "text/plain")
         self.end_headers()
@@ -255,7 +256,7 @@ class BcfClient:
         project_id: str = "",
         topics: str = "",
         query_string: Optional[str] = None,
-    ) -> None:
+    ) -> list[Any]:
         # return self.get(
         #     f"/projects/{project_id}/topics",
         #     {

src/bcf/bcf/v3/bcfxml.py

@@ -1,7 +1,6 @@
 """BCF XML V3 handlers."""
 
 from __future__ import annotations
-
 import uuid
 import warnings
 import zipfile

src/bcf/bcf/v3/document.py

@@ -1,7 +1,7 @@
 """BCF XML V3 Documents handler."""
 
 import zipfile
-from typing import Optional
+from typing import Any, Optional
 
 import bcf.v3.model as mdl
 from bcf.inmemory_zipfile import ZipFileInterface