fix #7537 - Layer thickness correct when slab is rotated and few other features...

- Add dual-rotation support for AXIS3 slabs (IFC angle + object rotation)
- Fix profile editing to display horizontal projection for tilted slabs
- Fix AXIS2 layer slicing to use local extrusion direction for walls
- Fix ChangeExtrusionDepth to refresh geometry after depth changes
- Remove rotation lock on slabs to allow free rotation
- Fix undefined variable bug in add_slab_representation.py

.gersemirc

@@ -0,0 +1,11 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/0.24.0/gersemi/configuration.schema.json
+
+# Needed for gersemi to detect custom functions and macros.
+definitions: ["./cmake"]
+disable_formatting: false
+extensions: []
+indent: 4
+line_length: 120
+list_expansion: favour-inlining
+unsafe: false
+warn_about_unknown_commands: true

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,41 @@
+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@v3
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
@@ -34,11 +34,6 @@ 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
@@ -72,6 +67,10 @@ 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
@@ -82,7 +81,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: build-logs-osx-${{ matrix.arch }}
           path: |
@@ -140,7 +139,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         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,41 +9,75 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           path: IfcOpenShell
 
-      - name: Checkout Pyodide
-        uses: actions/checkout@v3
+      - name: Checkout Build Repository
+        uses: actions/checkout@v6
         with:
-          submodules: recursive
-          repository: pyodide/pyodide
-          ref: '0.28.0a3'
+          repository: IfcOpenShell/build-outputs
+          path: ifcopenshell_build
+          ref: wasm
+          lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
-          path: pyodide
+
+      - name: Unpack Dependencies
+        run: |
+          cd ifcopenshell_build
+          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ubuntu-22.04-${{ runner.arch }}
 
       - name: Build
         run: |
-          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
+          ./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@v6
+        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/pyodide/cache_dependencies.py pack
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd ifcopenshell_build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add */*/install/cache-*.tar.gz
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || echo "Push failed"
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         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

@@ -29,12 +29,12 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
@@ -48,8 +48,8 @@ jobs:
           [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        # Using fork to support Rocky.
-        uses: Andrej730/ccache-action@main
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
         with:
           key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
@@ -61,7 +61,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: build-logs-rocky
           path: |
@@ -118,7 +118,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         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

@@ -29,12 +29,12 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
@@ -48,8 +48,8 @@ jobs:
           [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        # Using fork to support Rocky.
-        uses: Andrej730/ccache-action@main
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
         with:
           key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
@@ -61,7 +61,7 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: build-logs-rocky-arm64
           path: |
@@ -118,7 +118,7 @@ jobs:
           cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         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

@@ -9,16 +9,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
         arch: ['x64']
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/build-outputs
           path: _deps-vs2022-x64-installed
@@ -30,14 +29,6 @@ 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 _deps-vs2022-x64-installed
@@ -45,21 +36,21 @@ jobs:
             7z x $_.FullName
           }
 
-      - name: Run Build Script
+      - name: ccache
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
+        with:
+          key: win-${{ matrix.arch }}
+          # Windows ccache needs ~1GB
+          # and with default 500MB some cache gets deleted, leading to misses.
+          max-size: 5000MB
+
+      - name: Run Build Script And Pack .zip Archives
         shell: cmd
         run: |
-          setlocal EnableDelayedExpansion
-          SET PYTHON_VERSION=${{ matrix.python }}
-          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
-              set PY_VER_MAJOR_MINOR=%%a%%b
-          )
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          SET IFCOS_INSTALL_PYTHON=FALSE
           cd win
-          echo y | call build-deps.cmd vs2022-x64 Release
-          SET PYTHONHOME=C:\Python\${{ matrix.python }}
-          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
-          call install-ifcopenshell.bat vs2022-x64 Release
+          python build-all-win.py
 
       - name: Pack Dependencies
         run: |
@@ -81,37 +72,8 @@ jobs:
           git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
           git push || echo "Push failed"
 
-      - name: Package .zip Archives
-        run: |
-          $VERSION = 'v' + ((Get-Content VERSION).Trim())
-          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
-          $OUTPUT_DIR = "$env:USERPROFILE\output"
-          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
-
-          if ("${{ matrix.python }}" -eq "3.9.11") {
-            # only for the first python version the executables are assembled for upload
-            cd _installed-vs2022-x64/bin
-            Get-ChildItem -Path . | ForEach-Object {
-              echo $_
-              $exe = $_.Name
-              $baseName = $exe.Substring(0, $exe.Length - 4)
-              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
-              7z a $zipName $exe
-            }
-            mv *.zip $OUTPUT_DIR
-          }
-
-          $pyVersion = "${{ matrix.python }}"
-          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
-          cd C:\Python\${{ matrix.python }}\Lib\site-packages
-          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
-          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
-          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
-          7z a $zipName ifcopenshell
-          mv $zipName $OUTPUT_DIR
-
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         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@v2 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v6 # 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

@@ -9,15 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Action - checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6
 
       - name: Action - install python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Action - install python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
@@ -26,29 +26,66 @@ jobs:
           curl -LsSf https://astral.sh/uv/install.sh | sh
           uv tool install ruff
           uv tool install black
+          uv tool install poethepoet
 
       # black doesn't catch all syntax errors, so we check them explicitly.
       - name: Check syntax errors
         id: syntax-errors
         run: |
           ERROR=0
-          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.10 -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: |
-          uvx black --diff --check .
+          uv tool install black-codeclimate
+          pip install github_action_utils
+          black --diff --check . | black-codeclimate | python .github/workflows/black_to_github_annotations.py
         continue-on-error: true
 
       - name: Ruff check
         id: ruff
         run: |
-          uvx ruff check
-          # It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
-          uvx ruff check nix/build-all.py --target-version py37
+          # 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
         continue-on-error: true
 
       - name: Final check
@@ -58,9 +95,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 'black' step for the details." && ERROR=1
+            echo "::error::Black formatting check failed, see Summary or 'black' step for the details." && ERROR=1
           fi
           if [ "${{ steps.ruff.outcome }}" != "success" ]; then
-            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
+            echo "::error::Ruff check failed, see Summary or '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@v4
+      - uses: actions/checkout@v6
         with:
           fetch-tags: true
           fetch-depth: 0

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

@@ -54,8 +54,8 @@ jobs:
             short_name: macosm1,
           }
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/bonsai_unstable_repo
           token: ${{ secrets.IFCOPENBOT_TOKEN }}

.github/workflows/ci-bonsai.yml

@@ -43,8 +43,8 @@ jobs:
             short_name: macosm1,
           }
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v1 # 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-conda-daily.yml

@@ -21,7 +21,7 @@ jobs:
       date: ${{ steps.date.outputs.date }}
       verdate: ${{ steps.verdate.outputs.verdate }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set env
         run: echo ok go
       
@@ -54,8 +54,7 @@ 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-x86, distver: macos-13, pkg_dir: 'osx-64' }
+          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' }
         ]
     steps:
       - name: Set Swap Space
@@ -76,7 +75,7 @@ jobs:
             echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
           fi
       
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 

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

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: activate
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -42,9 +42,6 @@ jobs:
       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 \
@@ -76,7 +73,7 @@ jobs:
         make package
       working-directory: build
     - name: Upload 
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -89,31 +86,31 @@ jobs:
     name: Docker Build, Tag, Push
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
       with:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v4.1.7
+      uses: actions/download-artifact@v7.0.0
       with:
         # Artifact name
         name: ifcos-artifacts
         path: artifacts/
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v3
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1        
+      uses: docker/setup-buildx-action@v3        
     - 
       name: Login to Dockerhub
-      uses: docker/login-action@v1 
+      uses: docker/login-action@v3 
       with:
         username: aecgeeks
         password: ${{ secrets.DOCKER_HUB_TOKEN }}
     - 
       name: Build container image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v6
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",
@@ -34,6 +34,10 @@ jobs:
             name: "Linux 64bit",
             short_name: linux64
           }
+          - {
+            name: "Linux ARM 64bit",
+            short_name: linuxarm64
+          }
           - {
             name: "MacOS Intel 64bit",
             short_name: macos64
@@ -43,10 +47,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # 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: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",
@@ -38,10 +38,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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

@@ -10,9 +10,9 @@ jobs:
   publish_website:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: IfcOpenShell/ifctester_org_static_html
           token: ${{ secrets.IFCOPENBOT_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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,13 +34,17 @@ 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@v4
+      - uses: actions/checkout@v6
         with:
             submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
 
@@ -55,6 +59,11 @@ jobs:
       - 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 \
@@ -64,17 +73,23 @@ jobs:
           libboost-regex-dev \
           libboost-system-dev \
           libboost-thread-dev \
-          swig libpcre3-dev libxml2-dev \
+          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
+        # TODO: temporarily pointing to 1.2.19 to get notified by dependabot when 1.2.20 is released
+        # to update hardcoded references to commits in some other workflows.
+        # Then we can switch back to 1.2 in all actions.
+        uses: hendrikmuhs/ccache-action@v1.2.19
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 
-      # rocksdb on debian distros misses RTTI?
+      # 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
       - name: build rocksdb
         run: |
           git clone https://github.com/facebook/rocksdb --branch v9.11.2
@@ -95,25 +110,77 @@ jobs:
             ..
           sudo make -j$(nproc) install
 
+      # OpenCOLLADA is ancient, but we still have it in the main build.
+      # So adding it to CI to catch any breakages.
+      - name: build OpenCOLLADA
+        run: |
+          git clone https://github.com/KhronosGroup/OpenCOLLADA
+          cd OpenCOLLADA
+          git checkout v1.6.68
+          patch -p1 --batch --forward -i ../nix/patches/opencollada/pr622_and_disable_subdirs.patch
+          patch -p1 --batch --forward -i ../nix/patches/opencollada/allow_static_libraries_config_on_unix.patch
+          mkdir build && cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_FLAGS_INIT="-fPIC"
+          sudo make -j$(nproc) install
+
+      # We need zstd and libxml2 just for cmake config files to test the examples build.
+      # zslibzstd-dev has cmake config only on Ubuntu 24.04+.
+      - name : Build zstd
+        run: |
+          git clone https://github.com/facebook/zstd --depth 1 --branch v1.5.7
+          cd zstd
+          # `build` already exists.
+          mkdir build_ && cd build_
+          cmake ../build/cmake -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          sudo cmake --build . --target install -j $(nproc)
+
+      # libxml2-dev doesn't have cmake configs even on Ubuntu 24.04+.
+      - name: Build libxml2
+        run: |
+          git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch v2.13.8 --depth 1
+          cd libxml2
+          mkdir build && cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          sudo cmake --build . --target install -j $(nproc)
+
+      # Ubuntu has `swig` package, but we build it to match the version we use in the main build.
+      # To avoid failing tests when checking stub generation.
+      - name: build swig
+        run: |
+          # Remove default swig to avoid conflicts.
+          sudo apt remove --purge swig swig4.0
+          sudo apt-get install -y libpcre2-dev bison
+          git clone https://github.com/swig/swig --branch v4.1.0 --depth 1
+          cd swig
+          mkdir build && cd build
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          sudo make -j$(nproc) install
+
       - name: Build ifcopenshell
         run: |
           echo $Python3_ROOT_DIR
           echo ${{ env.pythonLocation }}
           
           mkdir build && cd build
-          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
-          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
           cmake \
-               -DCMAKE_CXX_STANDARD=17 \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
-               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
-               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
-               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
-               -DCOLLADA_SUPPORT=Off \
                -DUSE_MMAP=On \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
                -DGLTF_SUPPORT=On \
@@ -140,6 +207,20 @@ jobs:
         run: |
           IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj
 
+      - name: Build standalone examples to test cmake package
+        run: |
+          cd src/examples
+          mkdir build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake --build .
+          ./IfcParseExamples "../IfcParseExamples_test.ifc"
+          ./IfcOpenHouse
+          ./IfcAdvancedHouse
+          ./IfcAlignment
+          ./IfcSimplifiedAlignment
+
       - name: Test ifcopenshell-python
         run: |
           cd test

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

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

.github/workflows/docs-deployment.yml

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

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

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

.github/workflows/release.yml

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

.gitignore

@@ -4,6 +4,7 @@
 /_deps-vs*-x*-installed/
 /_installed-vs*-x*/
 /build/
+/src/examples/build/
 
 # output directories
 /cmake/out/
@@ -17,6 +18,7 @@
 # General Python residue
 __pycache__
 *.py.bak
+venv
 
 # Visual Studio Code files
 .vscode
@@ -78,8 +80,6 @@ src/bonsai/bonsai/translations.py
 
 # bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/basic.ifc.cache.blend
-src/bonsai/test/files/basic.ifc.cache.sqlite
 
 # bonsai data
 src/bonsai/bonsai/bim/data/build/
@@ -87,9 +87,7 @@ src/bonsai/bonsai/bim/data/gantt/index.html
 src/bonsai/bonsai/bim/data/gantt/jsgantt.js
 src/bonsai/bonsai/bim/data/gantt/jsgantt.css
 src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js
-
-src/bonsai/drawings
-src/bonsai/layouts
+src/bonsai/bonsai/bim/data/webui/running_pid.json
 
 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so

.gitmodules

@@ -5,15 +5,9 @@
 [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
@@ -23,3 +17,6 @@
 [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

README.md

@@ -52,7 +52,7 @@ Contents
 | [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) |
+| [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/) |

VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

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,9 +13,10 @@ import hashlib
 import os
 import pathlib
 import re
-from urllib import request
-from github import Github
 from typing import NoReturn
+from urllib import request
+
+from github import Github
 
 
 def get_repo_tag_names() -> list[str]:

choco/bonsai/tools/disable_blenderbim_addon.py

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

choco/bonsai/tools/enable_blenderbim_addon.py

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

cmake/CMakePresets.json

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

cmake/FindCGAL.cmake

@@ -0,0 +1,68 @@
+#
+# 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

@@ -0,0 +1,27 @@
+#
+# 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

@@ -0,0 +1,109 @@
+#
+# 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

@@ -0,0 +1,47 @@
+#
+# 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

@@ -0,0 +1,180 @@
+#
+# 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 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

@@ -0,0 +1,145 @@
+#
+# 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

@@ -0,0 +1,56 @@
+#
+# 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

@@ -0,0 +1,86 @@
+#
+# 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

@@ -0,0 +1,30 @@
+#
+# 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

@@ -0,0 +1,59 @@
+@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/package_export.cmake

@@ -0,0 +1,22 @@
+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,8 +19,9 @@
 
 # Create a cache entry if absent for environment variables
 macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
+    if(NOT DEFINED ${VAR} AND DEFINED ENV{${VAR}} AND NOT ENV{${VAR}} STREQUAL "")
         set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
+        mark_as_advanced(${VAR})
     endif()
 endmacro()
 
@@ -113,6 +114,30 @@ 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,7 +9,6 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
  -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
- -D CMAKE_CXX_STANDARD=17 ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -42,9 +41,8 @@ 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
@@ -53,4 +51,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,7 +16,6 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
- -DCMAKE_CXX_STANDARD=17 \
   ${CMAKE_PLATFORM_FLAGS[@]} \
  -DCMAKE_PREFIX_PATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -42,7 +41,6 @@ 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,7 +1,8 @@
-import re
 import argparse
+import re
 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,4 +1,5 @@
 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/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 multiprocessing
+import sys
 
 # 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

@@ -18,8 +18,6 @@
 #                                                                             #
 ###############################################################################
 
-# ruff: noqa: UP035
-
 """
 Example usage:
     # Build all targets by default.
@@ -33,6 +31,7 @@ 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
@@ -52,6 +51,11 @@ 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
 
@@ -95,35 +99,36 @@ Used environment variables:
 
 """
 
-import logging
-import os
-import re
-import sys
 import glob
-import subprocess as sp
-import shutil
-import tarfile
+import logging
 import multiprocessing
+import os
 import platform
-import threading
-import sysconfig
-from datetime import datetime
+import re
+import shutil
 
 # @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 Union, Literal
+    from typing import Literal, Union
 except:
     # python 3.6 compatibility for rocky 8
     from typing import Union
+
     from typing_extensions import Literal
 
 logger = logging.getLogger(__name__)
@@ -135,7 +140,7 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.6"]
+PYTHON_VERSIONS = ["3.10.3", "3.11.8", "3.12.1", "3.13.6", "3.14.0"]
 JSON_VERSION = "3.11.3"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.8.1"
@@ -195,19 +200,61 @@ 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)
+
+    # pyodide provide empty `CXXFLAGS`, leading to issues using C++ files compiled with `-fexceptions`
+    # which is used by OCCT.
+    # https://github.com/pyodide/pyodide-build/issues/251
+    side_module_cxx_flags = os.environ.get("SIDE_MODULE_CXXFLAGS", "")
+    if side_module_cxx_flags.strip():
+        print("SIDE_MODULE_CXXFLAGS are already passed from pyodide build ('{side_module_cxx_flags}').")
+        print("Maybe it's time to stop overriding them in the script?")
+
+    os.environ["SIDE_MODULE_CXXFLAGS"] = os.environ["SIDE_MODULE_CFLAGS"]
 
 # Set defaults for missing empty environment variables
 
@@ -223,9 +270,11 @@ if platform.system() == "Darwin":
 
 IFCOS_NUM_BUILD_PROCS = os.getenv("IFCOS_NUM_BUILD_PROCS", multiprocessing.cpu_count() + 1)
 
-CMAKE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "cmake"))
+SCRIPT_PATH = Path(__file__).parent
+REPO_PATH = SCRIPT_PATH.parent
+CMAKE_DIR = (REPO_PATH / "cmake").resolve().__str__()
 
-build_dir = os.environ.get("BUILD_DIR", os.path.join(os.path.dirname(__file__), "..", "build"))
+BUILD_DIR = os.environ.get("BUILD_DIR", (REPO_PATH / "build").__str__())
 
 
 if WASM:
@@ -234,7 +283,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
@@ -266,6 +315,7 @@ 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)
@@ -282,6 +332,11 @@ 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.
+"""
+)
 
 dependency_tree: "dict[str, tuple[str, ...]]" = {
     "IfcParse": ("boost", "libxml2", "hdf5", "rocksdb"),
@@ -294,14 +349,13 @@ dependency_tree: "dict[str, tuple[str, ...]]" = {
     "boost": (),
     "libxml2": (),
     "python": (),
-    "occ": ("freetype",),
+    "occ": (),
     "pcre": (),
     "pcre2": (),
     "json": (),
     "hdf5": (),
     "cgal": (),
     "eigen": (),
-    "freetype": (),
     "rocksdb": ("zstd",),
     "zstd": (),
     # 'usd': ('boost', 'oneTBB')
@@ -328,11 +382,13 @@ 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
@@ -349,14 +405,29 @@ if any(f.startswith("py-") for f in flags):
 if any(f.startswith("occt-") for f in flags):
     OCCT_VERSION = next(f.split("-", 1)[1] for f in flags if f.startswith("occt-"))
 
-print(OCCT_VERSION)
-
 if explicit_targets:
     targets = {dep for target in explicit_targets for dep in gather_dependencies(target)}
 else:
     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",
+        "pcre2",
+        "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)))))
 
@@ -365,16 +436,21 @@ yacc = "yacc"  # Used during swig building process, installed with `bison` on De
 missing_commands: "list[str]" = []
 required_commands = [git, bunzip2, tar, cc, cplusplus, autoconf, automake, make, "patch", "cmake", yacc, xz]
 if "wasm" in flags:
-    required_commands.remove(yacc)  # yacc not needed for wasm builds
+    # Skip swig build for WASM.
+    required_commands.append("swig")
+    required_commands.append("pyodide")
+    required_commands.remove(yacc)
+
 for cmd in required_commands:
-    if which(cmd) is None:
+    if shutil.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 = "/usr/local/bin/brew"
+    brew = f"{MAC_INTEL_BIN_PATH}/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)
@@ -398,6 +474,13 @@ 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,
@@ -497,16 +580,27 @@ 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,
@@ -637,7 +731,7 @@ def build_dependency(
         if isinstance(patch, str):
             patch = [patch]
         for p in patch:
-            patch_abs = os.path.abspath(os.path.join(os.path.dirname(__file__), p))
+            patch_abs = (SCRIPT_PATH / p).absolute().__str__()
             if os.path.exists(patch_abs):
                 try:
                     run(["patch", "-p1", "--batch", "--forward", "-i", patch_abs], cwd=extract_dir)
@@ -724,12 +818,13 @@ 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:
-    CFLAGS_MINIMAL = CXXFLAGS_MINIMAL = CFLAGS = CXXFLAGS = os.environ["SIDE_MODULE_CFLAGS"]
-    LDFLAGS = os.environ["SIDE_MODULE_LDFLAGS"]
+    # WASM `SIDE_MODULE_` are absorbed by `emcmake` automatically.
+    CXXFLAGS = CXXFLAGS_MINIMAL
+    CFLAGS = CFLAGS_MINIMAL
 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}"
@@ -738,8 +833,6 @@ 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}"
@@ -819,9 +912,9 @@ if "eigen" in targets:
     )
 
 if "pcre" in targets:
-    OLD_CC, OLD_CCXX = None, None
+    OLD_CC, OLD_CXX = None, None
     if MAC_CROSS_COMPILE_INTEL:
-        OLD_CC, OLD_CCXX = os.environ.get("CC"), os.environ.get("CXX")
+        OLD_CC, OLD_CXX = 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
@@ -834,14 +927,8 @@ if "pcre" in targets:
         download_name=f"pcre-{PCRE_VERSION}.tar.bz2",
     )
     if MAC_CROSS_COMPILE_INTEL:
-        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
+        restore_env("CC", OLD_CC)
+        restore_env("CXX", OLD_CXX)
 
 if "pcre2" in targets:
     build_dependency(
@@ -852,11 +939,9 @@ if "pcre2" in targets:
         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",
+        name=f"swig-{SWIG_VERSION}",
         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",
@@ -865,17 +950,6 @@ if "swig" in targets:
         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:
     patches = []
     if OCCT_VERSION < "7.4":
@@ -910,7 +984,6 @@ 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,
         ],
@@ -1012,6 +1085,7 @@ 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()
@@ -1020,6 +1094,10 @@ 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:
@@ -1041,6 +1119,9 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
             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
@@ -1086,14 +1167,23 @@ if "boost" in targets:
 if "cgal" in targets:
     gmp_args: "list[str]" = []
     mpfr_args: "list[str]" = []
-    if "wasm" in flags:
-        gmp_args.extend(("--disable-assembly", "--host", "none", "--enable-cxx"))
+
+    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"))
         mpfr_args.extend(("--host", "none"))
 
     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}",
@@ -1102,10 +1192,14 @@ if "cgal" in targets:
         pre_compile_subs=(
             [("build/config.h", "HAVE_OBSTACK_VPRINTF 1", "HAVE_OBSTACK_VPRINTF 0")] if "wasm" in flags else []
         ),
-        download_url="https://ftp.gnu.org/gnu/gmp/",
+        # Sometimes ftp.gnu.org is very slow, use ftpmirror.gnu.org as a workaround.
+        download_url="https://ftpmirror.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",
@@ -1115,10 +1209,7 @@ if "cgal" in targets:
     )
 
     if MAC_CROSS_COMPILE_INTEL:
-        if OLD_CC is None:
-            del os.environ["CC"]
-        else:
-            os.environ["CC"] = OLD_CC
+        restore_env("CC", OLD_CC)
 
     build_dependency(
         name=f"cgal-{CGAL_VERSION}",
@@ -1227,7 +1318,6 @@ 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],
@@ -1249,15 +1339,19 @@ 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)
-    return [f"-DCMAKE_PREFIX_PATH={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}"]
 
 
 if "wasm" in flags:
     # Boost is built by the build script so should not be found
     # inside of the sysroot set by the emscriptem toolchain
     cmake_args.append("-DWASM_BUILD=On")
-    # set Eigen3 path for WASM to avoid find_package issues
-    cmake_args.append(f"-DEIGEN_DIR={DEPS_DIR}/install/eigen-install-{EIGEN_VERSION}/include/eigen3")
 
 schemas = os.environ.get("IFCOS_SCHEMAS")
 if schemas:
@@ -1267,26 +1361,10 @@ 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}")
-    if "wasm" in flags:
-        cmake_args.extend(
-            [
-                f"-DCGAL_INCLUDE_DIR={DEPS_DIR}/install/cgal-{CGAL_VERSION}/include",
-                f"-DGMP_INCLUDE_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/include",
-                f"-DGMP_LIBRARY_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/lib",
-                f"-DMPFR_INCLUDE_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include",
-                f"-DMPFR_LIBRARY_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib",
-            ]
-        )
+    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}")
-    if "wasm" in flags:
-        cmake_args.extend(
-            [
-                f"-DOCC_INCLUDE_DIR={DEPS_DIR}/install/occt-{OCCT_VERSION}/include/opencascade",
-                f"-DOCC_LIBRARY_DIR={DEPS_DIR}/install/occt-{OCCT_VERSION}/lib",
-            ]
-        )
 
 elif "occ" in targets:
     # We don't support find_package for OCE.
@@ -1307,13 +1385,6 @@ else:
 
 if "libxml2" in targets:
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")
-    if "wasm" in flags:
-        cmake_args.extend(
-            [
-                f"-DLIBXML2_INCLUDE_DIR={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2",
-                f"-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}",
-            ]
-        )
 
 if "hdf5" in targets:
     cmake_args_prefix_path.append(f"{DEPS_DIR}/install/hdf5-{HDF5_VERSION}")
@@ -1321,11 +1392,11 @@ else:
     cmake_args.append("-DHDF5_SUPPORT=Off")
 
 if "usd" in targets:
-    cmake_args.extend(
+    cmake_args.append("-DUSD_SUPPORT=ON")
+    cmake_args_prefix_path.extend(
         [
-            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",
+            f"{DEPS_DIR}/install/tbb-{TBB_VERSION}",
+            f"{DEPS_DIR}/install/usd-{USD_VERSION}",
         ]
     )
 
@@ -1343,7 +1414,10 @@ if "rocksdb" in targets:
         ]
     )
 
-if not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets):
+if "swig" in targets:
+    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/swig-{SWIG_VERSION}")
+
+if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets)):
     logger.info("\rConfiguring executables...")
 
     exec_args = [
@@ -1358,17 +1432,14 @@ if not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(expl
 
     logger.info("\rBuilding executables...   ")
 
-    run([make, f"-j{IFCOS_NUM_BUILD_PROCS}"], cwd=executables_dir)
+    run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "VERBOSE=1"], 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,-flat_namespace,-undefined,suppress"
-
-    if "wasm" in flags:
-        ADDITIONAL_ARGS = f"-Wl,-undefined,suppress -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS=_PyInit__ifcopenshell_wrapper"
+        ADDITIONAL_ARGS = "-Wl,-undefined,dynamic_lookup"
 
     # 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)
@@ -1382,40 +1453,44 @@ if "IfcOpenShell-Python" in targets:
     os.makedirs(python_dir, exist_ok=True)
 
     def compile_python_wrapper(
-        python_version: str, python_library: str, python_include: str, python_executable: Union[str, None]
+        python_version: str,
+        python_include: Union[str, None] = None,
+        python_executable: Union[str, None] = None,
+        python_path: Union[Path, None] = 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)
 
-        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")
+        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'))",
+                ]
+            )
 
+        assert python_include
         run_cmake(
             "",
             cmake_args
-            + get_cmake_args_prefix_path(swig_prefix_paths)
+            + get_cmake_args_prefix_path()
             + [
-                "-DPYTHON_LIBRARY=" + python_library,
                 *([f"-DPYTHON_EXECUTABLE={python_executable}"] if python_executable else []),
-                # *([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,
+                # 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"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/ifcopenshell/tmp",
                 "-DUSERSPACE_PYTHON_PREFIX="
                 + ["Off", "On"][os.environ.get("PYTHON_USER_SITE", "").lower() in {"1", "on", "true"}],
@@ -1426,7 +1501,7 @@ if "IfcOpenShell-Python" in targets:
 
         logger.info(f"\rBuilding python {python_version} wrapper...   ")
 
-        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper"], cwd=python_dir)
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper", "VERBOSE=1"], cwd=python_dir)
         run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))
 
         if python_executable:
@@ -1453,32 +1528,19 @@ if "IfcOpenShell-Python" in targets:
 
     if "wasm" in flags:
         compile_python_wrapper(
-            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,
+            run(["pyodide", "config", "get", "python_version"]),
+            run(["pyodide", "config", "get", "python_include_dir"]),
         )
+        # Copy setup.py where pyodide build system expects it.
+        shutil.copy(REPO_PATH / "pyodide" / "setup.py", REPO_PATH)
 
     elif USE_CURRENT_PYTHON_VERSION:
         python_info = sysconfig.get_paths()
-
-        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)
+        compile_python_wrapper(platform.python_version(), python_info["include"], sys.executable)
     else:
         for python_version in PYTHON_VERSIONS:
-            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)
+            python_path = Path(DEPS_DIR) / "install" / f"python-{python_version}"
+            module_dir = compile_python_wrapper(python_version, python_path=python_path)
             assert module_dir
             # Not sure why, but added after reading this in the logs
             # cp: /Users/runner/work/IfcOpenShell/IfcOpenShell/build/Darwin/x86_64/10.15/install/ifcopenshell/python-3.9.11: No such file or directory

pyodide/README.md

@@ -0,0 +1,32 @@
+
+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

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

pyodide/cache_dependencies.py

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

pyodide/meta.yaml

@@ -3,13 +3,12 @@ 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 --without-rocksdb --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py313 IfcOpenShell-Python
-    mv package/ifcopenshell .
-    cp pyodide/setup.py .
+    BUILD_CFG=Release python nix/build-all.py -v --wasm --py313
 
 about:
   home: http://ifcopenshell.org

pyodide/setup.py

@@ -1,11 +1,47 @@
-from setuptools import setup, find_packages
+# 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
 
-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={'ifcopenshell': ['util/schema/*.json', 'util/schema/*.ifc'], '': ['*.so', '*.json', '*.ifc']},
+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=[])],
 )

pyodide/test/test_wheel.py

@@ -0,0 +1,26 @@
+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,3 +1,13 @@
+[project]
+name = "IfcOpenShell"
+version = "0.0.0"
+dependencies = [
+    "black==25.12",
+    "ruff==0.14.10",
+    "poethepoet",
+    "gersemi==0.24",
+]
+
 [tool.black]
 line-length = 120
 include = '''
@@ -9,10 +19,8 @@ extend-exclude = '''
     |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]
@@ -21,12 +29,11 @@ disableBytesTypePromotions = true
 reportUnnecessaryTypeIgnoreComment = true
 
 # Define here general ruff settings,
-# then they will be inherited projects .toml files.
+# then they will be inherited by 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",
@@ -50,6 +57,7 @@ select = [
     "UP",          # pyupgrade
     "RUF015",      # next() > list_comprehension[0]
     "RUF022",      # sort __all__
+    "I",           # import sorting
 ]
 ignore = [
     "FA100", # Conflicts with Blender using annotations for props definitions.
@@ -62,3 +70,16 @@ ignore = [
     "UP031", # Replace % with .format
     "UP032", # Replace .format with f-string
 ]
+
+[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 ."
+
+format.sequence = ["black", "ruff-main", "ruff-old"]
+
+cmake-format = "gersemi cmake src --in-place"

src/bcf/bcf/agnostic/extensions.py

@@ -1,7 +1,8 @@
+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,6 +1,7 @@
+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,13 +1,14 @@
 import tempfile
+from pathlib import Path
+from typing import Optional, Union
+
+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,5 +1,6 @@
-import bcf.v2.visinfo
-import bcf.v3.visinfo
 from typing import Union
 
+import bcf.v2.visinfo
+import bcf.v3.visinfo
+
 VisualizationInfoHandler = Union[bcf.v2.visinfo.VisualizationInfoHandler, bcf.v3.visinfo.VisualizationInfoHandler]

src/bcf/bcf/bcfxml.py

@@ -29,7 +29,6 @@ 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/inmemory_zipfile.py

@@ -7,6 +7,7 @@ original idea from https://stackoverflow.com/a/19722365/1307905
 """
 
 from __future__ import annotations
+
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -26,7 +27,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, False)
+        self.in_memory_zip = zipfile.ZipFile(self.in_memory_data, "w", compression, True)
         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,6 +1,7 @@
 """BCF XML V2 handler."""
 
 from __future__ import annotations
+
 import uuid
 import warnings
 import zipfile

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

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

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

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

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

@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
     name: Optional[str] = field(
         default=None,
@@ -24,7 +21,7 @@ class Project:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectExtension:
     project: Optional[Project] = field(
         default=None,

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

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

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

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

src/bcf/bcf/v2/topic.py

@@ -1,6 +1,7 @@
 """BCF XML V2 Topic handler."""
 
 from __future__ import annotations
+
 import datetime
 import tempfile
 import uuid

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

src/bcf/bcf/v3/bcfxml.py

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

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

@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Document:
     filename: str = field(
         metadata={
@@ -37,7 +34,7 @@ class Document:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfoDocuments:
     class Meta:
         global_type = False
@@ -52,7 +49,7 @@ class DocumentInfoDocuments:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfo:
     documents: Optional[DocumentInfoDocuments] = field(
         default=None,

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

@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsPriorities:
     class Meta:
         global_type = False
@@ -22,7 +19,7 @@ class ExtensionsPriorities:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsSnippetTypes:
     class Meta:
         global_type = False
@@ -39,7 +36,7 @@ class ExtensionsSnippetTypes:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsStages:
     class Meta:
         global_type = False
@@ -56,7 +53,7 @@ class ExtensionsStages:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicLabels:
     class Meta:
         global_type = False
@@ -73,7 +70,7 @@ class ExtensionsTopicLabels:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicStatuses:
     class Meta:
         global_type = False
@@ -90,7 +87,7 @@ class ExtensionsTopicStatuses:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicTypes:
     class Meta:
         global_type = False
@@ -107,7 +104,7 @@ class ExtensionsTopicTypes:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsUsers:
     class Meta:
         global_type = False
@@ -124,7 +121,7 @@ class ExtensionsUsers:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Extensions:
     topic_types: Optional[ExtensionsTopicTypes] = field(
         default=None,

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

@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
 from xsdata.models.datatype import XmlDateTime
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
     reference: str = field(
         metadata={
@@ -47,7 +44,7 @@ class BimSnippet:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
     class Meta:
         global_type = False
@@ -62,7 +59,7 @@ class CommentViewpoint:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentReference:
     document_guid: Optional[str] = field(
         default=None,
@@ -103,7 +100,7 @@ class DocumentReference:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class File:
     filename: Optional[str] = field(
         default=None,
@@ -160,7 +157,7 @@ class File:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicLabels:
     class Meta:
         global_type = False
@@ -177,7 +174,7 @@ class TopicLabels:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicReferenceLinks:
     class Meta:
         global_type = False
@@ -194,7 +191,7 @@ class TopicReferenceLinks:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopicsRelatedTopic:
     class Meta:
         global_type = False
@@ -209,7 +206,7 @@ class TopicRelatedTopicsRelatedTopic:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
     viewpoint: Optional[str] = field(
         default=None,
@@ -249,7 +246,7 @@ class ViewPoint:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
     date: XmlDateTime = field(
         metadata={
@@ -315,7 +312,7 @@ class Comment:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFiles:
     class Meta:
         global_type = False
@@ -330,7 +327,7 @@ class HeaderFiles:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReferences:
     class Meta:
         global_type = False
@@ -345,7 +342,7 @@ class TopicDocumentReferences:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopics:
     class Meta:
         global_type = False
@@ -360,7 +357,7 @@ class TopicRelatedTopics:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicViewpoints:
     class Meta:
         global_type = False
@@ -375,7 +372,7 @@ class TopicViewpoints:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
     files: Optional[HeaderFiles] = field(
         default=None,
@@ -387,7 +384,7 @@ class Header:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicComments:
     class Meta:
         global_type = False
@@ -402,7 +399,7 @@ class TopicComments:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
     reference_links: Optional[TopicReferenceLinks] = field(
         default=None,
@@ -599,7 +596,7 @@ class Topic:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
     header: Optional[Header] = field(
         default=None,

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

@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
     name: Optional[str] = field(
         default=None,
@@ -28,7 +25,7 @@ class Project:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectInfo:
     project: Project = field(
         metadata={

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

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

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

@@ -1,18 +1,14 @@
-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(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
     originating_system: Optional[str] = field(
         default=None,
@@ -43,7 +39,7 @@ class Component:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
     x: float = field(
         metadata={
@@ -68,7 +64,7 @@ class Direction:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
     x: float = field(
         metadata={
@@ -93,7 +89,7 @@ class Point:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
     spaces_visible: bool = field(
         default=False,
@@ -118,7 +114,7 @@ class ViewSetupHints:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Bitmap:
     format: BitmapFormat = field(
         metadata={
@@ -166,7 +162,7 @@ class Bitmap:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
     location: Point = field(
         metadata={
@@ -184,7 +180,7 @@ class ClippingPlane:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColorComponents:
     class Meta:
         global_type = False
@@ -199,7 +195,7 @@ class ComponentColoringColorComponents:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
     component: list[Component] = field(
         default_factory=list,
@@ -210,7 +206,7 @@ class ComponentSelection:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
     class Meta:
         global_type = False
@@ -224,7 +220,7 @@ class ComponentVisibilityExceptions:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
     start_point: Point = field(
         metadata={
@@ -242,7 +238,7 @@ class Line:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
     """
     Attributes
@@ -292,7 +288,7 @@ class OrthogonalCamera:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
     """
     Attributes
@@ -348,7 +344,7 @@ class PerspectiveCamera:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
     class Meta:
         global_type = False
@@ -370,7 +366,7 @@ class ComponentColoringColor:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
     view_setup_hints: Optional[ViewSetupHints] = field(
         default=None,
@@ -395,7 +391,7 @@ class ComponentVisibility:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmaps:
     class Meta:
         global_type = False
@@ -409,7 +405,7 @@ class VisualizationInfoBitmaps:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
     class Meta:
         global_type = False
@@ -423,7 +419,7 @@ class VisualizationInfoClippingPlanes:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
     class Meta:
         global_type = False
@@ -437,7 +433,7 @@ class VisualizationInfoLines:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
     color: list[ComponentColoringColor] = field(
         default_factory=list,
@@ -448,7 +444,7 @@ class ComponentColoring:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
     selection: Optional[ComponentSelection] = field(
         default=None,
@@ -473,7 +469,7 @@ class Components:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
     """
     VisualizationInfo documentation.

src/bcf/bcf/v3/topic.py

@@ -1,6 +1,7 @@
 """BCF XML V3 Topic handler."""
 
 from __future__ import annotations
+
 import datetime
 import uuid
 import zipfile

src/bcf/bcf/v3/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 Any, 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.v3.model as mdl

src/bcf/tests/conftest.py

@@ -1,5 +1,4 @@
 import pytest
-
 from bcf.xml_parser import XmlParserSerializer
 
 

src/bcf/tests/v2/test_bcf_xml.py

@@ -4,9 +4,8 @@ import uuid
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-import pytest
-
 import bcf.v2.model as mdl
+import pytest
 from bcf.v2.bcfxml import BcfXml
 from bcf.v2.topic import TopicHandler
 from bcf.v2.visinfo import (

src/bcf/tests/v2/test_example_files.py

@@ -3,11 +3,10 @@ import os
 import zipfile
 from pathlib import Path
 
-from xsdata.models.datatype import XmlDateTime
-
 import bcf.v2.model as mdl
 from bcf.v2.bcfxml import BcfXml
 from bcf.v2.topic import TopicHandler
+from xsdata.models.datatype import XmlDateTime
 
 
 def test_maximum_information() -> None: