checkout v0.7.0 -- src/ifcgeom_schema_agnostic/IfcGeomRepresentation.cpp

Reinclude missing max_protrusions_
Merge remote-tracking branch 'origin/v0.7.0' into feature-clash2
2026-08-08 08:51:35 +00:00 · 2024-03-26 15:13:15 +01:00 · 2024-03-26 23:04:32 +11:00 · 2024-03-26 11:21:45 +01:00 · 2024-03-26 11:00:16 +01:00 · 2024-03-06 21:44:43 +01:00
1867 changed files with 385587 additions and 218399 deletions
@@ -1,24 +0,0 @@
-# We'll use defaults from the LLVM style with modifications
-BasedOnStyle: LLVM
-ColumnLimit: 0 # we do not enforce column lenght, please format responsibly
-IndentWidth: 4
---
-Language: Cpp
-AllowShortEnumsOnASingleLine: false
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:
-    SplitEmptyFunction: false
-    SplitEmptyRecord: false
-    SplitEmptyNamespace: false
-IncludeBlocks: Regroup
-InsertBraces: true
-InsertNewlineAtEOF: true
-PackConstructorInitializers: CurrentLine
-PointerAlignment: Left
-ReflowComments: false # keep licenze comment blocks
-SortIncludes: CaseInsensitive
-SpacesInLineCommentPrefix:
-    Maximum: 1
-TabWidth: 4
@@ -1,5 +0,0 @@
-Checks:          'bugprone-*,cert-*,clang-analyzer-*,readability-*'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
-FormatStyle: none
@@ -1,10 +1,8 @@
-name: ci-ifcopenshell-docker
+name: CD

 on: 
-  workflow_dispatch:
  push:
-      tags:
-        - v0.**
+

 jobs:

@@ -18,7 +16,7 @@ jobs:
    - run: echo ok go

  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: activate
    steps:
    - uses: actions/checkout@v2
@@ -31,7 +29,7 @@ jobs:
        sudo apt-get install --no-install-recommends \
        git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-dev \
        libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-        libhdf5-dev libcgal-dev nlohmann-json3-dev libeigen3-dev
+        libhdf5-dev libcgal-dev nlohmann-json3-dev

    -
      name: ccache
@@ -52,8 +50,8 @@ jobs:
         -DOCC_INCLUDE_DIR=/usr/include/opencascade \
         -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
         -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.10 \
-         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
         -DCOLLADA_SUPPORT=Off \
         -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
         -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
@@ -65,7 +63,6 @@ jobs:
         -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
         -DGLTF_SUPPORT=On \
         -DJSON_INCLUDE_DIR=/usr/include \
-         -DEIGEN_DIR=/usr/include/eigen3 \
         ../cmake
        make -j $(nproc)
        make install
@@ -83,7 +80,7 @@ jobs:
        path: build/assets/Ifc*

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

@@ -1,8 +1,24 @@
 name: ci-bcf-pypi

 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-bcf-pypi.yml'
  workflow_dispatch:

+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
  activate:
    runs-on: ubuntu-latest
@@ -32,10 +48,10 @@ jobs:
        run: |
          pip install build
          cd src/bcf &&
-          make dist IS_STABLE=TRUE
+          make dist
      - name: Publish a Python distribution to PyPI
        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bcf/dist
+          packages_dir: src/bcf/dist
@@ -1,12 +0,0 @@
-name: ci-black-formatting
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: psf/black@stable
@@ -28,18 +28,65 @@ jobs:

  build:
    needs: activate
-    name: "choco_release"
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
+      matrix:
+        pyver: [py310]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          fetch-tags: true
-          fetch-depth: 0
+          python-version: '3.10.9' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
      - run: echo ${{ env.DATE }}
-      - name: Check in release tags if we should do a choco release and perform the release if needed
-        id: do_choco_release
+
+      - name: Check in published releases if we should do a choco release
+        id: do_choco
        run: |
+          echo "::set-output name=choco_release::$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --do_choco_release?)"
+
+      - name: Fill chocolatey scripts on win with latest blender python
+        if: ${{steps.do_choco.outputs.choco_release}} == 'do_choco_release'
+        run: |
+          yesterday_non_iso="$(date  --date='yesterday' +'%y%m%d' | tr -d '\n')" &&
+          target_os=${{ matrix.config.short_name }} &&
+          latest_blender_python_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_python_version_maj_min?) &&
+          echo "latest_blender_python_version_maj_min?: $latest_blender_python_version_maj_min" &&
+          pyver=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --pyver?) &&
+          export latest_blender_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min?) &&
+          export latest_blender_version_maj_min_pat=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min_pat?) &&
+          echo   latest_blender_version_maj_min_pat?: $latest_blender_version_maj_min_pat &&
+          export blenderbim_build_version="${{ env.major }}.${{ env.minor }}.$yesterday_non_iso" &&
+          export url_blenderbim_py310_win_zip="https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-$yesterday_non_iso/blenderbim-$yesterday_non_iso-$pyver-$target_os.zip" &&
+          wget $url_blenderbim_py310_win_zip --no-verbose &&
+          export sha256sum_blenderbim_py310_win_zip=$( sha256sum blenderbim-$yesterday_non_iso-$pyver-$target_os.zip  --tag | cut -d ' ' -f 4  | tr -d '\n') &&
+          echo   sha256sum_blenderbim_py310_win_zip: $sha256sum_blenderbim_py310_win_zip &&
+          python3 choco/blenderbim/fill_dynamic_parameters.py &&
+          echo __build choco with mono &&
+          wget "https://github.com/chocolatey/choco/archive/refs/tags/$choco_version.tar.gz" --quiet &&
+          tar -xzf "$choco_version.tar.gz" &&
+          cd choco-$choco_version &&
+          chmod +x build.sh zip.sh &&
+          ./build.sh &&
+          cp -r build_output/chocolatey /opt/chocolatey &&
          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
-          python3 choco_release.py
+          echo __choco pack &&
+          mono /opt/chocolatey/choco.exe --version &&
+          mono /opt/chocolatey/choco.exe pack --allow-unofficial &&
+          echo __choco set apiKey &&
+          mono /opt/chocolatey/choco.exe setapikey --key="$CHOCO_TOKEN" --source="https://push.chocolatey.org/" --allow-unofficial # &&
+          echo __choco push &&
+          mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose
+
+      - name: Inform user about not packaging
+        if: ${{steps.do_choco.outputs.choco_release}} != 'do_choco_release'
+        run: |
+          echo "no releases found today ${{ env.DATE }}, therefore choco packaging is skipped."
+
@@ -1,12 +1,12 @@
-name: ci-blenderbim-daily
+name: Publish-blenderbim-multiplatform

 on:
  push:
    paths:
-      - '.github/workflows/ci-blenderbim-daily.yml'
+      - '.github/workflows/ci-blenderbim-matrix.yml'
      - 'src/blenderbim/**'
      - 'src/ifcopenshell-python/ifcopenshell/**'
-      - 'src/bcf/bcf/**'
+      - 'src/bcf/src/bcf/**'
      - 'src/ifcclash/ifcclash/**'
      - 'src/ifccobie/**'
      - 'src/ifcdiff/**'
@@ -16,8 +16,12 @@ on:
      - 'src/ifc5d/ifc5d/**'
      - 'src/ifccityjson/**'
    branches:
-      - v0.8.0
-  workflow_dispatch:
+      - v0.7.0
+
+env:
+  major: 0
+  minor: 0
+  name: blenderbim

 jobs:
  activate:
@@ -35,7 +39,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py310, py311, py312]
+        pyver: [py39, py310, py311]
        config:
          - {
            name: "Windows Build",
@@ -43,15 +47,15 @@ jobs:
          }
          - {
            name: "Linux Build",
-            short_name: linux,
+            short_name: linux
          }
          - {
            name: "MacOS Build",
-            short_name: macos,
+            short_name: macos
          }
          - {
            name: "MacOS ARM Build",
-            short_name: macosm1,
+            short_name: macosm1
          }
    steps:
      - uses: actions/checkout@v2
@@ -59,27 +63,21 @@ jobs:
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - run: echo ${{ env.DATE }}
      - name: Get current date
        id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
      - name: Compile
        run: |
-          cd src/blenderbim && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
+          cp -r src/blenderbim src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          cd src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+      - name: Upload Zip file to release
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.find_zip.outputs.filepath }}
-          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
-          tag: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
+          file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
+          asset_name: blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
+          tag: "blenderbim-${{steps.date.outputs.date}}"
          overwrite: true
+          body: "Daily developer testing build blenderbim-${{steps.date.outputs.date}}"
@@ -1,72 +0,0 @@
-name: ci-blenderbim
-
-# Differences from ci-blenderbim-daily.yml:
-# - make has IS_STABLE=TRUE
-# - action is never triggered and executed only manually
-# - doesn't add a current date to the release and tag
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py310, py311, py312]
-        config:
-          - {
-            name: "Windows Build",
-            short_name: win,
-          }
-          - {
-            name: "Linux Build",
-            short_name: linux
-          }
-          - {
-            name: "MacOS Build",
-            short_name: macos
-          }
-          - {
-            name: "MacOS ARM Build",
-            short_name: macosm1
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/blenderbim &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.find_zip.outputs.filepath }}
-          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "blenderbim-${{steps.version.outputs.version}}"
-          tag: "blenderbim-${{steps.version.outputs.version}}"
-          overwrite: true
@@ -1,35 +0,0 @@
-name: ci-bsdd-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/bsdd &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bsdd/dist
@@ -1,35 +0,0 @@
-name: ci-ifc4d-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifc4d &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifc4d/dist
@@ -1,35 +0,0 @@
-name: ci-ifc5d-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifc5d &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifc5d/dist
@@ -1,35 +0,0 @@
-name: ci-ifccityjson-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifccityjson &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifccityjson/dist
@@ -1,35 +0,0 @@
-name: ci-ifcclash-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcclash &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcclash/dist
@@ -1,65 +0,0 @@
-name: ci-ifcconvert
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows 64bit",
-            short_name: win64,
-          }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
-          - {
-            name: "Linux 64bit",
-            short_name: linux64
-          }
-          - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
-          }
-          - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/ifcopenshell-python &&
-          make zip-ifcconvert PLATFORM=${{ matrix.config.short_name }}
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcopenshell-python/dist/ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
-          asset_name: ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
-          release_name: "ifcconvert-${{steps.version.outputs.version}}"
-          tag: "ifcconvert-${{steps.version.outputs.version}}"
-          overwrite: true
@@ -1,35 +0,0 @@
-name: ci-ifccsv-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifccsv &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifccsv/dist
@@ -1,35 +0,0 @@
-name: ci-ifcdiff-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcdiff &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcdiff/dist
@@ -1,35 +0,0 @@
-name: ci-ifcfm-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcfm &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcfm/dist
@@ -1,104 +0,0 @@
-name: ci-ifcopenshell-conda-daily-cleaner
-
-on:
-  workflow_dispatch:
-  schedule:
-  #         ┌───────────── minute (0 - 59)
-  #         │  ┌───────────── hour (0 - 23)
-  #         │  │ ┌───────────── day of the month (1 - 31)
-  #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-  #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-  #         *  * * * *
-  - cron: "00 23 * * *" # 11min before utc midnight every day
-
-env:
-  ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
-  NUM_SUPPORTED_VERSIONS: 5
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash -l {0}
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
-        with:
-          environment-name: test-env
-          create-args: >-
-            python=3.11
-            anaconda-client=1.12.3
-
-      - name: Run conda cleaner
-        run: |
-          python - << EOF
-          
-          import os
-          from datetime import datetime, timedelta
-          from binstar_client.utils import get_server_api
-          from binstar_client.errors import BinstarError
-          
-          # Configuration
-          api_token = os.environ.get('ANACONDA_TOKEN')
-          pkg_name = 'ifcopenshell'
-          channel_name = 'ifcopenshell'
-          
-          # Authenticate with Anaconda
-          aserver_api = get_server_api(token=api_token)
-          
-          
-          # Get the list of packages in the channel
-          def get_package(filter_package_name: str = None):
-              try:
-                  user_packages = aserver_api.user_packages(channel_name)
-                  if filter_package_name:
-                      user_packages = [pkg for pkg in user_packages if pkg['name'] == filter_package_name]
-                  if len(user_packages) == 0:
-                      print(f"No packages found for {filter_package_name}.")
-                  if len(user_packages) > 1:
-                      raise ValueError(f"Found {len(user_packages)} package for {filter_package_name}. Will only support 1 package.")
-          
-                  return user_packages[0]
-              except BinstarError as err:
-                  raise ValueError(f"Failed to fetch packages: {err}")
-          
-          
-          # Delete a package version
-          def delete_package(package_name, version):
-              try:
-                  aserver_api.remove_release(channel_name, package_name, version)
-                  print(f"Deleted {package_name} version {version}")
-              except BinstarError as err:
-                  print(f"Failed to delete {package_name} version {version}: {err}")
-          
-          
-          # Main logic
-          def main():
-              package = get_package(pkg_name)
-              if not package:
-                  print("No packages found.")
-                  return
-          
-              number_of_supported_versions = ${{ env.NUM_SUPPORTED_VERSIONS }}
-          
-              package_name = package['name']
-              versions = package["versions"]
-              if len(versions) <= number_of_supported_versions:
-                  print(f"Number of versions {len(versions)} is less than or equal to {number_of_supported_versions}.")
-                  return
-          
-              # sort the versions in descending order
-              print(f"Before reversal: {versions=}")
-              versions.reverse()
-              print(f"After reversal: {versions=}")
-          
-              releases = versions[number_of_supported_versions:]
-          
-              for release in releases:
-                  delete_package(package_name, release)
-          
-          main()
-          
-          EOF
@@ -1,4 +1,4 @@
-name: ci-ifcopenshell-conda-daily-v0.8.0
+name: ci-ifcopenshell-conda-daily

 on:
  workflow_dispatch:
@@ -12,35 +12,8 @@ on:
  - cron: "49 23 * * *" # 11min before utc midnight every day

 jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      date: ${{ steps.date.outputs.date }}
-      verdate: ${{ steps.verdate.outputs.verdate }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env
-        run: echo ok go
-      
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
-
-      - name: Version + date str
-        id: verdate
-        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
-
-      
  test:
    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
-    needs: activate
    runs-on: ${{ matrix.platform.distver }}
    defaults:
      run:
@@ -48,57 +21,47 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        variant: [novtk, all]
        pyver: [
-#          { name: py311, distver: '3.11'},
+          { name: py311, distver: '3.11'},
          { name: py312, distver: '3.12'}
        ]
        platform: [
-          { name: win, distver: windows-latest, pkg_dir: 'win-64' },
-          { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
+          { name: Windows, distver: windows-2022, upload: 'true' },
+          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
+          { name: macOS, distver: macos-12, upload: 'true' }
+        ]
+        variant: [
+          'novtk',
+#          'all'
        ]
    steps:
-      - name: Set up swap space
-        if: runner.os == 'Linux'
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 10
-
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          submodules: recursive

-      - name: Download and extract MacOSX SDK
-        if: ${{ runner.os == 'macOS' }}
+      - name: Download MacOSX SDK
+        if: ${{ matrix.platform.name == 'macOS' }}
        run: |
-          curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
+          curl -o MacOSX10.13.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz && \
+          tar xf MacOSX10.13.sdk.tar.xz && \
+          sudo mv -v MacOSX10.13.sdk /opt/ && \
+          ls /opt/

      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
        with:
-          environment-name: test-env
+          environment-name: build-env
+          cache-environment: true
+          condarc: |
+            channels:
+              - conda-forge
+            channel_priority: strict
          create-args: >-
            python=3.11
            anaconda-client
            boa

-      - name: create conda package dist dir
+      - name: build, test and upload ifcopenshell
+        if: ${{ matrix.platform.upload == 'true' }}
        run: |
-          mkdir -p ${{ github.workspace }}/dist
-
-      - name: build & test ifcopenshell
-        run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist' --variants='{variant: ${{ matrix.variant }}}'
+          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
        working-directory: ./conda
-        env:
-          VERSION_OVERRIDE: ${{ needs.activate.outputs.verdate }}
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name == 'win' }}
-        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name != 'win' }}
-        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2
@@ -1,7 +1,18 @@
-name: ci-ifcopenshell-python-pypi
+name: ci-ifcopenshell-pypi

 on:
-  workflow_dispatch:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-ifcopenshell-pypi.yml'
+

 env:
  major: 0
@@ -24,29 +35,29 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py36, py37, py38, py39, py310, py311]
        config:
          - {
-            name: "Windows 64bit",
-            short_name: win64,
+            name: "Windows Build",
+            short_name: win,
          }
          - {
-            name: "Linux 64bit",
-            short_name: linux64
+            name: "Linux Build",
+            short_name: linux
          }
          - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
+            name: "MacOS Build",
+            short_name: macos
          }
          - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
+            name: "MacOS ARM Build",
+            short_name: macosm1
          }
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
      - run: echo ${{ env.DATE }}
      - name: Get current date
@@ -57,7 +68,7 @@ jobs:
          pip install build
          cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
      - name: Publish a Python distribution to PyPI
        uses: ortega2247/pypi-upload-action@master
        with:
@@ -1,67 +0,0 @@
-name: ci-ifcopenshell-python
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py39, py310, py311, py312]
-        config:
-          - {
-            name: "Windows 64bit",
-            short_name: win64,
-          }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
-          - {
-            name: "Linux 64bit",
-            short_name: linux64
-          }
-          - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
-          }
-          - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make zip PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/ifcopenshell-python-${{ steps.version.outputs.version }}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          asset_name: ifcopenshell-python-${{ steps.version.outputs.version }}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          release_name: "ifcopenshell-python-${{steps.version.outputs.version}}"
-          tag: "ifcopenshell-python-${{steps.version.outputs.version}}"
-          overwrite: true
@@ -1,35 +0,0 @@
-name: ci-ifcpatch-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcpatch &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcpatch/dist
@@ -1,51 +0,0 @@
-name: ci-ifcsverchok-daily
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - '.github/workflows/ci-ifcsverchok-build.yml'
-      - 'src/ifcsverchok/*'
-    branches:
-      - v0.8.0
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ifcsverchok
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/ifcsverchok
-          make dist
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}.zip
-          asset_name: ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}.zip
-          release_name: "ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}} (unstable)"
-          tag: "ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}"
-          overwrite: true
@@ -1,42 +0,0 @@
-name: ci-ifcsverchok
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ifcsverchok
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/ifcsverchok
-          make dist IS_STABLE=TRUE
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.version.outputs.version}}.zip
-          asset_name: ifcsverchok-${{steps.version.outputs.version}}.zip
-          release_name: "ifcsverchok-${{steps.version.outputs.version}}"
-          tag: "ifcsverchok-${{steps.version.outputs.version}}"
-          overwrite: true
@@ -1,8 +1,24 @@
 name: ci-ifctester-pypi

 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-ifctester-pypi.yml'
  workflow_dispatch:

+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
  activate:
    runs-on: ubuntu-latest
@@ -14,6 +30,7 @@ jobs:

  build:
    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
@@ -21,12 +38,17 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+      - run: echo ${{ env.DATE }}
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
      - name: Compile
        run: |
          pip install build
          cd src/ifctester &&
-          make dist IS_STABLE=TRUE
+          make dist
      - name: Publish a Python distribution to PyPI
        uses: ortega2247/pypi-upload-action@master
        with:
@@ -0,0 +1,34 @@
+name: Restart failed daily conda builds
+
+on:
+  workflow_run:
+    workflows: [ ci-ifcopenshell-conda-daily ]
+    types:
+      - completed
+
+env:
+  REPO_OWNER: IfcOpenShell/IfcOpenShell
+  MY_WORKFLOW: ci-ifcopenshell-conda-daily
+
+jobs:
+  restart-failed-runs:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Use python 3.11
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+      - name: Check for failed runs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
+        run: |
+          python check_repo_ci_jobs.py
+        working-directory: .github/workflows
@@ -46,8 +46,7 @@ jobs:
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
-          pip install mathutils
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
          pip install src/bcf --no-deps
          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip

@@ -66,7 +65,7 @@ jobs:
          swig libpcre3-dev libxml2-dev \
          libtbb-dev nlohmann-json3-dev \
          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          libhdf5-dev libcgal-dev libeigen3-dev
+          libhdf5-dev libcgal-dev
          
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
@@ -91,7 +90,7 @@ jobs:
               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
               -DCOLLADA_SUPPORT=Off \
-               "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DGLTF_SUPPORT=On \
               -DJSON_INCLUDE_DIR=/usr/include \
               -DCGAL_INCLUDE_DIR=/usr/include \
@@ -100,7 +99,6 @@ jobs:
               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
-               -DEIGEN_DIR=/usr/include/eigen3 \
             ../cmake
          sudo make -j $(nproc)
          sudo make install
@@ -126,9 +124,4 @@ jobs:
          python tests.py
          cd ../src/ifcopenshell-python
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test
-          cd ../bcf && make test
-          pip install requests
-          cd ../bsdd && make test
-          cd ../ifcpatch && make test
-          cd ../ifctester && make test
+          make test-safe
@@ -11,9 +11,6 @@
 [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
@@ -18,53 +18,57 @@ and many other libraries, CLI apps, and more. Support is also provided for auxil
 For more information, see:

 * [IfcOpenShell Website](http://ifcopenshell.org)
-* [IfcOpenShell Documentation](https://docs.ifcopenshell.org)
-  * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
-  * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
-  * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
+* [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
+  * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
+  * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+  * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
 * [BlenderBIM Add-on Website](https://blenderbim.org)
-* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
-  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
- 
-Development is sponsored through your generous donations!
+* [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
+  * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
+  * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)

-[![Open Collective Contributors](https://img.shields.io/opencollective/all/opensourcebim?label=Sponsors&color=22ce5f)](https://opencollective.com/opensourcebim/)
+| Service                                         | Status                                                                                                                                       |
+| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| Anaconda Daily Build                            | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell)](https://anaconda.org/ifcopenshell/ifcopenshell)        |
+| Anaconda v0.7.0 Stable                          | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ifcopenshell)](https://anaconda.org/conda-forge/ifcopenshell)          |
+| PyPi Daily Build                                | [![PyPi Badge](https://img.shields.io/pypi/v/ifcopenshell)](https://pypi.org/project/ifcopenshell/)                                          |
+| ArchLinux AUR Package Stable                    | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                             |
+| ArchLinux AUR Package git                       | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
+| BlenderBIM Add-on Chocolatey (under moderation) | [![Chocolatey Badge](https://img.shields.io/chocolatey/v/blenderbim-nightly)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| Sponsor development on OpenCollective           | [![Financial Contributors](https://opencollective.com/opensourcebim/tiers/badge.svg)](https://opencollective.com/opensourcebim/)             |
+| Docker hub                                      | [![Docker Pulls](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell)](https://hub.docker.com/r/aecgeeks/ifcopenshell)                 |

 Contents
 --------

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

 | Name                      | Description                                                           | License             |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- |
+| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   |
+| blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    |
+| bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   |
+| ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
+| ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   |
+| ifc5d                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   |
+| ifcbimtester              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
+| ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
+| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   |
+| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   |
+| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* |
+| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   |
+| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   |
+| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   |
 | ifcgeom                   | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcgeom\_schema\_agnostic | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcgeomserver             | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcjni                    | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
+| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* |
+| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* |
 | ifcparse                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
+| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   |
+| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    |
+| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   |
 | ifcwrap                   | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | qtviewer                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | serializers               | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
@@ -1 +0,0 @@
-0.7.11
@@ -12,7 +12,7 @@ RUN apt-get -y update && apt-get -y install unzip curl
 # Install AWS Lambda runtime interface client
 RUN pip install --target ${FUNCTION_DIR} awslambdaric

-# Set the IfcOpenShell build version (check available builds at: https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
+# Set the IfcOpenShell build version (check available builds at: https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
 ARG IFC_OPENSHELL_BUILD="39-v0.7.0-476ab50"

 # Download and extract IfcOpenShell
@@ -12,10 +12,10 @@
    <projectUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectUrl>
    <iconUrl>https://rawcdn.githack.com/IfcOpenShell/IfcOpenShell/c6ee1d1679d1298de0d7447ff108c22709c68e54/choco/blenderbim/blenderbim.png</iconUrl>
    <!-- <copyright>Year Software Vendor</copyright> -->
-    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/COPYING</licenseUrl>
+    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.7.0/COPYING</licenseUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.blenderbim.org/</docsUrl>
+    <docsUrl>https://blenderbim.org/docs/</docsUrl>
    <!--<mailingListUrl></mailingListUrl>-->
    <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
    <tags>blender bim blenderbim ifc python opensource foss</tags>
@@ -0,0 +1,89 @@
+import datetime
+import re
+import sys
+from urllib import request
+
+
+def request_repo_info(url: str):
+    req  = request.Request(url)
+    resp = request.urlopen(req)
+    if not resp.status == 200:
+        print(f"[ERROR] could not contact server: {url}")
+        quit(1)
+    return resp
+
+
+def get_choco_package_info() -> str:
+    resp = request_repo_info(URL_CHOCO_PACKAGE)
+    html_txt = str(resp.read())
+    return html_txt
+
+
+def get_latest_blender_version() -> list:
+    html_txt = get_choco_package_info()
+    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
+
+
+URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
+URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
+URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"(?:set|SET)\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
+
+
+if sys.argv[1] == "--do_choco_release?":
+    now = datetime.datetime.now()
+    blenderbim_date = (now - datetime.timedelta(days=1)).strftime("%y%m%d")
+    resp = request_repo_info(URL_IFCOS_RELEASES)
+    text = str(resp.read())
+    if blenderbim_date in text:
+        print("do_choco_release", end="")
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min_pat?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        print(latest_blender_version[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj_pat")
+        quit(1)
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min?":
+    html_txt = get_choco_package_info()
+    blender_version_min_maj = re.findall(RE_BLENDER_VERSION_MIN_MAJ, html_txt)
+    if blender_version_min_maj:
+        print(blender_version_min_maj[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj")
+        quit(1)
+
+
+elif sys.argv[1] == "--latest_blender_python_version_maj_min?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+        html_txt = str(resp.read())
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        if found:
+            print(found[0], end="")
+        else:
+            print("[ERROR] could not determine blender_python_version_maj_min")
+            quit(1)
+
+
+elif sys.argv[1] == "--pyver?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+        html_txt = str(resp.read())
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        if found:
+            print(f"py{found[0].replace('.', '')}", end="")
+        else:
+            print("[ERROR] could not determine pyver")
+            quit(1)
+
@@ -1,212 +0,0 @@
-# commands to run it on a generic ubuntu 2404 oci container:
-"""
-apt update && apt install git wget curl ptpython mono-devel micro
-mkdir -p /home/runner/work/IfcOpenShell && cd /home/runner/work/IfcOpenShell
-git clone https://github.com/IfcOpenShell/IfcOpenShell
-cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/
-micro choco_release.py # paste this script, comment out push command
-export CHOCO_TOKEN="secret_choco_release_token"
-python3 choco_release.py
-"""
-import datetime
-import hashlib
-import os
-import pathlib
-import re
-from urllib import request
-
-
-def get_repo_tag_names():
-    git_return = os.popen("git tag -l").read()
-    tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
-    print(f"{len(tag_names)} tag_names found in repo")
-    return tag_names
-
-
-def request_repo_info(url: str):
-    req  = request.Request(url)
-    resp = request.urlopen(req)
-    if not resp.status == 200:
-        print(f"[ERROR] could not contact server: {url}")
-        quit(1)
-    return resp
-
-
-def get_choco_package_info() -> str:
-    resp = request_repo_info(URL_CHOCO_PACKAGE)
-    html_txt = str(resp.read())
-    return html_txt
-
-
-def get_latest_choco_blender_version() -> list:
-    html_txt = get_choco_package_info()
-    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
-
-
-def get_file_sha256_hash(file_path):
-    BLOCKSIZE = 65536
-    hasher = hashlib.sha256()
-
-    with open(file_path, "rb") as input_file:
-        buffer = input_file.read(BLOCKSIZE)
-        while len(buffer) > 0:
-            hasher.update(buffer)
-            buffer = input_file.read(BLOCKSIZE)
-
-    return hasher.hexdigest()
-
-
-def quit_with_error_message(message: str):
-    print(f"ERROR: {message}")
-    quit(0)
-
-
-start = datetime.datetime.now()
-
-URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
-URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
-URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases/download/"
-RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
-RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
-RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
-
-BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/")
-
-print("_____ check choco release needed?")
-
-os.chdir(BLENDERBIM_DIR)
-
-blenderbim_date_yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%y%m%d")
-should_release = False
-target_release_tag = ""
-target_os = "win"
-
-git_status = os.popen("git status").read()
-print(git_status)
-
-for tag_name in get_repo_tag_names():
-    print(tag_name)
-    if blenderbim_date_yesterday in tag_name:
-        should_release = True
-        target_release_tag = tag_name
-        print(f"found {tag_name=} - {should_release=}")
-        break
-
-if not should_release:
-    print(f"INFO: no blenderbim release tags found for {blenderbim_date_yesterday} -> no choco release today.")
-    quit(0)
-print(f"{should_release=}")
-
-if not os.environ.get("CHOCO_TOKEN"):
-    quit_with_error_message("could retrieve CHOCO_TOKEN env var")
-choco_token = os.environ["CHOCO_TOKEN"]
-
-print("\n_____ get blender info")
-# blender_version_min_maj_pat - from chocolatey.org
-latest_blender_release_maj_min_pat = get_latest_choco_blender_version()
-if not latest_blender_release_maj_min_pat:
-    quit_with_error_message("could not determine blender_version_min_maj_pat")
-latest_blender_release_maj_min_pat = latest_blender_release_maj_min_pat[0]
-print(f"{latest_blender_release_maj_min_pat=}")
-
-# blender_version_min_maj - from chocolatey.org
-blender_version_min_maj = latest_blender_release_maj_min_pat.rsplit(".", 1)[0]
-print(f"{blender_version_min_maj=}")
-
-# blender_python_version_maj_min - from blender repo
-python_version = ""
-latest_blender_version_tag = f"v{latest_blender_release_maj_min_pat}"
-resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
-html_txt = str(resp.read())
-found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
-if not found:
-    quit_with_error_message("could not determine blender_python_version_maj_min")
-
-blender_python_version_maj_min = found[0]
-print(f"{blender_python_version_maj_min=}")
-python_version = f"py{found[0].replace('.', '')}"
-print(f"{python_version=}")
-
-blenderbim_build_version = target_release_tag.replace("blenderbim-", "")
-
-# url_blenderbim_py3x_win_zip
-release_zip_file_name = f"{target_release_tag}-{python_version}-{target_os}.zip"
-
-# download release
-url_blenderbim_py3x_win_zip = f"{URL_IFCOS_RELEASES}{target_release_tag}/{release_zip_file_name}"
-os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
-
-# sha256sum_blenderbim_py310_win_zip
-sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
-
-print("\n_____ fill dynamic chocolatey package parameters")
-HERE_DIR = pathlib.Path(__file__).parent.absolute()
-# print(f"[INFO] HERE_DIR: {HERE_DIR}")
-
-topics = {
-    "spec": {
-        "path": HERE_DIR / "blenderbim.nuspec",
-        "key_values": {
-            "latest_blender_version_maj_min_pat": latest_blender_release_maj_min_pat,
-            "blenderbim_build_version"          : blenderbim_build_version,
-        },
-    },
-    "install": {
-        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
-        "key_values": {
-            "url_blenderbim_py3x_win_zip"      : url_blenderbim_py3x_win_zip,
-            "sha256sum_blenderbim_py3x_win_zip": sha256sum_blenderbim_py3x_win_zip,
-            "latest_blender_version_maj_min"   : blender_version_min_maj,
-        },
-    },
-    "uninstall": {
-        "path": HERE_DIR / "tools" / "chocolateyuninstall.ps1",
-        "key_values": {
-            "latest_blender_version_maj_min": blender_version_min_maj,
-        },
-    },
-}
-
-for topic, info in topics.items():
-    print(f"  {topic}:")
-    with open(info["path"], encoding="utf-8") as txt:
-        content = txt.read()
-
-    for key, value in info["key_values"].items():
-        # print(f"[INFO] replace: {env_var_name}")
-        if not key in content:
-            print(f"  {key=} not found in {info['path']}")
-        content = content.replace(key, value)
-
-    with open(info["path"], "w", encoding="utf-8") as txt:
-        txt.write(content)
-        print(f"  written: {info['path']}")
-
-print("[INFO] inserting dynamic chocolatey package parameters successful")
-
-
-print("\n_____ build choco.exe with mono")
-
-choco_version = "1.1.0"
-os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
-os.popen(f"tar -xzf {choco_version}.tar.gz").read()
-print("choco tar unpack successful")
-os.chdir("choco-1.1.0")
-os.popen("./build.sh").read()
-
-os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
-os.chdir(BLENDERBIM_DIR)
-
-if pathlib.Path("/opt/chocolatey/choco.exe").exists():
-    print("choco build successful")
-
-print("\n_____ build choco pack")
-
-os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
-os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()
-
-print("\n_____ build choco push")
-os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()
-
-print(f"choco push of version: {target_release_tag} successful!")
-print(f"it took: {datetime.datetime.now() - start}")
@@ -0,0 +1,49 @@
+import os
+from pathlib import Path
+
+
+print("[INFO] inserting dynamic chocolatey package parameters")
+HERE_DIR = Path(__file__).parent.absolute()
+# print(f"[INFO] HERE_DIR: {HERE_DIR}")
+
+topics = {
+    "spec": {
+        "path": HERE_DIR / "blenderbim.nuspec",
+        "env_vars": {
+            "latest_blender_version_maj_min_pat",
+            "blenderbim_build_version",
+        },
+    },
+    "install": {
+        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
+        "env_vars": {
+            "url_blenderbim_py310_win_zip",
+            "sha256sum_blenderbim_py310_win_zip",
+            "latest_blender_version_maj_min",
+        },
+    },
+    "uninstall": {
+        "path": HERE_DIR / "tools" / "chocolateyuninstall.ps1",
+        "env_vars": {
+            "latest_blender_version_maj_min",
+        },
+    },
+}
+
+for topic, info in topics.items():
+    print(f"[INFO] {topic}:")
+    for env_var_name in info["env_vars"]:
+        print(f"[INFO] {env_var_name} exists?: {os.environ[env_var_name]}")
+
+    with open(info["path"], encoding="utf-8") as txt:
+        content = txt.read()
+
+    for env_var_name in info["env_vars"]:
+        # print(f"[INFO] replace: {env_var_name}")
+        content = content.replace(env_var_name, os.environ[env_var_name])
+
+    with open(info["path"], "w", encoding="utf-8") as txt:
+        txt.write(content)
+        print(f"[INFO] written: {info['path']}")
+
+print("[INFO] inserting dynamic chocolatey package parameters successful")
@@ -1,7 +1,7 @@
 $ErrorActionPreference = 'Stop'

-$url64          = 'url_blenderbim_py3x_win_zip'
-$checksum64     = 'sha256sum_blenderbim_py3x_win_zip'
+$url64          = 'url_blenderbim_py310_win_zip'
+$checksum64     = 'sha256sum_blenderbim_py310_win_zip'
 $checksumType64 = 'sha256'

 $appDataUserDir  = [System.Environment]::GetEnvironmentVariable('appdata')
@@ -17,35 +17,26 @@
 #                                                                              #
 ################################################################################

-cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 17)
+cmake_minimum_required(VERSION 3.5)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-endif()
+project(IfcOpenShell VERSION 0.7.0)

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

 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
 endif()

-# Include utility macros and functions
-include(utilities.cmake)
-
 # use extra version to make pre-release using eg semver
-if(NOT DEFINED EXTRA_VERSION)
-    set(EXTRA_VERSION "-alpha.3")
-endif()
+set(EXTRA_VERSION "-alpha.3")

 option(MINIMAL_BUILD "The build is to make a minimal version of IFC converter from OCCT into IFC." OFF)
 option(WASM_BUILD "Build a WebAssembly binary." OFF)
@@ -67,36 +58,20 @@ option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)

-option(WITH_OPENCASCADE "Enable geometry interpretation using Open CASCADE" ON)
-option(WITH_CGAL "Enable geometry interpretation using CGAL" ON)
 option(COLLADA_SUPPORT "Build IfcConvert with COLLADA support (requires OpenCOLLADA)." ON)
 option(GLTF_SUPPORT "Build IfcConvert with glTF support (requires json.hpp)." OFF)
 option(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 option(WITH_PROJ "Enable output of Earth-Centered Earth-Fixed glTF output using the PROJ library" OFF)
 option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
-option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." ON)
-option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)

 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
 option(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
-option(VERSION_OVERRIDE "Override the version defined in IfcParse.h with the file VERSION in the repository root" OFF)
-
-if (VERSION_OVERRIDE)
-    file(READ "../VERSION" "RELEASE_VERSION_")
-    string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
-    message(STATUS "Detected version '${RELEASE_VERSION}'")
-else()
-    set(RELEASE_VERSION "0.8.0")
-endif()
-
-project(IfcOpenShell VERSION ${RELEASE_VERSION})

 if(MINIMAL_BUILD)
    message(STATUS "Setting options for minimal build")
    set(BUILD_GEOMSERVER OFF)
    set(BUILD_IFCPYTHON OFF)
-    set(WITH_CGAL OFF)
    set(COLLADA_SUPPORT OFF)
    set(GLTF_SUPPORT OFF)
    set(HDF5_SUPPORT OFF)
@@ -162,11 +137,17 @@ if(BUILD_SHARED_LIBS)
    set(IFCOPENSHELL_LIBRARY_DIR "${LIBDIR}")
 endif()

+# Create cache entries if absent for environment variables
+macro(UNIFY_ENVVARS_AND_CACHE VAR)
+    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
+        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
+    endif()
+endmacro()
+
 UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
 UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
-UNIFY_ENVVARS_AND_CACHE(EIGEN_DIR)

 if(NOT MINIMAL_BUILD)
    UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
@@ -186,14 +167,6 @@ if(NOT MINIMAL_BUILD)
    UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
 endif()

-# Get a list of all OPTION flags from the CMakeLists.txt
-get_all_option_flags(option_flags)
-
-# Loop through the list of OPTION flags and convert the corresponding environment variables
-foreach(option_flag IN LISTS option_flags)
-    convert_env_var_to_bool("${option_flag}")
-endforeach()
-
 if(WASM_BUILD)
    # when using the nix/build-all.py build script we should not
    # look into the sysroot for most of the dependencies but rather
@@ -202,30 +175,12 @@ if(WASM_BUILD)
    set(CMAKE_FIND_ROOT_PATH "")
 endif()

-if(WITH_CGAL)
-    add_definitions(-DIFOPSH_WITH_CGAL)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
-
-    if(CITYJSON_SUPPORT)
-		add_definitions(-DIFOPSH_WITH_CITYJSON)
-    endif()
-
-    list(APPEND GEOMETRY_KERNELS cgal)
-endif()
-
-if(WITH_OPENCASCADE)
-    add_definitions(-DIFOPSH_WITH_OPENCASCADE)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_OPENCASCADE)
-    list(APPEND GEOMETRY_KERNELS opencascade)
-endif()
-
-if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
+if(GLTF_SUPPORT AND BUILD_CONVERT)
    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    find_path(json_header_path "json.hpp" ${JSON_INCLUDE_DIR} PATH_SUFFIXES "nlohmann")
-    set(JSON_INCLUDE_DIR ${json_header_path})
+    find_file(json_hpp "json.hpp" ${JSON_INCLUDE_DIR}/nlohmann)

-    if(json_header_path)
-        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
+    if(json_hpp)
+        message(STATUS "JSON for Modern C++ header file found")
    else()
        message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
    endif()
@@ -234,7 +189,7 @@ if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()

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

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

@@ -279,7 +234,23 @@ if(USD_SUPPORT)

    add_definitions(-DWITH_USD)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
-endif(USD_SUPPORT)
+endif()
+
+# Set INSTALL_RPATH for target
+macro(SET_INSTALL_RPATHS _target _paths)
+    set(${_target}_rpaths "")
+
+    foreach(_path ${_paths})
+        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_path}" isSystemDir)
+
+        if("${isSystemDir}" STREQUAL "-1")
+            list(APPEND ${_target}_rpaths ${_path})
+        endif()
+    endforeach()
+
+    message(STATUS "Set INSTALL_RPATH for ${_target}: ${${_target}_rpaths}")
+    set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
+endmacro()

 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
 # runtime, when doing running conda-build we pick what conda prepared for us.
@@ -309,7 +280,7 @@ else()
    endif()
 endif()

-if(WASM_BUILD)
+if (WASM_BUILD)
    set(BOOST_COMPONENTS)
 else()
    # @todo review this, shouldn't this be all possible header-only now?
@@ -342,13 +313,50 @@ if(IFCXML_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML)
 endif()

+# Usage:
+# set(SOME_LIRARIES foo bar)
+# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
+# "foo bar" -> "optimized foo debug food optimized bar debug bard"
+# or
+# set(SOME_LIRARIES path/foo.lib)
+# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" "d")
+# "path/foo.lib" -> "optimized path/foo.lib debug path/food.lib"
+# TODO Could be refined: take the library file extension as a parameter and
+# make sure the lib variable ends with not just contains it.
+function(add_debug_variants NAME LIBRARIES POSTFIX)
+    set(LIBRARIES_STR "${LIBRARIES}")
+    set(LIBRARIES "")
+
+    # the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
+    foreach(lib ${LIBRARIES_STR})
+        list(APPEND LIBRARIES optimized)
+
+        if("${lib}" MATCHES ".lib")
+            string(REPLACE ".lib" "" lib ${lib})
+            list(APPEND LIBRARIES ${lib}.lib)
+        else()
+            list(APPEND LIBRARIES ${lib})
+        endif()
+
+        list(APPEND LIBRARIES debug)
+
+        if("${lib}" MATCHES ".lib")
+            string(REPLACE ".lib" "" lib ${lib})
+            list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
+        else()
+            list(APPEND LIBRARIES ${lib}${POSTFIX})
+        endif()
+    endforeach()
+
+    set(${NAME} ${LIBRARIES} PARENT_SCOPE)
+endfunction()
+
 if(BUILD_IFCGEOM)
    if(MSVC)
        add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
    endif()

    # Open CASCADE
-    if(WITH_OPENCASCADE)
    if("${OCC_INCLUDE_DIR}" STREQUAL "")
        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
            PATHS
@@ -380,7 +388,7 @@ if(BUILD_IFCGEOM)
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
          REGEX "#define OCC_VERSION_MAINTENANCE.*"
        )
-        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
+        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})     
        set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
    endif(OCC_INCLUDE_DIR)

@@ -391,7 +399,6 @@ if(BUILD_IFCGEOM)
        # @todo investigate the exact conditions when this is necessary
        TKBin
    )
-
    if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
        list(APPEND OPENCASCADE_LIBRARY_NAMES  TKIGES TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
    else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
@@ -452,7 +459,7 @@ if(BUILD_IFCGEOM)

    if(OCCT_STATIC)
        find_package(Threads)
-        
+
        if(WASM_BUILD)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
        else()
@@ -464,15 +471,15 @@ if(BUILD_IFCGEOM)
                set(OPENCASCADE_LIBRARIES -Wl,--start-group ${OPENCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
            endif()
        endif()
-        
-        if(NOT APPLE AND NOT WIN32)
+
+        if (NOT APPLE AND NOT WIN32)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "rt")
        endif()
-        if(NOT WIN32)
+        if (NOT WIN32)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "dl")
        endif()
    endif()
-    endif(WITH_OPENCASCADE)
+
 endif(BUILD_IFCGEOM)

 if(COLLADA_SUPPORT)
@@ -557,7 +564,7 @@ if(COLLADA_SUPPORT)
        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
    endif()
-endif(COLLADA_SUPPORT)
+endif()

 if(HDF5_SUPPORT)
    if("${HDF5_INCLUDE_DIR}" STREQUAL "")
@@ -600,26 +607,32 @@ if(HDF5_SUPPORT)
        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}"
-            )
+            if(WIN32)
+                # Windows
+                set(HDF5_LIBRARIES)
+                find_package(HDF5 COMPONENTS CXX)
+                if (HDF5_FOUND)
+                    set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES})
+                endif()
+                list(APPEND HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/zlib.lib"
+                )
            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}")
+                if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                    # macOS
+                    set(zlib_post libz)
+                    set(lib_ext dylib)
+                else()
+                    # linux
+                    set(zlib_post libz)
+                    set(lib_ext so)
+                endif()
+
+                set(HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
+                )
            endif()
        endif()
    endif()
@@ -637,7 +650,7 @@ if(HDF5_SUPPORT)

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

 if(WASM_BUILD)
    # reset to use sysroot
@@ -668,17 +681,15 @@ if(ENABLE_BUILD_OPTIMIZATIONS)
        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O3")
    endif()
 else()
-    # @tfk I commented this out as this kind of defeats the purpose of RelWithDebInfo. For the
-    # best debugging experience simply use Debug. Note that in MSVC you can selectively toggle
-    # optimization on a specific file if you're investigating a specific issue.
-    # if(MSVC)
-    #     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
-    # endif()
-endif(ENABLE_BUILD_OPTIMIZATIONS)
+    if(MSVC)
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
+    endif()
+endif()

 if(MSVC)
    # warning due to virtual inheritance
    add_definitions(-wd4250)
+
    # warning due to select definitions in the schema being redundant
    add_definitions(-wd4584)

@@ -714,22 +725,20 @@ if(MSVC)
        add_definitions(-permissive-)
    endif()

-    # Link against the static VC runtime
-    # TODO Make this configurable
-    # if("$ENV{CONDA_BUILD}" STREQUAL "")
-    #     foreach(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
-    #     CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-    #     CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-    #         if(${flag} MATCHES "/MD")
-    #             STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
-    #         endif()
-    #         if(${flag} MATCHES "/MDd")
-    #             STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
-    #         endif()
-    #     endforeach()
-    # endif()
-
-	add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
+# Link against the static VC runtime
+# TODO Make this configurable
+# IF("$ENV{CONDA_BUILD}" STREQUAL "")
+# FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
+# CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+# CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+# IF(${flag} MATCHES "/MD")
+# STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
+# ENDIF()
+# IF(${flag} MATCHES "/MDd")
+# STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
+# ENDIF()
+# ENDFOREACH()
+# ENDIF()
 else()
    add_definitions(-Wall -Wextra)

@@ -748,20 +757,29 @@ else()
    if(UNIX)
        add_definitions(-fPIC)
    endif()
-endif(MSVC)
+endif()

 include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
-    ${EIGEN_DIR} ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
-    ${TBB_INCLUDE_DIR}
+    ${USD_INCLUDE_DIR}
 )

+function(files_for_ifc_version IFC_VERSION RESULT_NAME)
+    set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
+    set(${RESULT_NAME}
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.h
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}enum.h
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
+        PARENT_SCOPE
+    )
+endfunction()
+
 if(NOT SCHEMA_VERSIONS)
    if(WASM_BUILD)
        # super arbitrarily try to keep size down at least a little bit
        set(SCHEMA_VERSIONS "2x3" "4")
    else()
-        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
+        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
    endif()
 endif()

@@ -834,7 +852,7 @@ if(COMPILE_SCHEMA)
            list(REMOVE_ITEM IFC_RELEASE_NOT_USED "${schema}")
        endif()
    endforeach()
-endif(COMPILE_SCHEMA)
+endif()

 # Boost >= 1.58 requires BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE to build on some Linux distros.
 if(NOT Boost_VERSION LESS 105800)
@@ -842,37 +860,22 @@ if(NOT Boost_VERSION LESS 105800)
 endif()

 set(IFCOPENSHELL_LIBRARIES IfcParse)
-
-if(BUILD_IFCGEOM)
+if (BUILD_IFCGEOM)
 	foreach(schema ${SCHEMA_VERSIONS})
-		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
+		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom_ifc${schema})
 	endforeach()
-	if(WASM_BUILD)
+	if (WASM_BUILD)
 	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	else()
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})	
+	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	endif()
 endif()

-if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+if (BUILD_CONVERT OR BUILD_IFCPYTHON)
 	foreach(schema ${SCHEMA_VERSIONS})
 		set(SERIALIZER_SCHEMA_LIBRARIES ${SERIALIZER_SCHEMA_LIBRARIES} Serializers_ifc${schema})
 	endforeach()
 	set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} Serializers ${SERIALIZER_SCHEMA_LIBRARIES})
-
-    if(WITH_OPENCASCADE)
-        foreach(schema ${SCHEMA_VERSIONS})
-            set(GEOM_SERIALIZER_SCHEMA_LIBRARIES ${GEOM_SERIALIZER_SCHEMA_LIBRARIES} GeometrySerializers_ifc${schema})
-
-            add_library(geometry_serializer_ifc${schema} STATIC ../src/ifcgeom/Serialization/schema/Serialization.cpp)
-            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-            list(APPEND geometry_serializer_libraries geometry_serializer_ifc${schema})
-        endforeach()
-
-        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.cpp)
-        target_link_libraries(geometry_serializer ${geometry_serializer_libraries})
-        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} geometry_serializer ${geometry_serializer_libraries})
-    endif()
 endif()

 # IfcParse
@@ -911,70 +914,29 @@ set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})
 add_library(IfcParse ${IFCPARSE_FILES})
 set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

-if(WASM_BUILD)
+if (WASM_BUILD)
    target_link_libraries(IfcParse ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 else()
    target_link_libraries(IfcParse ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 endif()

 if(BUILD_IFCGEOM)
-    if(WITH_CGAL)
-        find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-        find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
-        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()
-
-        list(APPEND CGAL_LIBRARIES "${libMPFR}")
-        list(APPEND CGAL_LIBRARIES "${libGMP}")
-    endif()
-
-    foreach(kernel ${GEOMETRY_KERNELS})
-        string(TOUPPER ${kernel} KERNEL_UPPER)
-        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
-        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
-        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
-        
-        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
-        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
-        # needed?
-        # if(NOT WASM_BUILD)
-        # endif()
-        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES})
-        list(APPEND kernel_libraries geometry_kernel_${kernel})
-        
-        if(${kernel} STREQUAL "cgal")
-            set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")
-
-            add_library(geometry_kernel_${kernel}_simple ${IFCGEOM_FILES})
-            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
-            # needed?
-            # if(NOT WASM_BUILD)
-            # endif()
-            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES})
-            list(APPEND kernel_libraries geometry_kernel_${kernel}_simple)
-        endif()
-    endforeach()
-
    # IfcGeom
+    file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h ../src/ifcgeom/*.i)
+    file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
+    set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
+
    foreach(schema ${SCHEMA_VERSIONS})
-        file(GLOB IFCGEOM_I_FILES ../src/ifcgeom/mapping/*.i)
-        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
-        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
-        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
-        
-        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
-        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
-        list(APPEND mapping_libraries geometry_mapping_ifc${schema})
+        add_library(IfcGeom_ifc${schema} STATIC ${IFCGEOM_FILES})
+        set_target_properties(IfcGeom_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
+        if (NOT WASM_BUILD)
+            target_link_libraries(IfcGeom_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES})
+        endif()
    endforeach()

    # IfcGeom (schema agnostic)
-    file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom/*.h)
-    file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom/*.cpp)
+    file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom_schema_agnostic/*.h)
+    file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom_schema_agnostic/*.cpp)
    set(SCHEMA_AGNOSTIC_FILES ${SCHEMA_AGNOSTIC_H_FILES} ${SCHEMA_AGNOSTIC_CPP_FILES})

    add_library(IfcGeom ${SCHEMA_AGNOSTIC_FILES})
@@ -984,10 +946,10 @@ if(BUILD_IFCGEOM)
        find_package(Threads)
    endif()

-    if(WASM_BUILD)
-        target_link_libraries(IfcGeom ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+    if (WASM_BUILD)
+        target_link_libraries(IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
    else()
-        target_link_libraries(IfcGeom IfcParse ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+        target_link_libraries(IfcGeom IfcParse ${IFCGEOM_SCHEMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
    endif()

 endif(BUILD_IFCGEOM)
@@ -1004,8 +966,8 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
    foreach(schema ${SCHEMA_VERSIONS})
        add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES})
        set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-        
-        if(WASM_BUILD)
+
+        if (WASM_BUILD)
            target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES})
        else()
            target_link_libraries(Serializers_ifc${schema} IfcGeom ${OPENCASCADE_LIBRARIES} ${HDF5_LIBRARIES})
@@ -1015,61 +977,27 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
    add_library(Serializers ${SERIALIZERS_FILES})
    set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

-    if(WITH_PROJ)
-        target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
-        if (PROJ_STATIC)
-            target_compile_definitions(Serializers PRIVATE "PROJ_DLL=")
-        endif()
-        target_include_directories(Serializers PRIVATE ${PROJ_INCLUDE_DIR} ${SQLITE_INCLUDE_DIR})
-        target_link_libraries(Serializers ${PROJ_LIBRARIES})
-    endif()
+	if (WITH_PROJ)
+		target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
+		if (PROJ_STATIC)
+			target_compile_definitions(Serializers PRIVATE "PROJ_DLL=")
+		endif()
+		target_include_directories(Serializers PRIVATE ${PROJ_INCLUDE_DIR} ${SQLITE_INCLUDE_DIR})
+		target_link_libraries(Serializers ${PROJ_LIBRARIES})
+	endif()

    target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES})

 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)

 if(BUILD_CONVERT)
-    if(WITH_CGAL AND CITYJSON_SUPPORT)
-        message(STATUS "Building CityJSON support")
-        set(CITYJSON_CONVERT_FILES
-            ../src/ifcconvert/cityjson/geobim.cpp
-            ../src/ifcconvert/cityjson/global_execution_context.cpp
-            ../src/ifcconvert/cityjson/opening_collector.cpp
-            ../src/ifcconvert/cityjson/processing.cpp
-            ../src/ifcconvert/cityjson/radius_comparison.cpp
-            ../src/ifcconvert/cityjson/radius_execution_context.cpp
-            ../src/ifcconvert/cityjson/settings.cpp
-            ../src/ifcconvert/cityjson/writer.cpp
-        )
-        add_library(cityjson_converter ${CITYJSON_CONVERT_FILES})
-        target_include_directories(cityjson_converter PRIVATE ../src)
-        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} cityjson_converter)
-
-        add_executable(cityjson_converter_exe ${CITYJSON_CONVERT_FILES})
-        set_target_properties(cityjson_converter_exe PROPERTIES COMPILE_FLAGS "-DCITYJSON_EXECUTABLE")
-        target_include_directories(cityjson_converter_exe PRIVATE ../src)
-        target_link_libraries(cityjson_converter_exe ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
-    endif()
-
    # IfcConvert
-	if (WITH_RELATIONSHIP_VALIDATION)
-		file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
-		file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
-	else()
-		file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/IfcConvert.cpp)
-		file(GLOB IFCCONVERT_H_FILES)
-	endif()
+    file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
+    file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
    set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
    add_executable(IfcConvert ${IFCCONVERT_FILES})

    target_link_libraries(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
-	if (WITH_RELATIONSHIP_VALIDATION)
-        set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DWITH_RELATIONSHIP_VALIDATION")
-    endif()
-
-    if(WITH_CGAL AND CITYJSON_SUPPORT)
-        set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DIFOPSH_WITH_CITYJSON")
-    endif()

    if((NOT WIN32) AND BUILD_SHARED_LIBS)
        # Only set RPATHs when building shared libraries (i.e. IfcParse and
@@ -1102,32 +1030,28 @@ if(BUILD_GEOMSERVER)
        LIBRARY DESTINATION ${LIBDIR}
        RUNTIME DESTINATION ${BINDIR}
    )
-endif(BUILD_GEOMSERVER)
+endif()

 if(ADD_COMMIT_SHA)
    find_package(Git)

    if(GIT_FOUND)
-        if (VERSION_OVERRIDE)
-            set (git_branch ${RELEASE_VERSION})
-        else()
-            message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
-            execute_process(
-                COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
-                OUTPUT_VARIABLE git_branches
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            string(REPLACE "\n" ";" git_branch_list "${git_branches}")
+        message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
+            OUTPUT_VARIABLE git_branches
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        string(REPLACE "\n" ";" git_branch_list "${git_branches}")

-            foreach(git_branch_candidate IN ITEMS ${git_branch_list})
-		        string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
-		        string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
-                if(NOT git_branch_candidate_2 MATCHES "^HEAD$")
-                    string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
-                    list(GET git_branch_candidate_2_list -1 git_branch)
-                endif()
-            endforeach()
-        endif()
+        foreach(git_branch_candidate IN ITEMS ${git_branch_list})
+		    string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
+		    string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
+            if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
+                string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
+                list(GET git_branch_candidate_2_list -1 git_branch)
+            endif()
+        endforeach()

        execute_process(
            COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
@@ -1139,13 +1063,6 @@ if(ADD_COMMIT_SHA)
        add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
        add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
    endif()
-endif(ADD_COMMIT_SHA)
-
-if(MSVC)
-    # @todo still needs to be understood better, but the cgal and cgal-simple kernel cause multiply defined boost lambda placeholders _1 ... _3
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /FORCE:MULTIPLE")
 endif()

 # Documentation
@@ -1166,8 +1083,8 @@ if(BUILD_IFCMAX)
    add_subdirectory(../src/ifcmax ifcmax)
 endif()

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

 if(BUILD_QTVIEWER)
@@ -1194,12 +1111,12 @@ if(BUILD_IFCGEOM)
        DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
    )

-    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
+    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom
        ARCHIVE DESTINATION ${LIBDIR}
        LIBRARY DESTINATION ${LIBDIR}
        RUNTIME DESTINATION ${BINDIR}
    )
-endif(BUILD_IFCGEOM)
+endif()

 if(BUILD_CONVERT)
    install(TARGETS Serializers ${SERIALIZER_SCHEMA_LIBRARIES}
@@ -1215,7 +1132,7 @@ if(BUILD_CONVERT)
    install(FILES ${SERIALIZERS_S_FILES}
        DESTINATION ${INCLUDEDIR}/serializers/schema_dependent
    )
-endif(BUILD_CONVERT)
+endif()

 # Cmake uninstall target
 if(NOT TARGET uninstall)
@@ -1230,10 +1147,9 @@ endif()

 # Packaging
 list(APPEND CPACK_SOURCE_IGNORE_FILES
-    "/\\\\.git"
-    "/build/"
+    .git
+    .gitignore
 )
-set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/..;/")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}${EXTRA_VERSION}")
 SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -1263,6 +1179,6 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_SECTION "science")
 set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${EXTRA_VERSION}")
 set(CPACK_DEBIAN_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
-# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/debian/postinst")

+# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/debian/postinst")
 include(CPack)
@@ -1,124 +0,0 @@
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-# Create a cache entry if absent for environment variables
-macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
-        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-    endif()
-endmacro()
-
-# Set INSTALL_RPATH for target with given paths
-macro(SET_INSTALL_RPATHS _target _paths)
-    set(${_target}_rpaths "")
-
-    foreach(_path ${_paths})
-        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_path}" isSystemDir)
-
-        if("${isSystemDir}" STREQUAL "-1")
-            list(APPEND ${_target}_rpaths ${_path})
-        endif()
-    endforeach()
-
-    message(STATUS "Set INSTALL_RPATH for ${_target}: ${${_target}_rpaths}")
-    set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
-endmacro()
-
-# Get a list of all OPTION flags from the CMakeLists.txt and store in an output LIST
-function(get_all_option_flags output_list)
-    # Read the contents of the CMakeLists.txt
-    file(READ "${CMAKE_SOURCE_DIR}/CMakeLists.txt" cmake_contents)
-
-    # Find all OPTION flags using a regular expression
-    string(REGEX MATCHALL "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" matches "${cmake_contents}")
-
-    # Extract the variable names from the matches
-    set(option_flags)
-    foreach(match IN LISTS matches)
-        string(REGEX REPLACE "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" "\\1" option_flag "${match}")
-        list(APPEND option_flags "${option_flag}")
-    endforeach()
-
-    # Return the list of OPTION flags
-    set(${output_list} "${option_flags}" PARENT_SCOPE)
-endfunction()
-
-# Loop through a LIST of OPTION flags and convert to corresponding environment variables
-function(convert_env_var_to_bool var_name)
-    if(DEFINED ENV{${var_name}})
-        string(TOUPPER "$ENV{${var_name}}" bool_value)
-        if(bool_value STREQUAL "ON" OR bool_value STREQUAL "TRUE" OR bool_value STREQUAL "1")
-            set(${var_name} ON CACHE BOOL "${var_name} as boolean" FORCE)
-        elseif(bool_value STREQUAL "OFF" OR bool_value STREQUAL "FALSE" OR bool_value STREQUAL "0")
-            set(${var_name} OFF CACHE BOOL "${var_name} as boolean" FORCE)
-        else()
-            # Not a bool, leave it as a string
-        endif()
-    else()
-        # Not defined, leave it as a string
-    endif()
-endfunction()
-
-# Usage:
-# set(SOME_LIRARIES foo bar)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
-# "foo bar" -> "optimized foo debug food optimized bar debug bard"
-# or
-# set(SOME_LIRARIES path/foo.lib)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" "d")
-# "path/foo.lib" -> "optimized path/foo.lib debug path/food.lib"
-# TODO Could be refined: take the library file extension as a parameter and
-# make sure the lib variable ends with not just contains it.
-function(add_debug_variants NAME LIBRARIES POSTFIX)
-    set(LIBRARIES_STR "${LIBRARIES}")
-    set(LIBRARIES "")
-
-    # the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
-    foreach(lib ${LIBRARIES_STR})
-        list(APPEND LIBRARIES optimized)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib})
-        endif()
-
-        list(APPEND LIBRARIES debug)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib}${POSTFIX})
-        endif()
-    endforeach()
-
-    set(${NAME} ${LIBRARIES} 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}
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}enum.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
-        PARENT_SCOPE
-    )
-endfunction()
@@ -1,13 +1,10 @@
 mkdir build && cd build

-REM Remove dot from PY_VER for use in library name
-REM From https://github.com/tpaviot/pythonocc-core/blob/master/ci/conda/bld.bat
 set MY_PY_VER=%PY_VER:.=%
-
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"

 cmake -G "Ninja" ^
- -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
+ -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
 -D CMAKE_BUILD_TYPE:STRING=Release ^
 -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -15,9 +12,6 @@ cmake -G "Ninja" ^
 -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include\opencascade" ^
 -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
 -D CGAL_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
- -D EIGEN_DIR:FILEPATH="%LIBRARY_PREFIX%\include\eigen3" ^
- -D LIBXML2_INCLUDE_DIR=%LIBRARY_PREFIX%/include/libxml2 ^
- -D LIBXML2_LIBRARIES=%LIBRARY_PREFIX%/lib/libxml2.lib ^
 -D GMP_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
 -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
 -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
@@ -38,14 +32,14 @@ cmake -G "Ninja" ^
 -D BUILD_CONVERT:BOOL=ON ^
 -D BUILD_IFCMAX:BOOL=OFF ^
 -D IFCXML_SUPPORT:BOOL=ON ^
- -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
- -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
+ -D Boost_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D Boost_INCLUDEDIR: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
+ %SRC_DIR%/cmake
+
+if errorlevel 1 exit 1
+
+:: Build and install
+cmake --build . -- install

 if errorlevel 1 exit 1
@@ -1,19 +1,19 @@
 #!/bin/bash

-# IF osx use file lib suffix .dylib
-# IF linux use file lib suffix .so
-# IF windows use file lib suffix .dll
+declare -a CMAKE_PLATFORM_FLAGS

-if [ "$(uname)" == "Darwin" ]; then
-    export FSUFFIX=dylib
-    export LDFLAGS="$LDFLAGS -Wl,-flat_namespace,-undefined,suppress"
-elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    export FSUFFIX=so
+if [[ ${HOST} =~ .*linux.* ]]; then
+    CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE=$RECIPE_DIR/cross-linux.cmake)
 fi

+if [ `uname` == Darwin ]; then
+  export CFLAGS="$CFLAGS   -Wl,-flat_namespace,-undefined,suppress"
+  export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
+  export LDFLAGS="$LDFLAGS  -Wl,-flat_namespace,-undefined,suppress"
+fi

-cmake ${CMAKE_ARGS} -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
+cmake -G Ninja \
+ -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
  ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -29,10 +29,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
 -DHDF5_LIBRARY_DIR=$PREFIX/lib \
 -DJSON_INCLUDE_DIR=$PREFIX/include \
 -DCGAL_INCLUDE_DIR=$PREFIX/include \
- -DLIBXML2_INCLUDE_DIR=$PREFIX/include/libxml2 \
- -DLIBXML2_LIBRARIES=$PREFIX/lib/libxml2.$FSUFFIX \
- -DEIGEN_DIR:FILEPATH=$PREFIX/include/eigen3 \
- -DCOLLADA_SUPPORT:BOOL=OFF \
+ -DCOLLADA_SUPPORT=0 \
 -DBUILD_EXAMPLES:BOOL=OFF \
 -DIFCXML_SUPPORT:BOOL=ON \
 -DGLTF_SUPPORT:BOOL=ON \
@@ -41,9 +38,8 @@ 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

-ninja install -j 1
+ninja install -j 1
@@ -1,58 +1,6 @@
+CONDA_BUILD_SYSROOT:
+  - /opt/MacOSX10.13.sdk       # [osx]
+
 variant:
  - novtk
-  - all
-
-occt:
-  - 7.8.1
-
-c_compiler:
- vs2022    # [win]
- gcc       # [linux]
- clang     # [osx]
-c_stdlib:
- vs        # [win]
- sysroot   # [linux]
- macosx_deployment_target  # [osx]
-cxx_compiler:
- vs2022    # [win]
- gcc       # [linux]
- clangxx   # [osx]
-c_compiler_version:
- '12'    # [linux]
- '16'    # [osx]
-cxx_compiler_version:
- '12'    # [linux]
- '16'    # [osx]
-c_stdlib_version:
- '2.12'    # [linux]
- '10.13'   # [osx]
-hdf5:
- 1.14.3
-libboost_devel:
- '1.84'
-libxml2:
- '2'
-mpfr:
- '4'
-gmp:
- '6'  # [not win]
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-
-zlib:
- '1'
-target_platform:
- win-64    # [win]
- linux-64  # [linux]
- osx-64    # [osx]
-macos_machine:
- x86_64-apple-darwin13.4.0
-MACOSX_DEPLOYMENT_TARGET:
- '10.13'
-MACOSX_SDK_VERSION:
- '10.13'
-
-CONDA_BUILD_SYSROOT:
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx]
+  - all
@@ -0,0 +1,16 @@
+# this one is important
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_PLATFORM Linux)
+
+# specify the cross compiler
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+
+# where is the target environment
+set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot)
+
+# search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -1,303 +1,68 @@
-{% set version = environ.get('VERSION_OVERRIDE', '0.8.0') %}
-{% set build = 0 %}
+{% set name = "ifcopenshell" %}
+{% set version = "0.7.0" %}
+{% set build = 1 %}

 # Higher number -> Always prioritize "novtk" variant over "all" variant
 {% set build = build + 200 %}   # [variant == "novtk"]
 {% set build = build + 100 %}   # [variant == "all"]

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

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

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

 requirements:
  build:
-    - cmake
-    - ninja
-    - swig >=4.1.1
-    - {{ stdlib("c") }}
    - {{ compiler('c') }}
    - {{ compiler('cxx') }}
+    - ninja >=1.10.2
+    - cmake
+    - swig 4.1.1
+
  host:
    - python
-    - libboost-devel
-    - occt *=*{{ variant }}*
+    - boost-cpp
+    - occt 7.7.2 *{{ variant }}*
    - libxml2
    - cgal-cpp
    - hdf5
-    - eigen
    - mpfr
-    - nlohmann_json
    - gmp  # [unix]
    - mpir  # [win]
+    - nlohmann_json
    - zlib
+
  run:
    - python
-    - {{ pin_compatible('occt', max_pin='x.x.x') }} *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x') }}
-
+    - occt 7.7.2 *{{ variant }}*
+    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
+    - libxml2
+    - mpfr
+    - gmp  # [unix]
+    - mpir  # [win]
+    - nlohmann_json
+    - zlib

 test:
  imports:
    - ifcopenshell

-
 about:
  home: https://ifcopenshell.org
  license: LGPL-3.0-or-later
  license_file: COPYING
  summary: 'IfcOpenShell is a library to support the IFC file format'
  description: |
-    IfcOpenShell
-    ============
-    
-    IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
-    parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x3, and IFC4x3. Extensive geometric support
-    is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
-    is possible at compile-time when using C++ and at run-time when using Python.
-    
-    In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an
-    application to convert IFC models to
-    other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform), and many
-    other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
-    
-    For more information, see:
-    
-    * [IfcOpenShell Website](http://ifcopenshell.org)
-    * [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
-    * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
-    * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
-    * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
-    * [BlenderBIM Add-on Website](https://blenderbim.org)
-    * [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
-    * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
-    * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)
-    
-    <table>
-      <thead>
-        <tr>
-          <th>Service</th>
-          <th>Status</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Anaconda Daily Build</td>
-          <td><a href="https://anaconda.org/ifcopenshell/ifcopenshell"><img src="https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell" alt="Anaconda-Server Badge"></a></td>
-        </tr>
-        <tr>
-          <td>Anaconda v0.8.0 Stable</td>
-          <td><a href="https://anaconda.org/conda-forge/ifcopenshell"><img src="https://img.shields.io/conda/vn/conda-forge/ifcopenshell" alt="Anaconda-Server Badge"></a></td>
-        </tr>
-        <tr>
-          <td>PyPi Daily Build</td>
-          <td><a href="https://pypi.org/project/ifcopenshell/"><img src="https://img.shields.io/pypi/v/ifcopenshell" alt="PyPi Badge"></a></td>
-        </tr>
-        <tr>
-          <td>ArchLinux AUR Package Stable</td>
-          <td><a href="https://aur.archlinux.org/packages/ifcopenshell"><img src="https://img.shields.io/aur/version/ifcopenshell" alt="AUR Badge"></a></td>
-        </tr>
-        <tr>
-          <td>ArchLinux AUR Package git</td>
-          <td><a href="https://aur.archlinux.org/packages/ifcopenshell-git"><img src="https://img.shields.io/aur/version/ifcopenshell-git" alt="AUR Badge"></a></td>
-        </tr>
-        <tr>
-          <td>BlenderBIM Add-on Chocolatey (under moderation)</td>
-          <td><a href="https://community.chocolatey.org/packages/blenderbim-nightly/"><img src="https://img.shields.io/chocolatey/v/blenderbim-nightly" alt="Chocolatey Badge"></a></td>
-        </tr>
-        <tr>
-          <td>Sponsor development on OpenCollective</td>
-          <td><a href="https://opencollective.com/opensourcebim/"><img src="https://opencollective.com/opensourcebim/tiers/badge.svg" alt="Financial Contributors"></a></td>
-        </tr>
-        <tr>
-          <td>Docker hub</td>
-          <td><a href="https://hub.docker.com/r/aecgeeks/ifcopenshell"><img src="https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell" alt="Docker Pulls"></a></td>
-        </tr>
-    
-      </tbody>
-    </table>
-    Contents
-    --------
-    
-    Those marked with an asterisk are part of IfcOpenShell.
-    <table>
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-          <th>License</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>bcf</td>
-          <td>Library to read and write BCF-XML and query OpenCDE BCF-API modules</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>blenderbim</td>
-          <td>Add-on to Blender providing a graphical native IFC authoring platform</td>
-          <td>GPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>bsdd</td>
-          <td>Library to query the bSDD API</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc2ca</td>
-          <td>Utility to convert IFC structural analysis models to Code_Aster</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc4d</td>
-          <td>Convert to and from IFC and project management software</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc5d</td>
-          <td>Report and optimise cost information from IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcbimtester</td>
-          <td>Wrapper for Gherkin based unit testing for IFC models</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcblender</td>
-          <td>Historic Blender IFC import add-on</td>
-          <td>LGPL-3.0-or-later*</td>
-        </tr>
-        <tr>
-          <td>ifccityjson</td>
-          <td>Convert CityJSON to IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcclash</td>
-          <td>Clash detection library and CLI app</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifccobie</td>
-          <td>Extract IFC data for COBie handover requirements</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcconvert</td>
-          <td>CLI app to convert IFC to many other formats</td>
-          <td>LGPL-3.0-or-later*</td>
-        </tr>
-        <tr>
-          <td>ifccsv</td>
-          <td>Library and CLI app to export and import schedules from IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-    <tr>
-      <td>ifcdiff</td>
-      <td>Compare changes between IFC models</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcfm</td>
-      <td>Extract IFC data for FM handover requirements</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcgeom</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcgeom_schema_agnostic</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcgeomserver</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcjni</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcmax</td>
-      <td>Historic extension for IFC support in 3DS Max</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcopenshell-python</td>
-      <td>Python library for IFC manipulation</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcparse</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcpatch</td>
-      <td>Utility to run pre-packaged scripts to manipulate IFCs</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcsverchok</td>
-      <td>Blender Add-on for visual node programming with IFC</td>
-      <td>GPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifctester</td>
-      <td>Library, CLI and webapp for IDS model auditing</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcwrap</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>qtviewer</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>serializers</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    </tbody>
-    </table>
-    
-    [LGPL]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/COPYING.LESSER "LGPL-3.0-or-later"
-    [IFC]: https://technical.buildingsmart.org/standards/ifc/ "IFC"
-    [IFC2x3 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ "IFC2x3 TC1"
-    [IFC4 Add2 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/ "IFC4 Add2 TC1"
-    [Visual Studio]: https://www.visualstudio.com/ "Visual Studio"
-    [Visual C++ Build Tools]: http://landinghub.visualstudio.com/visual-cpp-build-tools "Visual C++ Build Tools"
-    [MSYS2]: https://msys2.github.io/ "MSYS2"
-    [win/readme.md]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/win/readme.md "win/readme.md"
-    [nix/build-all.py]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/nix/build-all.py "nix/build-all.py"
+    IfcOpenShell is an open source (LGPL) software library for 
+    working with the Industry Foundation Classes (IFC) file format.
  doc_url: https://ifcopenshell.org/
  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
-
-extra:
-  recipe-maintainers:
-    - adrianinsaval
-    - looooo
-    - Krande
@@ -51,9 +51,7 @@
 ###############################################################################
 import logging
 import os
-import re
 import sys
-import glob
 import subprocess as sp
 import shutil
 import tarfile
@@ -81,7 +79,7 @@ ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
-OCCT_VERSION = "7.7.1"
+OCCT_VERSION = "7.5.3"
 BOOST_VERSION = "1.80.0"
 PCRE_VERSION = "8.41"
 LIBXML2_VERSION = "2.9.11"
@@ -92,8 +90,6 @@ HDF5_VERSION = "1.12.1"
 GMP_VERSION = "6.2.1"
 MPFR_VERSION = "3.1.6" # latest is 4.1.0
 CGAL_VERSION = "5.3"
-USD_VERSION = "23.05"
-TBB_VERSION = "2021.9.0"

 # binaries
 cp = "cp"
@@ -190,7 +186,7 @@ cecho(""" - How many compiler processes may be run in parallel.

 dependency_tree = {
    'IfcParse': ('boost', 'libxml2', 'hdf5'),
-    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal', 'eigen'),
+    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal'),
    'IfcConvert': ('IfcGeom',),
    'OpenCOLLADA': ('libxml2', 'pcre'),
    'IfcGeomServer': ('IfcGeom',),
@@ -204,9 +200,7 @@ dependency_tree = {
    'json': (),
    'hdf5': (),
    'cgal': (),
-    'eigen': (),
    'freetype': (),
-    # 'usd': ('boost', 'oneTBB')
 }

 def v(dep):
@@ -473,8 +467,6 @@ if "wasm" in flags:
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work

-compiler_flags = "CFLAGS", "CXXFLAGS", "LDFLAGS"
-
 CXXFLAGS = os.environ.get("CXXFLAGS", "")
 CFLAGS = os.environ.get("CFLAGS", "")
 LDFLAGS = os.environ.get("LDFLAGS", "")
@@ -500,11 +492,7 @@ else:
        CXXFLAGS=CXXFLAGS_MINIMAL
        CFLAGS=CFLAGS_MINIMAL
    LDFLAGS = f"{LDFLAGS} {ADDITIONAL_ARGS_STR}"
-
-if "lto" in flags:
-    for f in compiler_flags:
-        locals()[f] += f" -flto={IFCOS_NUM_BUILD_PROCS}"
-
+    
 os.environ["CXXFLAGS"] = CXXFLAGS
 os.environ["CFLAGS"] = CFLAGS
 os.environ["LDFLAGS"] = LDFLAGS
@@ -514,11 +502,6 @@ os.environ["LDFLAGS"] = LDFLAGS
 # build_dependency(name="cmake-%s" % (CMAKE_VERSION,), mode="autoconf", build_tool_args=[], download_url="https://cmake.org/files/v%s" % (CMAKE_VERSION_2,), download_name="cmake-%s.tar.gz" % (CMAKE_VERSION,))

 if 'hdf5' in targets:
-    # not supported
-    orig = [os.environ[f] for f in compiler_flags]
-    for f in compiler_flags:
-        os.environ[f] = re.sub("-flto(=\w+)?", "", os.environ[f])
-
    HDF5_MAJOR = ".".join(HDF5_VERSION.split(".")[:-1])
    build_dependency(
        name=f"hdf5-{HDF5_VERSION}",
@@ -529,10 +512,6 @@ if 'hdf5' in targets:
        ctest_result=f"HDF5-{HDF5_VERSION}-{platform.system()}",
        ctest_result_path=f"HDF_Group/HDF5/{HDF5_VERSION}"
    )
-    
-    for f, o in zip(compiler_flags, orig):
-        os.environ[f] = o
-    

 if "json" in targets:
    json_url = f"https://github.com/nlohmann/json/releases/download/{JSON_VERSION}/json.hpp"
@@ -541,9 +520,6 @@ if "json" in targets:
        os.makedirs(os.path.dirname(json_install_path))
    if not os.path.exists(json_install_path):
        urlretrieve(json_url, json_install_path)
-        
-if "eigen" in targets:
-    git_clone_or_pull_repository("https://gitlab.com/libeigen/eigen.git", f"{DEPS_DIR}/install/eigen-3.3.9", revision="3.3.9")

 if "pcre" in targets:
    build_dependency(
@@ -577,16 +553,12 @@ if "freetype" in targets:
        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":
        patches.append("./patches/occt/enable-exception-handling.patch")
-        
-    if OCCT_VERSION == "7.7.1":
-        patches.append("./patches/occt/no_ExpToCasExe.patch")
    
    if "wasm" in flags:
        patches.append("./patches/occt/no_em_js.patch")
@@ -601,7 +573,7 @@ if USE_OCCT and "occ" in targets:
            "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
            f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype"
        ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
        download_name = "occt",
        download_tool=download_tool_git,
        patch=patches,
@@ -775,42 +747,7 @@ if "cgal" in targets:
        download_tool=download_tool_git,
        revision=f"v{CGAL_VERSION}"
    )
-
-if "usd" in targets:
-    build_dependency(
-        name=f"oneTBB-{TBB_VERSION}",
-        mode="cmake",
-        build_tool_args=[
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"-DTBB_TEST=OFF"
-        ],
-        download_url="https://github.com/oneapi-src/oneTBB",
-        download_name="oneTBB",
-        download_tool=download_tool_git,
-        revision=f"v{TBB_VERSION}"
-    )
-
-    build_dependency(
-        name=f"usd-{USD_VERSION}",
-        mode="cmake",
-        build_tool_args=[
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/usd-{USD_VERSION}",
-            f"-DBOOST_ROOT={DEPS_DIR}/install/boost-{BOOST_VERSION}",
-            f"-DTBB_ROOT_DIR={DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"-DPXR_ENABLE_PYTHON_SUPPORT=FALSE",
-            f"-DPXR_ENABLE_GL_SUPPORT=FALSE",
-            f"-DPXR_BUILD_IMAGING=FALSE",
-            f"-DPXR_BUILD_TUTORIALS=FALSE",
-            f"-DPXR_BUILD_EXAMPLES=FALSE",
-            f"-DPXR_BUILD_USD_TOOLS=FALSE",
-            f"-DPXR_BUILD_TESTS=FALSE"
-        ],
-        download_url="https://github.com/PixarAnimationStudios/USD",
-        download_name="USD",
-        download_tool=download_tool_git,
-        revision=f"v{USD_VERSION}"
-    )
-
+    
 cecho("Building IfcOpenShell:", GREEN)

 IFCOS_DIR = os.path.join(DEPS_DIR, "build", "ifcopenshell")
@@ -830,10 +767,8 @@ cmake_args = [
    "-DBOOST_ROOT="                    f"{DEPS_DIR}/install/boost-{BOOST_VERSION}",
    "-DGLTF_SUPPORT="                  "ON",
    "-DJSON_INCLUDE_DIR="              f"{DEPS_DIR}/install/json",
-    "-DEIGEN_DIR="                     f"{DEPS_DIR}/install/eigen-3.3.9",
    "-DBoost_NO_BOOST_CMAKE="          "On",
-    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off"),
-    "-DVERSION_OVERRIDE="            +("On" if ADD_COMMIT_SHA else "Off")
+    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off")
 ]

 if "wasm" in flags:
@@ -895,13 +830,6 @@ if "hdf5" in targets:
 else:
    cmake_args.append("-DHDF5_SUPPORT=Off")

-if "usd" in targets:
-    cmake_args.extend([
-        "-DUSD_SUPPORT="               "On",
-        "-DUSD_INCLUDE_DIR="           f"{DEPS_DIR}/install/usd-{USD_VERSION}/include",
-        "-DUSD_LIBRARY_DIR="           f"{DEPS_DIR}/install/usd-{USD_VERSION}/lib"
-    ])
-
 if not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets):
    logger.info("\rConfiguring executables...")

@@ -972,7 +900,7 @@ if "IfcOpenShell-Python" in targets:
            if platform.system() != "Darwin":
                if BUILD_CFG == "Release":
                    # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]], cwd=module_dir)
+                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)

            return module_dir

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd17283f77..6cecf9dad3 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -826,6 +826,8 @@ if (EMSCRIPTEN)
-   list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
- endif()
- 
-+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-+
- # bison
- if (BUILD_YACCLEX)
-   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
@@ -1,6 +1,6 @@
 package:
  name: ifcopenshell
-  version: 0.8.0
+  version: 0.7.0

 source:
  path: IfcOpenShell
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages

 setup(name='IfcOpenShell',
-      version='0.8.0',
+      version='0.7.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',
@@ -1,35 +1,2 @@
 [tool.black]
-line-length = 120
-include = '''
-    src/(
-        bcf
-        |bcfserver
-        |blenderbim
-        |bsdd
-        |foundationserver
-        |ifc2ca
-        |ifc4d
-        |ifc5d
-        |ifcbimtester
-        |ifcblender
-        |ifccityjson
-        |ifcclash
-        |ifccsv
-        |ifcdiff
-        |ifcfm
-        |ifcpatch
-        |ifctester
-        |ifcopenshell-python
-        |ifcsverchok
-        |opencdeserver
-    )/.*.py$
-'''
-extend-exclude = '''
-    src/ifcopenshell-python/ifcopenshell/express/*
-    |src/ifcopenshell-python/ifcopenshell/mvd/*
-    |src/ifc2ca/templates/*
-'''
-
-[tool.pyright]
-reportInvalidTypeForm = false
-disableBytesTypePromotions = true
+line-length = 120
@@ -10,7 +10,7 @@ type: software
 authors:
  - name: "IfcOpenShell contributors"
 repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.8.0/src/bcf
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/bcf
 abstract: >-
  Library to read and write BCF-XML and query OpenCDE
  BCF-API modules
@@ -1,23 +1,8 @@
-# BCF - BCF Python library
-# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
-#
-# This file is part of BCF.
-#
-# BCF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BCF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
-
-PACKAGE_NAME:=bcf
-include ../common.mk
+VERSION:=`date '+%y%m%d'`
+SED:=sed -i
+ifeq ($(UNAME_S),Darwin)
+SED:=sed -i '' -e
+endif

 .PHONY: ci
 ci:
@@ -33,10 +18,13 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd

-.PHONY: test
-test:
-	pytest -p no:pytest-blender tests
+.PHONY: dist
+dist:
+	rm -rf dist
+	$(SED) "s/999999/$(VERSION)/" pyproject.toml
+	python -m build
+	$(SED) "s/$(VERSION)/999999/" pyproject.toml

 # .PHONY
 # api:
-#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
+#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
@@ -13,11 +13,11 @@ readme = "README.md"
 requires-python = ">=3.8"
 keywords = ["IFC", "BCF", "BIM"]
 dependencies = [
-    "xsdata>=24.4",
+    "xsdata",
    "numpy",
    "ifcopenshell",
 ]
-version = "0.0.0"
+version = "0.0.999999"
 classifiers = [
    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
    "Operating System :: OS Independent",
@@ -138,4 +138,4 @@ max-attributes = 10

 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120
@@ -15,5 +15,3 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with BCF.  If not, see <http://www.gnu.org/licenses/>.
-
-__version__ = version = "0.0.0"
@@ -18,7 +18,6 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with BCF.  If not, see <http://www.gnu.org/licenses/>.
 """
-
 import zipfile
 from pathlib import Path
 from typing import Optional, Union
@@ -5,8 +5,8 @@ from numpy.typing import NDArray


 def camera_vectors_from_element_placement(
-    elem_placement: NDArray[np.float64],
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+    elem_placement: NDArray[np.float_],
+) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
    """
    Calculate the vectors of a camera pointing to an element.

@@ -21,8 +21,8 @@ def camera_vectors_from_element_placement(


 def camera_vectors_from_target_position(
-    target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+    target_position: NDArray[np.float_], offset: Optional[NDArray[np.float_]] = None
+) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
    """
    Calculate the vectors of a camera pointing to a target point.

@@ -50,7 +50,7 @@ def camera_vectors_from_target_position(
    # return camera_position, -mat[:3, 2], mat[:3, 1]


-def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]:
+def unit_vector(v: NDArray[np.float_]) -> NDArray[np.float_]:
    """
    Return the unit vector of a vector.

@@ -5,7 +5,6 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba

 original idea from https://stackoverflow.com/a/19722365/1307905
 """
-
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -14,7 +13,8 @@ from typing import Any, Optional, Protocol


 class ZipFileInterface(Protocol):
-    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None: ...
+    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None:
+        ...


 class InMemoryZipFile:
@@ -1,5 +1,4 @@
 """BCF XML V2 handler."""
-
 import uuid
 import warnings
 import zipfile
@@ -34,7 +34,7 @@ class BimSnippet:
        metadata={
            "name": "isExternal",
            "type": "Attribute",
-        },
+        }
    )


@@ -64,7 +64,7 @@ class HeaderFile:
            "name": "Filename",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    date: Optional[XmlDateTime] = field(
        default=None,
@@ -72,7 +72,7 @@ class HeaderFile:
            "name": "Date",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    reference: Optional[str] = field(
        default=None,
@@ -80,7 +80,7 @@ class HeaderFile:
            "name": "Reference",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    ifc_project: Optional[str] = field(
        default=None,
@@ -89,7 +89,7 @@ class HeaderFile:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
    )
    ifc_spatial_structure_element: Optional[str] = field(
        default=None,
@@ -98,14 +98,14 @@ class HeaderFile:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
    )
    is_external: bool = field(
        default=True,
        metadata={
            "name": "isExternal",
            "type": "Attribute",
-        },
+        }
    )


@@ -120,7 +120,7 @@ class TopicDocumentReference:
            "name": "ReferencedDocument",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    description: Optional[str] = field(
        default=None,
@@ -128,7 +128,7 @@ class TopicDocumentReference:
            "name": "Description",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: Optional[str] = field(
        default=None,
@@ -136,14 +136,14 @@ class TopicDocumentReference:
            "name": "Guid",
            "type": "Attribute",
            "pattern": r"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}",
-        },
+        }
    )
    is_external: bool = field(
        default=False,
        metadata={
            "name": "isExternal",
            "type": "Attribute",
-        },
+        }
    )


@@ -170,7 +170,7 @@ class ViewPoint:
            "name": "Viewpoint",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    snapshot: Optional[str] = field(
        default=None,
@@ -178,7 +178,7 @@ class ViewPoint:
            "name": "Snapshot",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    index: Optional[int] = field(
        default=None,
@@ -186,7 +186,7 @@ class ViewPoint:
            "name": "Index",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -230,7 +230,7 @@ class Comment:
            "name": "Viewpoint",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_date: Optional[XmlDateTime] = field(
        default=None,
@@ -238,7 +238,7 @@ class Comment:
            "name": "ModifiedDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_author: Optional[str] = field(
        default=None,
@@ -246,7 +246,7 @@ class Comment:
            "name": "ModifiedAuthor",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -267,7 +267,7 @@ class Header:
            "type": "Element",
            "namespace": "",
            "min_occurs": 1,
-        },
+        }
    )


@@ -279,7 +279,7 @@ class Topic:
            "name": "ReferenceLink",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    title: str = field(
        metadata={
@@ -295,7 +295,7 @@ class Topic:
            "name": "Priority",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    index: Optional[int] = field(
        default=None,
@@ -303,7 +303,7 @@ class Topic:
            "name": "Index",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    labels: List[str] = field(
        default_factory=list,
@@ -311,7 +311,7 @@ class Topic:
            "name": "Labels",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    creation_date: XmlDateTime = field(
        metadata={
@@ -335,7 +335,7 @@ class Topic:
            "name": "ModifiedDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_author: Optional[str] = field(
        default=None,
@@ -343,7 +343,7 @@ class Topic:
            "name": "ModifiedAuthor",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    due_date: Optional[XmlDateTime] = field(
        default=None,
@@ -351,7 +351,7 @@ class Topic:
            "name": "DueDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    assigned_to: Optional[str] = field(
        default=None,
@@ -359,7 +359,7 @@ class Topic:
            "name": "AssignedTo",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    stage: Optional[str] = field(
        default=None,
@@ -367,7 +367,7 @@ class Topic:
            "name": "Stage",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    description: Optional[str] = field(
        default=None,
@@ -375,7 +375,7 @@ class Topic:
            "name": "Description",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    bim_snippet: Optional[BimSnippet] = field(
        default=None,
@@ -383,7 +383,7 @@ class Topic:
            "name": "BimSnippet",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    document_reference: List[TopicDocumentReference] = field(
        default_factory=list,
@@ -391,7 +391,7 @@ class Topic:
            "name": "DocumentReference",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    related_topic: List[TopicRelatedTopic] = field(
        default_factory=list,
@@ -399,7 +399,7 @@ class Topic:
            "name": "RelatedTopic",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -414,14 +414,14 @@ class Topic:
        metadata={
            "name": "TopicType",
            "type": "Attribute",
-        },
+        }
    )
    topic_status: Optional[str] = field(
        default=None,
        metadata={
            "name": "TopicStatus",
            "type": "Attribute",
-        },
+        }
    )


@@ -433,7 +433,7 @@ class Markup:
            "name": "Header",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    topic: Topic = field(
        metadata={
@@ -449,7 +449,7 @@ class Markup:
            "name": "Comment",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    viewpoints: List[ViewPoint] = field(
        default_factory=list,
@@ -457,5 +457,5 @@ class Markup:
            "name": "Viewpoints",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
@@ -10,7 +10,7 @@ class Project:
            "name": "Name",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    project_id: str = field(
        metadata={
@@ -29,7 +29,7 @@ class ProjectExtension:
            "name": "Project",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    extension_schema: str = field(
        metadata={
@@ -10,12 +10,12 @@ class Version:
            "name": "DetailedVersion",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    version_id: Optional[str] = field(
        default=None,
        metadata={
            "name": "VersionId",
            "type": "Attribute",
-        },
+        }
    )
@@ -15,14 +15,14 @@ class Component:
        metadata={
            "name": "OriginatingSystem",
            "type": "Element",
-        },
+        }
    )
    authoring_tool_id: Optional[str] = field(
        default=None,
        metadata={
            "name": "AuthoringToolId",
            "type": "Element",
-        },
+        }
    )
    ifc_guid: Optional[str] = field(
        default=None,
@@ -31,7 +31,7 @@ class Component:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
    )


@@ -92,21 +92,21 @@ class ViewSetupHints:
        metadata={
            "name": "SpacesVisible",
            "type": "Attribute",
-        },
+        }
    )
    space_boundaries_visible: Optional[bool] = field(
        default=None,
        metadata={
            "name": "SpaceBoundariesVisible",
            "type": "Attribute",
-        },
+        }
    )
    openings_visible: Optional[bool] = field(
        default=None,
        metadata={
            "name": "OpeningsVisible",
            "type": "Attribute",
-        },
+        }
    )


@@ -139,7 +139,7 @@ class ComponentColoringColor:
            "name": "Component",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )
    color: Optional[str] = field(
        default=None,
@@ -147,7 +147,7 @@ class ComponentColoringColor:
            "name": "Color",
            "type": "Attribute",
            "pattern": r"[0-9,a-f,A-F]{6}([0-9,a-f,A-F]{2})?",
-        },
+        }
    )


@@ -159,7 +159,7 @@ class ComponentSelection:
            "name": "Component",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )


@@ -174,7 +174,7 @@ class ComponentVisibilityExceptions:
            "name": "Component",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )


@@ -205,7 +205,6 @@ class OrthogonalCamera:
        camera_up_vector:
        view_to_world_scale: view's visible size in meters
    """
-
    camera_view_point: Point = field(
        metadata={
            "name": "CameraViewPoint",
@@ -248,7 +247,6 @@ class PerspectiveCamera:
            release and viewers should be expect values outside this
            range in current implementations.
    """
-
    camera_view_point: Point = field(
        metadata={
            "name": "CameraViewPoint",
@@ -338,7 +336,7 @@ class ComponentColoring:
            "name": "Color",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )


@@ -349,14 +347,14 @@ class ComponentVisibility:
        metadata={
            "name": "Exceptions",
            "type": "Element",
-        },
+        }
    )
    default_visibility: Optional[bool] = field(
        default=None,
        metadata={
            "name": "DefaultVisibility",
            "type": "Attribute",
-        },
+        }
    )


@@ -370,7 +368,7 @@ class VisualizationInfoClippingPlanes:
        metadata={
            "name": "ClippingPlane",
            "type": "Element",
-        },
+        }
    )


@@ -385,7 +383,7 @@ class VisualizationInfoLines:
            "name": "Line",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )


@@ -396,14 +394,14 @@ class Components:
        metadata={
            "name": "ViewSetupHints",
            "type": "Element",
-        },
+        }
    )
    selection: Optional[ComponentSelection] = field(
        default=None,
        metadata={
            "name": "Selection",
            "type": "Element",
-        },
+        }
    )
    visibility: ComponentVisibility = field(
        metadata={
@@ -417,7 +415,7 @@ class Components:
        metadata={
            "name": "Coloring",
            "type": "Element",
-        },
+        }
    )


@@ -426,48 +424,47 @@ class VisualizationInfo:
    """
    VisualizationInfo documentation.
    """
-
    components: Optional[Components] = field(
        default=None,
        metadata={
            "name": "Components",
            "type": "Element",
-        },
+        }
    )
    orthogonal_camera: Optional[OrthogonalCamera] = field(
        default=None,
        metadata={
            "name": "OrthogonalCamera",
            "type": "Element",
-        },
+        }
    )
    perspective_camera: Optional[PerspectiveCamera] = field(
        default=None,
        metadata={
            "name": "PerspectiveCamera",
            "type": "Element",
-        },
+        }
    )
    lines: Optional[VisualizationInfoLines] = field(
        default=None,
        metadata={
            "name": "Lines",
            "type": "Element",
-        },
+        }
    )
    clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
        default=None,
        metadata={
            "name": "ClippingPlanes",
            "type": "Element",
-        },
+        }
    )
    bitmap: List[VisualizationInfoBitmap] = field(
        default_factory=list,
        metadata={
            "name": "Bitmap",
            "type": "Element",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -1,5 +1,4 @@
 """BCF XML V2 Topic handler."""
-
 import datetime
 import tempfile
 import uuid
@@ -278,7 +277,7 @@ class TopicHandler:
        self.add_visinfo_handler(new_viewpoint)
        return new_viewpoint

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

        Args:
@@ -176,7 +176,7 @@ class VisualizationInfoHandler:
    @classmethod
    def create_from_point_and_guids(
        cls,
-        position: NDArray[np.float64],
+        position: NDArray[np.float_],
        *guids: str,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
    ) -> "VisualizationInfoHandler":
@@ -224,7 +224,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    )


-def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
    """
    Return a BCF viewpoint of an IFC element.

@@ -261,7 +261,7 @@ def build_components(*guids: str) -> mdl.Components:
    )


-def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.

@@ -275,7 +275,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:


 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
 ) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.
@@ -1,5 +1,4 @@
 """BCF XML V3 handlers."""
-
 import uuid
 import warnings
 import zipfile
@@ -1,5 +1,4 @@
 """BCF XML V3 Documents handler."""
-
 import zipfile
 from typing import Any, Optional

@@ -22,7 +22,7 @@ class Document:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -45,7 +45,7 @@ class DocumentInfoDocuments:
            "name": "Document",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -57,5 +57,5 @@ class DocumentInfo:
            "name": "Documents",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
@@ -15,7 +15,7 @@ class ExtensionsPriorities:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -32,7 +32,7 @@ class ExtensionsSnippetTypes:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -49,7 +49,7 @@ class ExtensionsStages:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -66,7 +66,7 @@ class ExtensionsTopicLabels:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -83,7 +83,7 @@ class ExtensionsTopicStatuses:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -100,7 +100,7 @@ class ExtensionsTopicTypes:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -117,7 +117,7 @@ class ExtensionsUsers:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -129,7 +129,7 @@ class Extensions:
            "name": "TopicTypes",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    topic_statuses: Optional[ExtensionsTopicStatuses] = field(
        default=None,
@@ -137,7 +137,7 @@ class Extensions:
            "name": "TopicStatuses",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    priorities: Optional[ExtensionsPriorities] = field(
        default=None,
@@ -145,7 +145,7 @@ class Extensions:
            "name": "Priorities",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    topic_labels: Optional[ExtensionsTopicLabels] = field(
        default=None,
@@ -153,7 +153,7 @@ class Extensions:
            "name": "TopicLabels",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    users: Optional[ExtensionsUsers] = field(
        default=None,
@@ -161,7 +161,7 @@ class Extensions:
            "name": "Users",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    snippet_types: Optional[ExtensionsSnippetTypes] = field(
        default=None,
@@ -169,7 +169,7 @@ class Extensions:
            "name": "SnippetTypes",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    stages: Optional[ExtensionsStages] = field(
        default=None,
@@ -177,5 +177,5 @@ class Extensions:
            "name": "Stages",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
@@ -40,7 +40,7 @@ class BimSnippet:
        metadata={
            "name": "IsExternal",
            "type": "Attribute",
-        },
+        }
    )


@@ -68,7 +68,7 @@ class DocumentReference:
            "type": "Element",
            "namespace": "",
            "pattern": r"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}",
-        },
+        }
    )
    url: Optional[str] = field(
        default=None,
@@ -78,7 +78,7 @@ class DocumentReference:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    description: Optional[str] = field(
        default=None,
@@ -88,7 +88,7 @@ class DocumentReference:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -110,7 +110,7 @@ class File:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    date: Optional[XmlDateTime] = field(
        default=None,
@@ -118,7 +118,7 @@ class File:
            "name": "Date",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    reference: Optional[str] = field(
        default=None,
@@ -128,7 +128,7 @@ class File:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    ifc_project: Optional[str] = field(
        default=None,
@@ -137,7 +137,7 @@ class File:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
    )
    ifc_spatial_structure_element: Optional[str] = field(
        default=None,
@@ -146,14 +146,14 @@ class File:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
    )
    is_external: bool = field(
        default=True,
        metadata={
            "name": "IsExternal",
            "type": "Attribute",
-        },
+        }
    )


@@ -170,7 +170,7 @@ class TopicLabels:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -187,7 +187,7 @@ class TopicReferenceLinks:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )


@@ -216,7 +216,7 @@ class ViewPoint:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    snapshot: Optional[str] = field(
        default=None,
@@ -226,7 +226,7 @@ class ViewPoint:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    index: Optional[int] = field(
        default=None,
@@ -234,7 +234,7 @@ class ViewPoint:
            "name": "Index",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -274,7 +274,7 @@ class Comment:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    viewpoint: Optional[CommentViewpoint] = field(
        default=None,
@@ -282,7 +282,7 @@ class Comment:
            "name": "Viewpoint",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_date: Optional[XmlDateTime] = field(
        default=None,
@@ -290,7 +290,7 @@ class Comment:
            "name": "ModifiedDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_author: Optional[str] = field(
        default=None,
@@ -300,7 +300,7 @@ class Comment:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -323,7 +323,7 @@ class HeaderFiles:
            "name": "File",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -338,7 +338,7 @@ class TopicDocumentReferences:
            "name": "DocumentReference",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -353,7 +353,7 @@ class TopicRelatedTopics:
            "name": "RelatedTopic",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -368,7 +368,7 @@ class TopicViewpoints:
            "name": "ViewPoint",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -380,7 +380,7 @@ class Header:
            "name": "Files",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -395,7 +395,7 @@ class TopicComments:
            "name": "Comment",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )


@@ -407,7 +407,7 @@ class Topic:
            "name": "ReferenceLinks",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    title: str = field(
        metadata={
@@ -427,7 +427,7 @@ class Topic:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    index: Optional[int] = field(
        default=None,
@@ -435,7 +435,7 @@ class Topic:
            "name": "Index",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    labels: Optional[TopicLabels] = field(
        default=None,
@@ -443,7 +443,7 @@ class Topic:
            "name": "Labels",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    creation_date: XmlDateTime = field(
        metadata={
@@ -469,7 +469,7 @@ class Topic:
            "name": "ModifiedDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    modified_author: Optional[str] = field(
        default=None,
@@ -479,7 +479,7 @@ class Topic:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    due_date: Optional[XmlDateTime] = field(
        default=None,
@@ -487,7 +487,7 @@ class Topic:
            "name": "DueDate",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    assigned_to: Optional[str] = field(
        default=None,
@@ -497,7 +497,7 @@ class Topic:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    stage: Optional[str] = field(
        default=None,
@@ -507,7 +507,7 @@ class Topic:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    description: Optional[str] = field(
        default=None,
@@ -517,7 +517,7 @@ class Topic:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    bim_snippet: Optional[BimSnippet] = field(
        default=None,
@@ -525,7 +525,7 @@ class Topic:
            "name": "BimSnippet",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    document_references: Optional[TopicDocumentReferences] = field(
        default=None,
@@ -533,7 +533,7 @@ class Topic:
            "name": "DocumentReferences",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    related_topics: Optional[TopicRelatedTopics] = field(
        default=None,
@@ -541,7 +541,7 @@ class Topic:
            "name": "RelatedTopics",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    comments: Optional[TopicComments] = field(
        default=None,
@@ -549,7 +549,7 @@ class Topic:
            "name": "Comments",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    viewpoints: Optional[TopicViewpoints] = field(
        default=None,
@@ -557,7 +557,7 @@ class Topic:
            "name": "Viewpoints",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -574,7 +574,7 @@ class Topic:
            "type": "Attribute",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    topic_type: str = field(
        metadata={
@@ -604,7 +604,7 @@ class Markup:
            "name": "Header",
            "type": "Element",
            "namespace": "",
-        },
+        }
    )
    topic: Topic = field(
        metadata={
@@ -12,7 +12,7 @@ class Project:
            "namespace": "",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    project_id: str = field(
        metadata={
@@ -17,7 +17,7 @@ class Component:
            "type": "Element",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    authoring_tool_id: Optional[str] = field(
        default=None,
@@ -26,7 +26,7 @@ class Component:
            "type": "Element",
            "min_length": 1,
            "white_space": "collapse",
-        },
+        }
    )
    ifc_guid: Optional[str] = field(
        default=None,
@@ -35,7 +35,7 @@ class Component:
            "type": "Attribute",
            "length": 22,
            "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
    )


@@ -96,21 +96,21 @@ class ViewSetupHints:
        metadata={
            "name": "SpacesVisible",
            "type": "Attribute",
-        },
+        }
    )
    space_boundaries_visible: bool = field(
        default=False,
        metadata={
            "name": "SpaceBoundariesVisible",
            "type": "Attribute",
-        },
+        }
    )
    openings_visible: bool = field(
        default=False,
        metadata={
            "name": "OpeningsVisible",
            "type": "Attribute",
-        },
+        }
    )


@@ -191,7 +191,7 @@ class ComponentColoringColorComponents:
            "name": "Component",
            "type": "Element",
            "min_occurs": 1,
-        },
+        }
    )


@@ -202,7 +202,7 @@ class ComponentSelection:
        metadata={
            "name": "Component",
            "type": "Element",
-        },
+        }
    )


@@ -216,7 +216,7 @@ class ComponentVisibilityExceptions:
        metadata={
            "name": "Component",
            "type": "Element",
-        },
+        }
    )


@@ -249,7 +249,6 @@ class OrthogonalCamera:
        aspect_ratio: Proportional relationship between the width and
            the height of the view (w/h).
    """
-
    camera_view_point: Point = field(
        metadata={
            "name": "CameraViewPoint",
@@ -303,7 +302,6 @@ class PerspectiveCamera:
        aspect_ratio: Proportional relationship between the width and
            the height of the view (w/h).
    """
-
    camera_view_point: Point = field(
        metadata={
            "name": "CameraViewPoint",
@@ -373,21 +371,21 @@ class ComponentVisibility:
        metadata={
            "name": "ViewSetupHints",
            "type": "Element",
-        },
+        }
    )
    exceptions: Optional[ComponentVisibilityExceptions] = field(
        default=None,
        metadata={
            "name": "Exceptions",
            "type": "Element",
-        },
+        }
    )
    default_visibility: bool = field(
        default=False,
        metadata={
            "name": "DefaultVisibility",
            "type": "Attribute",
-        },
+        }
    )


@@ -401,7 +399,7 @@ class VisualizationInfoBitmaps:
        metadata={
            "name": "Bitmap",
            "type": "Element",
-        },
+        }
    )


@@ -415,7 +413,7 @@ class VisualizationInfoClippingPlanes:
        metadata={
            "name": "ClippingPlane",
            "type": "Element",
-        },
+        }
    )


@@ -429,7 +427,7 @@ class VisualizationInfoLines:
        metadata={
            "name": "Line",
            "type": "Element",
-        },
+        }
    )


@@ -440,7 +438,7 @@ class ComponentColoring:
        metadata={
            "name": "Color",
            "type": "Element",
-        },
+        }
    )


@@ -451,21 +449,21 @@ class Components:
        metadata={
            "name": "Selection",
            "type": "Element",
-        },
+        }
    )
    visibility: Optional[ComponentVisibility] = field(
        default=None,
        metadata={
            "name": "Visibility",
            "type": "Element",
-        },
+        }
    )
    coloring: Optional[ComponentColoring] = field(
        default=None,
        metadata={
            "name": "Coloring",
            "type": "Element",
-        },
+        }
    )


@@ -474,48 +472,47 @@ class VisualizationInfo:
    """
    VisualizationInfo documentation.
    """
-
    components: Optional[Components] = field(
        default=None,
        metadata={
            "name": "Components",
            "type": "Element",
-        },
+        }
    )
    orthogonal_camera: Optional[OrthogonalCamera] = field(
        default=None,
        metadata={
            "name": "OrthogonalCamera",
            "type": "Element",
-        },
+        }
    )
    perspective_camera: Optional[PerspectiveCamera] = field(
        default=None,
        metadata={
            "name": "PerspectiveCamera",
            "type": "Element",
-        },
+        }
    )
    lines: Optional[VisualizationInfoLines] = field(
        default=None,
        metadata={
            "name": "Lines",
            "type": "Element",
-        },
+        }
    )
    clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
        default=None,
        metadata={
            "name": "ClippingPlanes",
            "type": "Element",
-        },
+        }
    )
    bitmaps: Optional[VisualizationInfoBitmaps] = field(
        default=None,
        metadata={
            "name": "Bitmaps",
            "type": "Element",
-        },
+        }
    )
    guid: str = field(
        metadata={
@@ -1,5 +1,4 @@
 """BCF XML V3 Topic handler."""
-
 import datetime
 import uuid
 import zipfile
@@ -175,7 +174,7 @@ class TopicHandler:
        new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
        self.add_visinfo_handler(new_viewpoint)

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

@@ -175,7 +175,7 @@ class VisualizationInfoHandler:
    @classmethod
    def create_from_point_and_guids(
        cls,
-        position: NDArray[np.float64],
+        position: NDArray[np.float_],
        *guids: str,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
    ) -> "VisualizationInfoHandler":
@@ -218,7 +218,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    )


-def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
    """
    Return a BCF viewpoint of an IFC element.

@@ -255,7 +255,7 @@ def build_components(*guids: str) -> mdl.Components:
    )


-def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.

@@ -269,7 +269,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:


 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
 ) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.
@@ -1,5 +1,4 @@
 """XML Parser and Serializer factories."""
-
 from typing import Optional, Protocol, Type, TypeVar

 from xsdata.formats.dataclass.context import XmlContext
@@ -11,14 +10,14 @@ from xsdata.formats.dataclass.serializers.config import SerializerConfig
 def build_xml_parser(context: Optional[XmlContext] = None) -> XmlParser:
    """Return a parser for an XML file."""
    parser = XmlParser(context=context or XmlContext())
-    parser.register_namespace(ns_map=parser.ns_map, prefix="xs", uri="http://www.w3.org/2001/XMLSchema")
+    parser.register_namespace("xs", "http://www.w3.org/2001/XMLSchema")
    return parser


 def build_serializer(context: Optional[XmlContext] = None) -> XmlSerializer:
    """Return a serializer for an XML file."""
    return XmlSerializer(
-        config=SerializerConfig(indent="  "),
+        config=SerializerConfig(pretty_print=True),
        context=context or XmlContext(),
    )

@@ -37,9 +36,8 @@ class AbstractXmlParserSerializer(Protocol):
            xml: The XML file as bytes.
            clazz: The class to parse to.
        """
-        ...

-    def serialize(self, obj: object, ns_map: Optional[dict[str, str]] = None) -> str:
+    def serialize(self, obj: T, ns_map: Optional[dict[str, str]] = None) -> str:
        """
        Serialize an object to XML.

@@ -50,7 +48,6 @@ class AbstractXmlParserSerializer(Protocol):
        Returns:
            The XML as string.
        """
-        ...


 class XmlParserSerializer:
@@ -71,7 +68,7 @@ class XmlParserSerializer:
        """
        return self.parser.from_bytes(xml, clazz)

-    def serialize(self, obj: object, ns_map: Optional[dict[Optional[str], str]] = None) -> str:
+    def serialize(self, obj: T, ns_map: Optional[dict[str, str]] = None) -> str:
        """
        Serialize an object to XML.

@@ -82,5 +79,5 @@ class XmlParserSerializer:
        Returns:
            The XML as string.
        """
-        ns_map = ns_map or self.parser.ns_map or {"xs": "http://www.w3.org/2001/XMLSchema"}
+        ns_map = ns_map or {"xs": "http://www.w3.org/2001/XMLSchema"}
        return self.serializer.render(obj, ns_map)
@@ -1,5 +1,4 @@
 """BCF XML tests."""
-
 import uuid
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -1,5 +1,4 @@
 """BCF XML tests."""
-
 import uuid
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -10,7 +10,7 @@ type: software
 authors:
  - name: "IfcOpenShell contributors"
 repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.8.0/src/blenderbim
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/blenderbim
 url: 'https://blenderbim.org/'
 repository-artifact: 'https://blenderbim.org/download.html'
 abstract: >-
@@ -16,16 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-PYTHON:=python3.11
-PIP:=pip3.11
+PYTHON:=python3.10
+PIP:=pip3.10
 PATCH:=patch
 SED:=sed -i
-VENV_ACTIVATE:=bin/activate
-
 ifeq ($(OS),Windows_NT)
 HOSTOS:=win
-PYTHON:=python
-VENV_ACTIVATE:=Scripts/activate
 else
 UNAME_S:=$(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -39,16 +35,16 @@ SED:=sed -i '' -e
 endif
 endif

-IS_STABLE:=FALSE
-VERSION:=$(shell cat ../../VERSION)
-VERSION_MAJOR:=$(shell cat '../../VERSION' | cut -d '.' -f 1)
-VERSION_MINOR:=$(shell cat '../../VERSION' | cut -d '.' -f 2)
-VERSION_PATCH:=$(shell cat '../../VERSION' | cut -d '.' -f 3)
-VERSION_DATE:=$(shell date '+%y%m%d')
+VERSION:=`date '+%y%m%d'`
 LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
 PYVERSION:=py310
 PYPI_IMP:=cp

+ifeq ($(PYVERSION), py39)
+PYLIBDIR:=python3.9
+PYNUMBER:=39
+PYPI_VERSION:=3.9
+endif
 ifeq ($(PYVERSION), py310)
 PYLIBDIR:=python3.10
 PYNUMBER:=310
@@ -59,302 +55,416 @@ PYLIBDIR:=python3.11
 PYNUMBER:=311
 PYPI_VERSION:=3.11
 endif
-ifeq ($(PYVERSION), py312)
-PYLIBDIR:=python3.12
-PYNUMBER:=312
-PYPI_VERSION:=3.12
-endif

 ifeq ($(PLATFORM), linux)
 PYPI_PLATFORM:=--platform manylinux_2_17_x86_64
-BLENDER_PLATFORM:=linux-x64
+LXML_ARCH:=manylinux_2_28_x86_64
+SHAPELY_ARCH:=manylinux_2_17_x86_64.manylinux2014_x86_64
+PILLOW_ARCH:=manylinux_2_28_x86_64
 endif

 ifeq ($(PLATFORM), macos)
-PYPI_PLATFORM:=--platform macosx_10_10_x86_64
-BLENDER_PLATFORM:=macos-x64
+PYPI_PLATFORM:=--platform macosx_10_9_x86_64
+SHAPELY_ARCH:=macosx_10_9_x86_64
+PILLOW_ARCH:=macosx_10_10_x86_64
+ifeq ($(PYVERSION), py39)
+LXML_ARCH:=macosx_11_0_x86_64
+endif
+ifeq ($(PYVERSION), py310)
+LXML_ARCH:=macosx_11_0_x86_64
+endif
+ifeq ($(PYVERSION), py311)
+LXML_ARCH:=macosx_11_0_universal2
+endif
 endif

 ifeq ($(PLATFORM), macosm1)
 PYPI_PLATFORM:=--platform macosx_11_0_arm64
-BLENDER_PLATFORM:=macos-arm64
+LXML_ARCH:=macosx_11_0_universal2
+SHAPELY_ARCH:=macosx_11_0_arm64
+PILLOW_ARCH:=macosx_11_0_arm64
 endif

 ifeq ($(PLATFORM), win)
 PYPI_PLATFORM:=--platform win_amd64
-BLENDER_PLATFORM:=windows-x64
+LXML_ARCH:=win_amd64
+SHAPELY_ARCH:=win_amd64
+PILLOW_ARCH:=win_amd64
 endif

-# Current build commit hash.
-OLD:=d51fa2c
+LXML_NAME:=lxml
+LXML_VER:=4.9.4
+SHAPELY_NAME:=shapely
+SHAPELY_VER:=2.0.2
+PILLOW_NAME:=pillow
+PILLOW_PKG_NAME:=Pillow
+PILLOW_VER:=9.5.0
+SHAPELY_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/s/$(SHAPELY_NAME)/$(SHAPELY_NAME)-$(SHAPELY_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(SHAPELY_ARCH).whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/p/$(PILLOW_NAME)/$(PILLOW_PKG_NAME)-$(PILLOW_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(PILLOW_ARCH).whl
+
+ifeq ($(PLATFORM), macosm1)
+ifeq ($(PYVERSION), py39)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h0520ce3_1.tar.bz2
+endif
+ifeq ($(PYVERSION), py310)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
+endif
+ifeq ($(PYVERSION), py311)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py311h246f609_1.tar.bz2
+endif
+else
+LXML_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/l/$(LXML_NAME)/$(LXML_NAME)-$(LXML_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(LXML_ARCH).whl
+endif
+$(info $$LXML_URL is [${LXML_URL}])
+$(info $$SHAPELY_URL is [${SHAPELY_URL}])
+$(info $$PILLOW_URL is [${PILLOW_URL}])
+
 .PHONY: bump
 bump:
-	cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
-	cd ../ifcopenshell-python/ && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
+	cd . && $(SED) "s/$(OLD)/$(NEW)/" Makefile
+	cd ../ifcopenshell-python/ && $(SED) "s/$(OLD)/$(NEW)/" Makefile
+	cd ../ifcopenshell-python/docs/ifcconvert/ && $(SED) "s/$(OLD)/$(NEW)/" installation.rst
+	cd ../ifcopenshell-python/docs/ifcopenshell-python/ && $(SED) "s/$(OLD)/$(NEW)/" installation.rst

 .PHONY: dist
 dist:
 ifndef PLATFORM
 	$(error PLATFORM is not set)
 endif
-	rm -rf build
-	mkdir -p build
-	mkdir -p dist
-	cp -r blenderbim build/
+	rm -rf dist
+	mkdir -p dist/working
+	mkdir -p dist/blenderbim
+	cp -r blenderbim/* dist/blenderbim/

-	# To scope any build-time dependencies
-	cd build && $(PYTHON) -m venv env && . env/$(VENV_ACTIVATE) && $(PIP) install build
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) install wheel
-
-	mkdir -p build/wheels
 	# Provides IfcOpenShell Python functionality
-	cd ../ifcopenshell-python && make dist PLATFORM=$(PLATFORM)64 PYVERSION=$(PYVERSION) && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../bcf && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifcclash && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifctester && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifcfm && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../bsdd && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifcdiff && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifccsv && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifcpatch && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifc4d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifc5d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd ../ifccityjson && make dist && mv dist/*.whl ../blenderbim/build/wheels/
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download GitPython --dest=./wheels
-	# Provides audio playback for costing
-	# This is a REALLY IMPORTANT feature
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/Andrej730/aud.git --wheel-dir=./wheels
-	# IfcOpenShell dependency - support for new typing features
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download typing_extensions --dest=./wheels
-	# Required by IfcCSV
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Pandas ships with very heavy tests
-	# cd build/site-packages/pandas && rm -rf tests
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download openpyxl --dest=./wheels
-	# odfpy doesn't come with its own wheel, so whee'l (get it?) create it ourselves!
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel odfpy --wheel-dir=./wheels
-	# Required by IFCCityJSON
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --dest=./wheels
-	# Provides express rule validation for ifcopenshell.validate
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytest --dest=./wheels
-	# Provides Brickschema functionality
-	# Is not platform specific but has platform specific dependencies.
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "brickschema[persistence]==0.7.6a2" $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required for SVG to DXF conversion
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download ezdxf $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required by bcf
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download xsdata --dest=./wheels
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download xmlschema --dest=./wheels
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download elementpath --dest=./wheels
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download six --dest=./wheels
-	# Required by drawing module
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lxml $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required by qto and drawing module
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download shapely $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required by the BIM type manager thumbnail generator
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pillow $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Provides mustache templating in construction docs and web UI data
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pystache --dest=./wheels
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-e38eafd-$(PLATFORM)64.zip
+	cd dist/working && unzip ifcopenshell-python*
+	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/
+
+	# See bug #812
+	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/blenderbim/occ_utils.py
+	cd dist/working && mv occ_utils.py ../blenderbim/libs/site/packages/ifcopenshell/geom/occ_utils.py
+	rm -rf dist/working
+
+	# Provides dependencies that are part of IfcOpenShell
+	mkdir dist/working
+	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.7.0.zip
+	cd dist/working && unzip v0.7.0.zip
+	# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/*.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/express/rule_executor.py dist/blenderbim/libs/site/packages/ifcopenshell/express/
+	# Provides bcf functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
+	# Provides IFCClash functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
+	# Provides BIMTester functionality
+	cd dist/working && $(PYTHON) -m venv env
+	cd dist/working && . env/bin/activate && $(PIP) install pybabel
+	cd dist/working && . env/bin/activate && $(PIP) install babel
+	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
+	# Provides IFCTester functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifctester/ifctester dist/blenderbim/libs/site/packages/
+	# Provides IFCFM functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcfm/ifcfm dist/blenderbim/libs/site/packages/
+	# Provides bSDD functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/bsdd/* dist/blenderbim/libs/site/packages/
+	# Provides IFCDiff functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
+	# Provides IFCCSV functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccsv/* dist/blenderbim/libs/site/packages/
+	# Provides IFCPatch functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/
+	# Provides IFC4D functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
+	# Provides IFC5D functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
+	# Provides IFCCityJSON functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
+	# Provides IfcGit functionality
+	cd dist/working && . env/bin/activate && $(PIP) install GitPython --target=./site-packages
+	cp -r dist/working/site-packages/smmap dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/gitdb dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/git dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Provides Mustache templating in construction documentation
+	# TODO: remove this dependency, it seems overkill and we seem to get by with str replaces
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/3f/e7/8750ba6c6101d6aa5ceeb20c013adf2c6f3554a12c71d75654b468404bfa/pystache-0.6.0.tar.gz
+	cd dist/working && tar -xzvf pystache*
+	cd dist/working/pystache-0.6.0/ && $(PYTHON) setup.py build && cp -r build/lib/pystache ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides SVG export in construction documentation
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download svgwrite --dest=./wheels
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/79/e8/7eb2ba188eda14a4b47e33b51f3b4978985f4116655c699bcd18c79279b5/svgwrite-1.3.1.zip
+	cd dist/working && unzip svgwrite*
+	cp -r dist/working/svgwrite-1.3.1/svgwrite dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides fuzzy date parsing for construction sequencing
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-dateutil --dest=./wheels
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0/python-dateutil-2.8.1.tar.gz
+	cd dist/working && tar -xzvf python-dateutil*
+	cp -r dist/working/python-dateutil-2.8.1/dateutil dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides duration parsing for construction sequencing
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download isodate --dest=./wheels
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/b1/80/fb8c13a4cd38eb5021dc3741a9e588e4d1de88d895c1910c6fc8a08b7a70/isodate-0.6.0.tar.gz
+	cd dist/working && tar -xzvf isodate*
+	cp -r dist/working/isodate-0.6.0/src/isodate dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides networkx graph analysis for project dependency calculations
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download networkx --dest=./wheels
-	# Required by IFCDiff
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download deepdiff --dest=./wheels
-	# Required by IFCCSV and ifcopenshell.util.selector
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lark --dest=./wheels
-	# Required by IFC4D
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download PyP6Xer --dest=./wheels
-	# Required by web module
-	# Is not platform specific but has platform specific dependencies.
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-socketio[asyncio_client] $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download aiohttp $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# Required by light module
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytz --dest=./wheels
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tzfpy $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-	# pyradiance is using different platform versions than defaults in our makefile.
-ifeq ($(PLATFORM), linux)
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform manylinux_2_35_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-else ifeq ($(PLATFORM), macos)
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform macosx_10_13_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-else
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-endif
-	# tomllib replacement for < Python 3.11, used to parse blender_manifest
-ifeq ($(PYVERSION), py310)
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tomli --dest=./wheels
-endif
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/b0/21/adfbf6168631e28577e4af9eb9f26d75fe72b2bb1d33762a5f2c425e6c2a/networkx-2.5.1.tar.gz
+	cd dist/working && tar -xzvf networkx*
+	cp -r dist/working/networkx-2.5.1/networkx dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by networkx
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/4f/51/15a4f6b8154d292e130e5e566c730d8ec6c9802563d58760666f1818ba58/decorator-5.0.9.tar.gz
+	cd dist/working && tar -xzvf decorator*
+	cp -r dist/working/decorator-5.0.9/src/decorator.py dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Provides audio playback for costing
+	mkdir -p dist/working
+	git clone https://github.com/Andrej730/aud.git --branch master-reduced-size --depth 1 dist/working/aud
+	cd dist/working/aud && git checkout 529af208fbcb707c387bfb681d2605c0b6112de7
+	cp -r dist/working/aud/aud dist/blenderbim/libs/site/packages/
+	rm -rf dist/working

 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
-	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
-	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
+	mkdir dist/working
+	cd dist/working && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
+	cd dist/working && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
+	cp dist/working/jsgantt* dist/blenderbim/bim/data/gantt/
+	rm -rf dist/working
+
+	# Required by IFCDiff
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/0f/ca/caead2949fbb824c7142e3774fa841aa853bb4d4331b440da8c8514dfc6f/deepdiff-5.8.1.tar.gz
+	cd dist/working && tar -xzvf deepdiff*
+	cp -r dist/working/deepdiff-5.8.1/deepdiff dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by deepdiff
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/00/55/ce2cbc6d64034b30cad81a29ba61bdba456f190f5e83c09831304bf68d6b/jsonpickle-1.2.tar.gz
+	cd dist/working && tar -xzvf jsonpickle*
+	cp -r dist/working/jsonpickle-1.2/jsonpickle dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by deepdiff
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/a3/b7/d4d69641cbe707a45c23b190f2d717466ba5accc4c70b5f7a8a450387895/ordered-set-3.1.1.tar.gz
+	cd dist/working && tar -xzvf ordered-set*
+	cp -r dist/working/ordered-set-3.1.1/ordered_set.py dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by lark
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/00/32/8076fa13e832bb4dcff379f18f228e5a53412be0631808b9ca2610c0f566/pyparsing-2.4.5.tar.gz
+	cd dist/working && tar -xzvf pyparsing*
+	cp -r dist/working/pyparsing-2.4.5/pyparsing.py dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by bcf
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/5b/ef/f97c3e1a7efa00e989a793fe15297214fc95ad7d9e3810586bd08ce9f0f3/xmlschema-2.0.2.tar.gz
+	cd dist/working && tar -xzvf xmlschema*
+	cp -r dist/working/xmlschema-2.0.2/xmlschema dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by bcf
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/ad/c7/17c9d16320d8e2cfdb27d2fd298b5e8f7a3f211025b0c1bc7a39a85bd690/xsdata-22.11.tar.gz
+	cd dist/working && tar -xzvf xsdata*
+	cp -r dist/working/xsdata-22.11/xsdata dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by bcf
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/11/bc/5afb61dd5d863e5cf77cd952445c50c17e65953405986f19e97e4389692a/elementpath-3.0.2.tar.gz
+	cd dist/working && tar -xzvf elementpath*
+	cp -r dist/working/elementpath-3.0.2/elementpath dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by bcf
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e/six-1.14.0.tar.gz
+	cd dist/working && tar -xzvf six*
+	cp -r dist/working/six-1.14.0/six.py dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFCCSV and ifcopenshell.util.selector
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/18/4d/8d522136c37d9e1ea74062b41b8d5e1318ebf45063ae46ce72ed60af223b/lark-parser-0.8.5.tar.gz
+	cd dist/working && tar -xzvf lark-parser*
+	cp -r dist/working/lark-parser-0.8.5/lark dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFC4D
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/b0/bb/9c4dddd3ca173cb56241cfb2eddfae24690dc676d357ac4cab17d0a36d9d/PyP6Xer-1.13.0.tar.gz
+	cd dist/working && tar -xzvf PyP6Xer*
+	cp -r dist/working/PyP6Xer-1.13.0/xerparser dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by QTOCalculator
+	mkdir dist/working
+	cd dist/working && wget $(SHAPELY_URL)
+	cd dist/working && cp *.whl shapely.zip && unzip shapely.zip
+	cp -r dist/working/shapely dist/blenderbim/libs/site/packages/
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
+endif
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
+endif
+	rm -rf dist/working
+
+	# Required by the BIM tool thumbnail generator
+	mkdir dist/working
+	cd dist/working && wget $(PILLOW_URL)
+	cd dist/working && cp *.whl pillow.zip && unzip pillow.zip
+	cp -r dist/working/PIL dist/blenderbim/libs/site/packages/
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/Pillow.libs dist/blenderbim/libs/site/packages/
+endif
+	rm -rf dist/working
+
+	# Required by xerparser and IFC4D
+	# TODO: remove this dependency. It's only used to show a progress bar.
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/9f/7b/76c4e5ef1a1b528fcaada4133f972e77d33c252831676cf414119ca6093d/tqdm-4.50.0.tar.gz
+	cd dist/working && tar -xzvf tqdm*
+	cp -r dist/working/tqdm-4.50.0/tqdm dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	mkdir dist/working
+	cd dist/working && $(PYTHON) -m venv env
+	cd dist/working && mkdir site-packages
+	# Required by IfcCSV
+	cd dist/working && . env/bin/activate && $(PIP) install pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --target=./site-packages
+	# Pandas ships with very heavy tests
+	cd dist/working/site-packages/pandas && rm -rf tests
+	cd dist/working && . env/bin/activate && $(PIP) install openpyxl --target=./site-packages
+	cd dist/working && . env/bin/activate && $(PIP) install odfpy --target=./site-packages
+	# Required by IFCCityJSON
+	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
+	# Provides express rule validation for ifcopenshell.validate
+	cd dist/working && . env/bin/activate && $(PIP) install pytest --target=./site-packages
+	# Provides Brickschema functionality
+	cd dist/working && . env/bin/activate && $(PIP) install brickschema[persistence] --target=./site-packages
+	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by BIMTester
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/c8/4b/d0a8c23b6c8985e5544ea96d27105a273ea22051317f850c2cdbf2029fe4/behave-1.2.6.tar.gz
+	cd dist/working && tar -xzvf behave*
+	cd dist/working/behave-1.2.6/ && cp -r behave ../../blenderbim/libs/site/packages/
+	# See bug #1294
+	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/model_core.patch
+	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/runner_util.patch
+	cd dist/working/ && $(PATCH) ../blenderbim/libs/site/packages/behave/model_core.py < model_core.patch
+	cd dist/working/ && $(PATCH) ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch
+	# See bug #2159
+	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/junit.patch
+	cd dist/working/ && $(PATCH) ../blenderbim/libs/site/packages/behave/reporter/junit.py < junit.patch
+	rm -rf dist/working
+
+	# Required by ids - uh, not any more, but I'm trying it out in the drawing module
+ifeq ($(PLATFORM), macosm1)
+	# No wheels available for MacOS M1, but turns out this Anaconda build works
+	mkdir dist/working
+	cd dist/working && wget $(LXML_URL)
+	cd dist/working && tar -xf lxml*
+	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/lxml dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+else
+	# Wheels are preferred for other OSes. A first attempt at using Anaconda
+	# builds for everything shows it breaks on windows. See #2422.
+	mkdir dist/working
+	cd dist/working && wget $(LXML_URL)
+	cd dist/working && cp *.whl lxml.zip && unzip lxml.zip
+	cp -r dist/working/lxml dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+endif
+
+	# Required by behave
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/f4/65/220bb4075fddb09d5b3ea2c1c1fa66c1c72be9361ec187aab50fa161e576/parse-1.15.0.tar.gz
+	cd dist/working && tar -xzvf parse*
+	cd dist/working/parse-1.15.0/ && cp parse.py ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by behave
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/2e/79/81bebd1b0446d46733db99d74543b4bb80646ef4c988584bae0862e706bc/parse_type-0.5.2.tar.gz
+	cd dist/working && tar -xzvf parse_type*
+	cd dist/working/parse_type-0.5.2/ && cp -r parse_type ../../blenderbim/libs/site/packages/
+	rm -rf dist/working

 	# Provides IFCJSON functionality
-	# TODO: replace with main repo if https://github.com/IFCJSON-Team/IFC2JSON_python/pull/3 is merged.
-	cd build && wget -O ifc2json.zip https://github.com/Moult/IFC2JSON_python/archive/refs/heads/feature-ios-v0.8.0.zip
-	cd build && unzip ifc2json.zip && rm ifc2json.zip
-	# IFCJSON doesn't have pyproject.toml, so we use python command.
-	cd build && . env/$(VENV_ACTIVATE) && cd IFC2JSON_python-*/file_converters && \
-		$(PYTHON) -c "from setuptools import setup; \
-		setup( \
-			name='ifcjson', \
-			version='0.0.1', \
-			author='Jan Brouwer', \
-			author_email='jan@brewsky.nl', \
-			packages=['ifcjson'], \
-		)" bdist_wheel
-	cp -r build/IFC2JSON_python-*/file_converters/dist/*.whl build/wheels/
+	mkdir dist/working
+	cd dist/working && wget https://github.com/IFCJSON-Team/IFC2JSON_python/archive/master.zip
+	cd dist/working && unzip master.zip
+	cp -r dist/working/IFC2JSON_python-master/file_converters/ifcjson dist/blenderbim/libs/site/packages/
+	rm -rf dist/working

-	# Brickschema requires pkg_resources which is provided by Blender.
 	# Provides Brickschema functionality
+	mkdir dist/working
 	# For now lets bundle the latest nightly schema
-	cd build/blenderbim/bim/schema && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd dist/working && cp Brick.ttl ../blenderbim/bim/schema/Brick.ttl
+	rm -rf dist/working
+
+	# Required by brickschema
+	# This is a bit of a dodgy one, it should be provided by setuptools which Blender doesn't ship.
+	mkdir dist/working
+	cd dist/working && wget https://blenderbim.org/builds/pkg_resources.tar.gz
+	cd dist/working && tar -xzvf pkg_resources*
+	cd dist/working/ && cp -r pkg_resources ../blenderbim/libs/site/packages/
+	rm -rf dist/working

 	# Required for hipped roof generation
-	cd build && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
-	cd build && unzip master.zip && rm master.zip
-	cd build && . env/$(VENV_ACTIVATE) && cd bpypolyskel-master && \
-		$(PYTHON) -c "from setuptools import setup; \
-		setup( \
-			name='bpypolyskel', \
-			version='0.0.0', \
-			packages=['bpypolyskel'], \
-		)" bdist_wheel
-	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/
+	mkdir dist/working
+	cd dist/working && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
+	cd dist/working && unzip master.zip
+	cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/
+	rm -rf dist/working

 	# Required for Desktop icon and file association
-	cp -r blenderbim/libs/desktop build/blenderbim/libs/
+	cp -r blenderbim/libs/desktop dist/blenderbim/libs/

 	# Generate translations module for BBIM build
-	git clone https://github.com/IfcOpenShell/blenderbim-translations.git build/working
-	$(PYTHON) scripts/bbim_translations.py -i "build/working" -o "build/blenderbim"
-	rm -rf build/working
+	git clone https://github.com/IfcOpenShell/blenderbim-translations.git dist/working
+	$(PYTHON) scripts/bbim_translations.py -i "dist/working" -o "dist/blenderbim"
+	rm -rf dist/working

 	# Remove dependencies also bundled with Blender
-	rm -rf build/wheels/numpy*
+	rm -rf dist/blenderbim/libs/site/packages/numpy
+	rm -rf dist/blenderbim/libs/site/packages/numpy.libs

-	cp pyproject.toml build/
-ifeq ($(IS_STABLE), TRUE)
-	$(SED) "s/0.0.0/$(VERSION)/" build/blenderbim/blender_manifest.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
-else
-	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/blenderbim/blender_manifest.toml
-	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/blenderbim/__init__.py
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
-endif
-
-	$(SED) "s/os-arch/$(BLENDER_PLATFORM)/" build/blenderbim/blender_manifest.toml
-
-	# Provides BlenderBIM Add-on functionality
-ifeq ($(IS_STABLE), TRUE)
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
-else
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)a$(VERSION_DATE)"/' build/pyproject.toml
-endif
-	cd build && . env/$(VENV_ACTIVATE) && $(PYTHON) -m build
-	cp build/dist/*.whl build/wheels/
-
-	# Safeguard for non-wheel dependencies slipping in.
-	wheels=$$(find build/wheels/* ! -name "*.whl"); \
-	if [ -n "$$wheels" ]; then \
-		echo "Found non-wheel dependencies:"; \
-		echo "$$wheels"; \
-		echo "Error: non-wheel dependencies are not supported by Blender!"; \
-		exit 1; \
-	fi
-	mv build/wheels/*.whl build/blenderbim/wheels/
-
-	# Ugly patch to accomodate MacOS universal builds not being recognized by Blender.
-	# Blender doesn't look into the wheel contents, it just checks the name.
-	# So this hack works without working out some way to repack those wheels.
-	# See: https://projects.blender.org/blender/blender/issues/125091
-
-ifeq ($(PLATFORM), macosm1)
-	# Has universal and x86_64 builds.
-	prev_whl_name=$$(find build/blenderbim/wheels/MarkupSafe-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# Has universal and x86_64 builds.
-	prev_whl_name=$$(find build/blenderbim/wheels/lxml-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# Has only universal build.
-	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-endif
-ifeq ($(PLATFORM), macos)
-	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# has universal and amr64 builds.
-	prev_whl_name=$$(find build/blenderbim/wheels/fonttools-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-endif
-
-	# Safeguard for unhandled universal files.
-	wheels=$$(find build/blenderbim/wheels/*universal2*.whl); \
-	if [ -n "$$wheels" ]; then \
-		echo "Found universal2 wheel files:"; \
-		echo "$$wheels"; \
-		echo "Error: universal2 wheel files are not supported by Blender!"; \
-		exit 1; \
-	fi
-
-ifneq ($(PLATFORM), linux)
-	# Safeguard: in case one of `pip download` will break,
-	# it will produce a linux wheel for non-linux build (our github action machine is using linux).
-	wheels=$$(find build/blenderbim/wheels/*manylinux_*.whl); \
-	if [ -n "$$wheels" ]; then \
-		echo "Found linux wheel files in non-linux build:"; \
-		echo "$$wheels"; \
-		echo "Error: linux wheels are incompatible with build $(PLATFORM)!"; \
-		exit 1; \
-	fi
-endif
-
-	$(PYTHON) scripts/get_wheels.py build/blenderbim/wheels build/blenderbim/blender_manifest.toml
-	rm -rf build/blenderbim/bim/
-	rm -rf build/blenderbim/core/
-	rm -rf build/blenderbim/tool/
-
-ifeq ($(IS_STABLE), TRUE)
-	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./blenderbim
-else
-	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-alpha$(VERSION_DATE)-$(BLENDER_PLATFORM).zip ./blenderbim
-endif
-
-	mv build/blenderbim*.zip dist/
-
-	rm -rf build
+	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
+	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" blender_manifest.toml
+	cd dist/blenderbim/bim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
+	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
+	rm -rf dist/blenderbim

 .PHONY: test
 test:
-	@echo "Running all tests..."
-	@ERROR=0; \
-	make test-core || ERROR=1; \
-	make test-tool || ERROR=1; \
-	make test-bim || ERROR=1; \
-	if [ $$ERROR -ne 0 ]; then \
-		echo "One or more tests failed"; \
-		exit 1; \
-	fi
+	make test-core
+	make test-tool
+	make test-bim

 .PHONY: test-core
 test-core:
@@ -18,376 +18,30 @@

 import os
 import sys
-
-# Ensure we don't try to import bpy or blenderbim.bim
-# to support running core tests.
-# We assume if bpy was never loaded in current python session
-# then we're not in Blender. It's still possible to use
-# bpy in core and core tests for annotations using TYPE_CHECKING.
-IN_BLENDER = sys.modules.get("bpy", None)
-if IN_BLENDER:
-    import bpy
-
-import re
-import platform
-import traceback
-import webbrowser
-import uuid
-import shutil
-from collections import deque
-from pathlib import Path
-from typing import Union, Any, Generator
-
-
-last_commit_hash = "8888888"
-
-
-def get_last_commit_hash() -> Union[str, None]:
-    # Using this weird way to write 8888888,
-    # so makefile won't accidentally replace it here
-    # we'll be able to distinguish commit hash from placeholder value.
-    if last_commit_hash == str(8_888888):
-        return None
-    return last_commit_hash[:7]
-
-
-# Accessed from blenderbim extension:
-bbim_semver: dict[str, Any] = {}
-
-# Accessed from blenderbim dependency:
-last_error = None
-last_actions: deque = deque(maxlen=10)
-FIRST_INSTALLED_BBIM_VERSION: Union[str, None] = None
-REINSTALLED_BBIM_VERSION: Union[str, None] = None
-
-
-def initialize_bbim_semver():
-    """Initialize `bbim_semver` dictionary.
-
-    Blender doesn't seem to store a full extension version (only major-minor-patch)
-    in `addon_utils.modules()->bl_info['version']`,
-    therefore we just parse it from .toml.
-    """
-    if sys.version_info >= (3, 11):
-        import tomllib as toml
-    else:
-        import tomli as toml
-
-    toml_path = Path(__file__).parent / "blender_manifest.toml"
-    with open(toml_path, "rb") as f:
-        manifest = toml.load(f)
-    semver_pattern = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
-    version_str = manifest["version"]
-    re_version = re.match(semver_pattern, version_str)
-    assert re_version
-    global bbim_semver
-    bbim_semver = re_version.groupdict()
-    bbim_semver["version"] = version_str
-
-
-def get_debug_info():
-    bbim_version = bbim_semver["version"]
-
-    return {
-        "os": platform.system(),
-        "os_version": platform.version(),
-        "python_version": platform.python_version(),
-        "architecture": platform.architecture(),
-        "machine": platform.machine(),
-        "processor": platform.processor(),
-        "blender_version": bpy.app.version_string,
-        "blenderbim_version": bbim_version,
-        "blenderbim_commit_hash": get_last_commit_hash(),
-        "last_actions": last_actions,
-        "last_error": last_error,
-    }
-
-
-def format_debug_info(info: dict):
-    last_actions = ""
-    for action in info["last_actions"]:
-        last_actions += f"\n# {action['type']}: {action['name']}"
-        if settings := action.get("settings"):
-            last_actions += f"\n>>> {settings}"
-    info["last_actions"] = last_actions
-    text = "\n".join(f"{k}: {v}" for k, v in info.items())
-    return text.strip()
-
-
-def get_binaries(path: Path) -> Generator[Path, None, None]:
-    yield from path.glob("**/*.pyd")
-    yield from path.glob("**/*.dll")
-    # pyradiance is using .so files on windows for some reason.
-    yield from path.glob("**/*.so")
-
-
-def safe_link_dlls() -> None:
-    # Blender 4.2+ has a problem on Windows for disabling/enabling/reinstalling extensions
-    # with loaded binary dependencies (on Windows you can't remove a binary if it's loaded by some program).
-    # To avoid this issue we temporary hard link dlls to our temp directory on unregister()
-    # (unregister is executed before Blender will try to uninstall dependencies and the issue will arise).
-    # Then, Blender won't have a problem unlinking unloaded dlls as they are still linked somewhere.
-    # On register() we clean up our temp directory with binaries.
-    #
-    # TODO: If user uninstalls BlenderBIM to never use it again, temporary directory won't be cleared.
-    #
-    # See: https://projects.blender.org/blender/blender/issues/125049
-    import bpy
-
-    ext_path = Path(bpy.utils.user_resource("EXTENSIONS"))
-    local_path = ext_path / ".local"
-
-    # We use random hash subfolder as user may try to enable/disable addon multiple times.
-    random_hash = uuid.uuid4().hex[:8]
-    temp_local = ext_path / ".local_temp" / random_hash
-    temp_local.mkdir(parents=True)
-
-    for filepath in get_binaries(local_path):
-        dest_path = temp_local / filepath.relative_to(local_path)
-        dest_path.parent.mkdir(exist_ok=True, parents=True)
-        os.link(filepath, dest_path)
-
-
-def clean_up_dlls_safe_links() -> None:
-    import bpy
-
-    ext_path = Path(bpy.utils.user_resource("EXTENSIONS"))
-    temp_path = ext_path / ".local_temp"
-    if not temp_path.exists():
-        return
-
-    for filepath in get_binaries(temp_path):
-        try:
-            os.unlink(filepath)
-        except PermissionError:
-            pass
-
-    def is_empty_directory(directory: Path) -> bool:
-        return not any(directory.iterdir())
-
-    def remove_empty_folders(folder: Path) -> None:
-        for subfolder in folder.iterdir():
-            if subfolder.is_dir():
-                remove_empty_folders(subfolder)
-
-        if is_empty_directory(folder):
-            folder.rmdir()
-
-    remove_empty_folders(temp_path)
-
-
-if IN_BLENDER:
-    initialize_bbim_semver()
-
-    def get_binary_info() -> dict[str, Any]:
-        info = {}
-        py_version = sys.version_info
-        site_path = (
-            Path(bpy.utils.user_resource("EXTENSIONS"))
-            / ".local"
-            / "lib"
-            / f"python{py_version.major}.{py_version.minor}"
-            / "site-packages"
-        )
-        lib = site_path / "ifcopenshell"
-        binary = next((i for i in lib.glob("_ifcopenshell_wrapper.*")), None)
-        if binary is None:
-            info["binary_error"] = "Couldn't find ifcopenshell wrapper binary."
-            return info
-
-        # Examples:
-        # _ifcopenshell_wrapper.cp311-win_amd64.pyd
-        # _ifcopenshell_wrapper.cpython-311-darwin.so
-        # _ifcopenshell_wrapper.cpython-311-x86_64-linux-gnu.so
-        binary = binary.name
-        info["binary_file_name"] = binary
-        pattern = re.compile(r"cp(\d+)|cpython-(\d+)")
-        match = pattern.search(binary)
-        if not match:
-            info["binary_error"] = f"Couldn't parse binary version from '{binary}'."
-            return info
-
-        version = match.group(1) or match.group(2)
-        version = f"{version[0]}.{version[1:]}"
-        info["binary_python_version"] = version
-        return info
-
-    try:
-        import git
-
-        # We can't just use __file__ as blenderbim/__init__.py is typically not symlinked
-        # as Blender have errors symlinking main addon package file.
-        path = Path(__file__).resolve().parent
-        repo = git.Repo(str(path), search_parent_directories=True)
-        last_commit_hash = repo.head.object.hexsha
-    except:
-        pass
-
-    try:
-        import ifcopenshell.api
-
-        def log_api(usecase_path, ifc_file, settings):
-            last_actions.append(
-                {
-                    "type": "ifcopenshell.api",
-                    "name": usecase_path,
-                    "settings": ifcopenshell.api.serialise_settings(settings),
-                }
-            )
-
-        ifcopenshell.api.add_pre_listener("*", "action_logger", log_api)
-
-        def register():
-            if platform.system() == "Windows":
-                clean_up_dlls_safe_links()
-
-            import blenderbim.bim
-
-            current_version = bbim_semver["version"]
-            if blenderbim.FIRST_INSTALLED_BBIM_VERSION is None:
-                blenderbim.FIRST_INSTALLED_BBIM_VERSION = current_version
-            elif not blenderbim.REINSTALLED_BBIM_VERSION and blenderbim.FIRST_INSTALLED_BBIM_VERSION != current_version:
-                blenderbim.REINSTALLED_BBIM_VERSION = current_version
-
-            blenderbim.bim.register()
-
-        def unregister():
-            if platform.system() == "Windows":
-                safe_link_dlls()
-
-            import blenderbim.bim
-
-            blenderbim.bim.unregister()
-
-    except:
-
-        def show_scene_properties() -> None:
-            # By default in Blender object properties are selected.
-            # Or user may have some other properties selected in their startup file.
-            # Select scene properties to ensure user will see our error handler.
-            for area in bpy.context.screen.areas:
-                if area.type != "PROPERTIES":
-                    continue
-                space = area.spaces.active
-                assert isinstance(space, bpy.types.SpaceProperties)
-                space.context = "SCENE"
-
-        # Use a timer as we're not allowed to make changes to data during register().
-        bpy.app.timers.register(show_scene_properties, first_interval=0.1)
-
-        last_error = traceback.format_exc()
-
-        print(last_error)
-        print(format_debug_info(get_debug_info()))
-        print("\nFATAL ERROR: Unable to load the BlenderBIM Add-on")
-
-        class BIM_PT_fatal_error(bpy.types.Panel):
-            bl_label = "BlenderBIM Fatal Error"
-            bl_idname = "SCENE_PT_error_message"
-            bl_space_type = "PROPERTIES"
-            bl_region_type = "WINDOW"
-            bl_context = "scene"
-
-            def draw(self, context):
-                info = get_debug_info()
-
-                layout = self.layout
-                layout.alert = True
-                layout.label(text="BlenderBIM could not load.", icon="ERROR")
-                if info["os"] == "Windows":
-                    layout.operator("wm.console_toggle", text="View the console for full logs.", icon="CONSOLE")
-                else:
-                    layout.label(text="View the console for full logs.", icon="CONSOLE")
-                box = layout.box()
-                py = ".".join(info["python_version"].split(".")[0:2])
-                b3d = ".".join(info["blender_version"].split(".")[0:2])
-                box.label(text="System Information:")
-                box.label(text=f"Blender {b3d} {info['os']} {info['machine']}", icon="BLENDER")
-                blenderbim_version = info["blenderbim_version"]
-                if commit_hash := info.get("blenderbim_commit_hash"):
-                    blenderbim_version += f"-{commit_hash}"
-                box.label(text=f"Python {py} BBIM {info['blenderbim_version']}", icon="SCRIPTPLUGINS")
-
-                binary_py = get_binary_info().get("binary_python_version")
-                if binary_py and py != binary_py:
-                    box.separator()
-                    # From wrong-platform-build issues we're guarded by Blender extension installation.
-                    # But Blender currently doesn't support separate builds for different Python version,
-                    # so those issues might still slip in.
-                    box.label(text="BlenderBIM installed for wrong Python version.")
-                    box.label(text=f"Expected: {py}. Got: {binary_py}.")
-                    # On reinstallation, dependencies versions doesn't change, so Blender will just ignore new dependencies.
-                    # So, we need to make user will disable an extension (just uninstallation won't remove dependencies).
-                    # Blender restart doesn't seem to be required in that case
-                    # as dependencies failed to load due to Python version mismatch.
-                    box.label(text="Try reinstalling with the correct Python version.")
-                    box.label(text="Before reinstallation make sure to")
-                    box.label(text="DISABLE BlenderBIM (uninstallation won't help).")
-                    box.label(text="You can download correct version below.")
-
-                layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
-                op = layout.operator("bim.open_uri", text="How Can I Fix This?")
-                op.uri = "https://docs.blenderbim.org/users/troubleshooting.html#installation-issues"
-
-                layout.label(text="Try Reinstalling:", icon="IMPORT")
-                op = layout.operator("bim.open_uri", text="Re-download Add-on")
-                bbim_version = info["blenderbim_version"]
-                py_tag = py.replace(".", "")
-                if "Linux" in info["os"]:
-                    os = "linux-x64"
-                elif "Darwin" in info["os"]:
-                    if "arm64" in info["machine"]:
-                        os = "macos-arm64"
-                    else:
-                        os = "macos-x64"
-                else:
-                    os = "windows-x64"
-                op.uri = f"https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-{bbim_version}/blenderbim_py{py_tag}-{bbim_version}-{os}.zip"
-
-        class OpenUri(bpy.types.Operator):
-            bl_idname = "bim.open_uri"
-            bl_label = "Open URI"
-            uri: bpy.props.StringProperty()
-
-            def execute(self, context):
-                webbrowser.open(self.uri)
-                return {"FINISHED"}
-
-        class CopyDebugInformation(bpy.types.Operator):
-            bl_idname = "bim.copy_debug_information"
-            bl_label = "Copy Debug Information"
-            bl_description = "Copies debugging information to your clipboard for use in bugreports"
-
-            def execute(self, context):
-                info = get_debug_info()
-                info.update(get_binary_info())
-                info = format_debug_info(info)
-                context.window_manager.clipboard = info
-                return {"FINISHED"}
-
-        class HiddenPanel:
-            @classmethod
-            def false_poll(cls, context):
-                return False
-
-        def register():
-            # Only show our error panel and nothing else in the scene tab
-            for item_name in dir(bpy.types):
-                item = getattr(bpy.types, item_name)
-                if not hasattr(item, "bl_rna") or not isinstance(item.bl_rna, bpy.types.Panel):
-                    continue
-                if getattr(item, "bl_context", None) != "scene":
-                    continue
-
-                # Reregister scene panel with a new poll to hide it
-                item.poll = HiddenPanel.false_poll
-                bpy.utils.unregister_class(item)
-                bpy.utils.register_class(item)
-            bpy.utils.register_class(BIM_PT_fatal_error)
-            bpy.utils.register_class(CopyDebugInformation)
-            bpy.utils.register_class(OpenUri)
-
-        def unregister():
-            bpy.utils.unregister_class(OpenUri)
-            bpy.utils.unregister_class(CopyDebugInformation)
-            bpy.utils.unregister_class(BIM_PT_fatal_error)
+import site
+
+bl_info = {
+    "name": "BlenderBIM",
+    "description": "Transforms Blender into a native Building Information Model authoring platform using IFC.",
+    "author": "IfcOpenShell Contributors",
+    "blender": (3, 1, 0),
+    "version": (0, 0, 999999),
+    "location": "File Menu, Scene Properties Tab. See documentation for more.",
+    "doc_url": "https://blenderbim.org/docs",
+    "tracker_url": "https://github.com/IfcOpenShell/IfcOpenShell/issues",
+    "category": "System",
+}
+
+if sys.modules.get("bpy", None):
+    # Process *.pth in /libs/site/packages to setup globally importable modules
+    # This is 3 levels deep as required by the static RPATH of ../../ from dependencies taken from Anaconda
+    # site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
+
+    import blenderbim.bim
+
+    def register():
+        blenderbim.bim.register()
+
+    def unregister():
+        blenderbim.bim.unregister()
@@ -17,12 +17,12 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import os
+from pathlib import Path
 import bpy
 import bpy.utils.previews
+import blenderbim
 import importlib
-from pathlib import Path
 from . import handler, ui, prop, operator, helper
-from typing import Callable, Union

 try:
    from blenderbim.translations import translations_dict
@@ -74,6 +74,7 @@ modules = {
    "clash": None,
    "csv": None,
    "tester": None,
+    "bimtester": None,
    "diff": None,
    "patch": None,
    "gis": None,
@@ -82,8 +83,6 @@ modules = {
    "debug": None,
    "ifcgit": None,
    "covering": None,
-    "web": None,
-    "light": None,
    # Uncomment this line to enable loading of the demo module. Happy hacking!
    # The name "demo" must correlate to a folder name in `bim/module/`.
    # "demo": None,
@@ -97,14 +96,10 @@ for name in modules.keys():
 classes = [
    operator.AddIfcFile,
    operator.BIM_OT_add_section_plane,
-    operator.BIM_OT_delete_object,
+    operator.BIM_OT_open_webbrowser,
    operator.BIM_OT_remove_section_plane,
-    operator.BIM_OT_select_object,
    operator.BIM_OT_show_description,
-    operator.BIM_OT_multiple_file_selector,
    operator.ClippingPlaneCutWithCappings,
-    operator.CloseBlendWarning,
-    operator.CloseError,
    operator.EditBlenderCollection,
    operator.FileAssociate,
    operator.FileUnassociate,
@@ -122,7 +117,6 @@ classes = [
    prop.StrProperty,
    operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
    prop.ObjProperty,
-    prop.MultipleFileSelect,
    prop.Attribute,
    prop.BIMAreaProperties,
    prop.BIMTabProperties,
@@ -132,19 +126,17 @@ classes = [
    prop.GlobalId,
    prop.BIMObjectProperties,
    prop.BIMCollectionProperties,
+    prop.BIMMaterialProperties,
    prop.BIMMeshProperties,
    prop.BIMFacet,
    prop.BIMFilterGroup,
-    ui.BIM_UL_clipping_plane,
    ui.BIM_UL_generic,
    ui.BIM_UL_topics,
    ui.BIM_ADDON_preferences,
    # Tabs panel
    ui.BIM_PT_tabs,
    # Project overview
-    ui.BIM_PT_tab_new_project_wizard,
    ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_spatial_decomposition,
    ui.BIM_PT_tab_project_setup,
    ui.BIM_PT_tab_geometry,
    ui.BIM_PT_tab_stakeholders,
@@ -157,10 +149,9 @@ classes = [
    ui.BIM_PT_tab_representations,
    ui.BIM_PT_tab_geometric_relationships,
    ui.BIM_PT_tab_parametric_geometry,
-    ui.BIM_PT_tab_object_materials,
+    ui.BIM_PT_tab_profiles,
    ui.BIM_PT_tab_materials,
    ui.BIM_PT_tab_styles,
-    ui.BIM_PT_tab_profiles,
    # Drawings and documents
    ui.BIM_PT_tab_sheets,
    ui.BIM_PT_tab_drawings,
@@ -169,13 +160,10 @@ classes = [
    # Services and systems
    ui.BIM_PT_tab_services,
    ui.BIM_PT_tab_zones,
-    ui.BIM_PT_tab_solar_analysis,
-    ui.BIM_PT_tab_lighting,
    # Structural analysis
    ui.BIM_PT_tab_structural,
    # Construction scheduling
    ui.BIM_PT_tab_status,
-    ui.BIM_PT_tab_qto,
    ui.BIM_PT_tab_resources,
    ui.BIM_PT_tab_cost,
    ui.BIM_PT_tab_sequence,
@@ -198,7 +186,8 @@ for mod in modules.values():
 addon_keymaps = []
 icons = None
 is_registering = False
-original_scene_panels_polls: dict[bpy.types.Panel, Union[Callable, None]] = dict()
+last_commit_hash = "8888888"
+overridden_scene_panels = dict()


 def on_register(scene):
@@ -226,6 +215,8 @@ def register():
    bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
    bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
    bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
+    bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
+    bpy.types.Material.BIMMaterialProperties = bpy.props.PointerProperty(type=prop.BIMMaterialProperties)
    bpy.types.Mesh.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
@@ -254,6 +245,17 @@ def register():
            icon_preview.load(icon_name, icon_path, "IMAGE")

    icons = icon_preview
+
+    global last_commit_hash
+    try:
+        import git
+
+        path = Path(__file__).resolve().parent
+        repo = git.Repo(str(path), search_parent_directories=True)
+        last_commit_hash = repo.head.object.hexsha
+    except:
+        pass
+
    bpy.app.translations.register("blenderbim", translations_dict)


@@ -273,6 +275,8 @@ def unregister():
    del bpy.types.Scene.BIMProperties
    del bpy.types.Collection.BIMCollectionProperties
    del bpy.types.Object.BIMObjectProperties
+    del bpy.types.Material.BIMObjectProperties
+    del bpy.types.Material.BIMMaterialProperties
    del bpy.types.Mesh.BIMMeshProperties
    del bpy.types.Curve.BIMMeshProperties
    del bpy.types.Camera.BIMMeshProperties
@@ -291,10 +295,10 @@ def unregister():
            km.keymap_items.remove(kmi)
    addon_keymaps.clear()

-    import blenderbim.tool as tool
-
-    # use tuple() as method will be removing keys from dict
-    for panel in tuple(original_scene_panels_polls.keys()):
-        tool.Blender.remove_scene_panel_override(panel)
+    for panel in tuple(overridden_scene_panels.keys()):
+        original_panel, override_panel = overridden_scene_panels[panel]
+        bpy.utils.unregister_class(override_panel)
+        bpy.utils.register_class(original_panel)
+        del overridden_scene_panels[panel]

    bpy.app.translations.unregister("blenderbim")
@@ -1,45 +0,0 @@
-/*
- * BlenderBIM Add-on - OpenBIM Blender Add-on
- * Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
- *
- * This file is part of BlenderBIM Add-on.
- *
- * BlenderBIM Add-on is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * BlenderBIM Add-on is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * You may copy this `schedule.css` template alongside your input schedule
- * document with the same filename. For example if you have a schedule called
- * `door_types.ods`, you can create a `door_types.css` in the same folder to
- * style that schedule.
- */
-
-/**
- * If you specify a font size in CSS, such as text { font-size: 5; }, all fonts
- * will be overriden to match that size.
- *
- * If your CSS, ODS, XLSX does not specify a font size, the variables below
- * will specify the default font size.
- *
- * If your ODS, XLSX does specify a font size, they will scale linearly based
- * on the variables below.
- */
-
-:root {
-    --font-size-pt: 12;
-    --font-size-px: 4.13;
-    --font-width: 0.45;
-}
-
-text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT', 'DejaVu Sans Condensed', 'Liberation Sans', 'Arial Narrow', 'Arial'; }
@@ -67,11 +67,11 @@ DATA;
 #60=IFCMATERIALPROFILESET($,$,(#62),$);
 #61=IFCRELASSOCIATESMATERIAL('09FXUZCnrFEffxBrtg16gx',$,$,$,(#59),#60);
 #62=IFCMATERIALPROFILE($,$,#20,#58,$,$);
-#63=IFCSLABTYPE('1Akbal7tP5DAPW0ti$Qp30',$,'FLR200',$,$,$,$,$,$,.NOTDEFINED.);
+#63=IFCSLABTYPE('1Akbal7tP5DAPW0ti$Qp30',$,'FLR150',$,$,$,$,$,$,.NOTDEFINED.);
 #64=IFCMATERIALLAYERSET((#66),$,$);
 #65=IFCRELASSOCIATESMATERIAL('0jzkXlkBL4HhmQ_FTWW6Cj',$,$,$,(#63),#64);
 #66=IFCMATERIALLAYER(#20,0.2,$,$,$,$,$);
-#67=IFCSLABTYPE('0$gpYNi3T08BrxaR67CxgI',$,'FLR300',$,$,$,$,$,$,.NOTDEFINED.);
+#67=IFCSLABTYPE('0$gpYNi3T08BrxaR67CxgI',$,'FLR250',$,$,$,$,$,$,.NOTDEFINED.);
 #68=IFCMATERIALLAYERSET((#70),$,$);
 #69=IFCRELASSOCIATESMATERIAL('3a6kjEM29DleYTlSkA8_DK',$,$,$,(#67),#68);
 #70=IFCMATERIALLAYER(#20,0.3,$,$,$,$,$);
@@ -5,7 +5,7 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation/DRAWING',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21,#22,#23));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21,#22,#23));
 #2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','The scale of this drawing represented as a numerator and denominator, such as 1/100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','The scale of this drawing in human readable format, such as 1:100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Krijnen	e4cebd4e5d	checkout v0.7.0 -- src/ifcgeom_schema_agnostic/IfcGeomRepresentation.cpp	2024-03-26 15:13:15 +01:00
Dion Moult	394807f1df	Reinclude missing max_protrusions_	2024-03-26 23:04:32 +11:00
Thomas Krijnen	8eeb429ec1	Merge remote-tracking branch 'origin/v0.7.0' into feature-clash2	2024-03-26 11:21:45 +01:00
Thomas Krijnen	1c9189f5f8	Fix is_manifold(), sorry :(	2024-03-26 11:00:16 +01:00
Thomas Krijnen	796760a064	Integrate @Moult's add_element(TriangulationElement*)	2024-03-06 21:44:43 +01:00
Dion Moult	f65da3d016	Clash detection features	2024-02-29 17:17:59 +11:00