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

as discussed: https://community.osarch.org/discussion/2196/quick-way-to-switch-between-drawing-views#latest

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,23 +0,0 @@
-name: Bug Report
-description: Crashes, error messages, and broken features
-type: bug
-body:
-- type: textarea
-  attributes:
-    label: Bug Description
-    placeholder: |
-      Describe what problem occurred and what you expected to happen instead.
-  
-      1. To reproduce this, open file '...'
-      2. Click on '....'
-      3. See error
-- type: textarea
-  attributes:
-    label: Attachments
-    description: "Private files can be uploaded to https://ifcopenshell.org/upload.html - only viewed by core developers and will be deleted afterwards. Please submit your report first then upload private files afterwards."
-    placeholder: "If applicable, add screenshots to help explain your problem. Please also drag-drop any files necessary to show the error (rename the file extension from .ifc to .txt to upload)."
-- type: textarea
-  attributes:
-    label: Debug and Error Output
-    description: "If this is in Bonsai, paste the output from the Copy Debug Information option in Bonsai. It can be found under Quality and Coordination -> Quality Control -> Debug. If this is a general software issue, if relevant include details about IfcOpenShell version, operating system, Python version, etc."
-    render: yes

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Community Forums
-    url: https://community.osarch.org/
-    about: Have a question? Want to discuss an idea? Try the OSArch forums instead.
-  - name: Live Chat
-    url: https://osarch.org/chat
-    about: Have a really confusing issue? Want real-time support?

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,8 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or improvement
-type: Feature
-body:
-- type: textarea
-  attributes:
-    label: Feature Description
-    placeholder: "Describe a feature you'd like us to add, or a change to the user interface, design, or workflow for usability. If it's not obvious, explain why this feature is awesome. Note that feature requests must be specific and measurable."

.github/dependabot.yml

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

.github/workflows/build_all.yml

@@ -1,21 +0,0 @@
-name: Dispatch Build IfcOpenShell
-
-on:
-  workflow_dispatch:
-
-jobs:
-  trigger-workflows:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        workflow:
-          - 'Build IfcOpenShell Linux'
-          - 'Build IfcOpenShell Linux ARM'
-          - 'Build IfcOpenShell OSX'
-          - 'Build IfcOpenShell WASM / Pyodide'
-          - 'Build IfcOpenShell Windows'
-    steps:
-      - name: Trigger binary build workflows
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: ${{ matrix.workflow }}

.github/workflows/build_osx.yml

@@ -1,150 +0,0 @@
-name: Build IfcOpenShell OSX
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos
-            runner: macos-14
-            arch: x64
-            oldarch: 
-          - os: macos
-            runner: macos-14
-            arch: arm64
-            oldarch: m1
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: ${{ matrix.os }}-${{ matrix.arch }}
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Install Dependencies
-        run: |
-          brew update
-          # preinstalled: xz, cmake
-          brew install git bison autoconf automake libffi findutils
-          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-
-      - name: Install aws cli
-        run: |
-          python -m pip install awscli
-
-      - name: Unpack Dependencies
-        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
-          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: mac-${{ matrix.arch }}
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          if [ "${{ matrix.os }}" == "macos" ]; then
-            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
-          fi
-          if [ "${{ matrix.arch }}" == "x64" ]; then
-            arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-            MAC_INTEL=-mac-cross-compile-intel
-            # We don't use gmpcxx, but it comes preinstalled on macos runner as arm64 bottle
-            # and CGAL detects it and breaks cross compilation.
-            brew uninstall --ignore-dependencies gmp
-            # Otherwise Python will fallback to use arm64 `pkg-config`,
-            # will pick up arm64 libraries ('zstd' in particular),
-            # and break the build.
-            /usr/local/bin/brew install pkg-config
-            # Required by Python.
-            /usr/local/bin/brew install gettext openssl
-          fi
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
-            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
-            | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: build-logs-osx-${{ matrix.arch }}
-          path: |
-            build.log
-            build/*/*/*/logs/*.log
-            build/*/*/*/build/ifcopenshell/**/CMakeCache.txt
-          retention-days: 30
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
-            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
-          done
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/10.15/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_pyodide.yml

@@ -1,88 +0,0 @@
-name: Build IfcOpenShell WASM / Pyodide
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-          path: IfcOpenShell
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ifcopenshell_build
-          ref: wasm
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}
-
-      - name: Build
-        run: |
-          ./IfcOpenShell/pyodide/build_pyodide.sh
-          FILE=`echo dist/ifcopenshell-*.whl`
-          NEW_FILE=`echo $FILE | sed "s/-/+${GITHUB_SHA:0:7}-/2"`
-          mv $FILE $NEW_FILE
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: build-logs-pyodide
-          path: |
-            ifcopenshell_build/*/*/logs/*.log
-          retention-days: 30
-
-      - name: Run wheel tests
-        run: |
-          cp -r IfcOpenShell/pyodide/test test
-          # venv set up in build_pyodide.sh.
-          source .venv/bin/activate
-          uv pip install pytest-pyodide
-          PYODIDE_ROOT_DIST=`pyodide config get pyodide_root`/dist
-          # `pytest-pyodide` requires pyodide in 'pyodide' directory in cwd, when running `pytest`.
-          cp -r $PYODIDE_ROOT_DIST test/pyodide
-          cp dist/ifcopenshell-*.whl test/pyodide
-          cd test
-          pytest --capture=no
-
-      - name: Pack Dependencies
-        run: |
-          cd ifcopenshell_build
-          python ../IfcOpenShell/pyodide/cache_dependencies.py pack
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd ifcopenshell_build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add */*/install/cache-*.tar.gz
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || echo "Push failed"
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp dist s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.whl"

.github/workflows/build_rocky.yml

@@ -1,129 +0,0 @@
-name: Build IfcOpenShell Linux
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04
-    container: rockylinux:8
-
-    steps:
-      - name: Install Dependencies
-        run: |
-          yum update -y
-          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
-                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
-                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
-                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz byacc
-          python3 -m pip install typing_extensions
-          git config --global --add safe.directory '*'
-
-      - name: Install aws cli
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          ./aws/install
-          rm -rf awscliv2.zip aws
-          aws --version
-
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: rockylinux8-x64
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
-          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
-
-      - name: ccache
-        # TODO: Use tag after 1.2.20 releases.
-        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: build-logs-rocky
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
-            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
-          done
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_rocky_arm.yml

@@ -1,129 +0,0 @@
-name: Build IfcOpenShell Linux ARM
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: ubuntu-22.04-arm
-    container: arm64v8/rockylinux:8
-
-    steps:
-      - name: Install Dependencies
-        run: |
-          yum update -y
-          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
-                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
-                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
-                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz byacc
-          python3 -m pip install typing_extensions
-          git config --global --add safe.directory '*'
-
-      - name: Install aws cli
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          ./aws/install
-          rm -rf awscliv2.zip aws
-          aws --version
-
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: ./build
-          ref: rockylinux8-arm64
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Unpack Dependencies
-        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
-          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
-
-      - name: ccache
-        # TODO: Use tag after 1.2.20 releases.
-        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
-        with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
-
-      - name: Run Build Script
-        shell: bash
-        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v5
-        with:
-          name: build-logs-rocky-arm64
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
-
-      - name: Pack Dependencies
-        run: |
-          cd build
-          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
-            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
-          done
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd build
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || true
-
-      - name: Package .zip archives
-        run: |
-          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/install/ifcopenshell
-          mkdir ~/output
-
-          ls -d python-* | while read py_version; do
-              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
-              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
-              py_version_major=python-${numbers}$postfix
-              pushd . > /dev/null
-              cd $py_version
-              if [ ! -d ifcopenshell ]; then
-                  mkdir ../ifcopenshell_
-                  mv * ../ifcopenshell_
-                  mv ../ifcopenshell_ ifcopenshell
-              fi
-              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
-              find ifcopenshell -name "*.pyc" -delete
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell/*
-              mv *.zip ~/output
-              popd > /dev/null
-          done
-
-          cd bin
-          rm *.zip || true
-          ls | while read exe; do
-              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip $exe
-          done
-          mv *.zip ~/output
-          cd ..
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload .zip archives to S3
-        run: |
-          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_win.yml

@@ -1,92 +0,0 @@
-name: Build IfcOpenShell Windows
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build_ifcopenshell:
-    runs-on: windows-2022
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x64']
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Checkout Build Repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/build-outputs
-          path: _deps-vs2022-x64-installed
-          ref: windows-${{ matrix.arch }}
-          lfs: true
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Install Dependencies
-        run: |
-          choco install -y sed 7zip.install awscli
-
-      - name: Unpack Dependencies
-        run: |
-          cd _deps-vs2022-x64-installed
-          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
-            7z x $_.FullName
-          }
-
-      - name: ccache
-        # TODO: Use tag after 1.2.20 releases.
-        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
-        with:
-          key: win-${{ matrix.arch }}
-          # Windows ccache needs ~1GB
-          # and with default 500MB some cache gets deleted, leading to misses.
-          max-size: 5000MB
-
-      - name: Run Build Script And Pack .zip Archives
-        shell: cmd
-        run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          cd win
-          python build-all-win.py
-
-      - name: Pack Dependencies
-        run: |
-          cd _deps-vs2022-x64-installed
-          Get-ChildItem -Path . -Directory | ForEach-Object {
-            $cacheFile = "cache-$($_.Name).zip"
-            echo $cacheFile
-            if (!(Test-Path $cacheFile)) {
-              7z a $cacheFile $_.FullName
-            }
-          }
-
-      - name: Commit and Push Changes to Build Repository
-        run: |
-          cd _deps-vs2022-x64-installed
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add *.zip
-          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push || echo "Push failed"
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload .zip Archives to S3
-        env:
-          AWS_DEBUG: 1
-          AWS_RETRY_MODE: standard
-          AWS_MAX_ATTEMPTS: 3
-        run: |
-          dir "$env:USERPROFILE\output"
-          foreach ($zip in Get-ChildItem -Path "$env:USERPROFILE\output" -Filter *.zip) {
-              aws s3 cp "$($zip.FullName)" s3://ifcopenshell-builds/ --debug
-              Start-Sleep -Seconds 5
-          }

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

@@ -19,10 +19,10 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
       - run: echo ${{ env.DATE }}
       - name: Get current date
@@ -34,7 +34,7 @@ jobs:
           cd src/bcf &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -1,68 +0,0 @@
-name: ci-black-formatting
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Action - checkout repository
-        uses: actions/checkout@v5
-
-      - name: Action - install python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.9"
-
-      - name: Action - install python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.11"
-
-      - name: Install dependencies
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          uv tool install ruff
-          uv tool install black
-          uv tool install poethepoet
-
-      # black doesn't catch all syntax errors, so we check them explicitly.
-      - name: Check syntax errors
-        id: syntax-errors
-        run: |
-          ERROR=0
-          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Black formatter
-        id: black
-        run: |
-          black --diff --check .
-        continue-on-error: true
-
-      - name: Ruff check
-        id: ruff
-        run: |
-          ERROR=0
-          poe ruff-main || ERROR=1
-          poe ruff-old || ERROR=1
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Final check
-        run: |
-          ERROR=0
-          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
-            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.black.outcome }}" != "success" ]; then
-            echo "::error::Black formatting check failed, see 'black' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
-            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
-          fi
-          exit $ERROR

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

@@ -0,0 +1,12 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable

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

@@ -1,4 +1,4 @@
-name: ci-bonsai-choco
+name: Publish-blenderbim-chocolatey package
 
 on:
   schedule:
@@ -9,12 +9,11 @@ on:
     #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
     #         *  * * * *
     - cron:  "30 0 * * *" # 30min past utc midnight
-  workflow_dispatch:
 
 env:
   major: 0
   minor: 0
-  name: bonsai
+  name: blenderbim
   choco_version: 1.1.0
   CHOCO_TOKEN:   ${{ secrets.CHOCO_TOKEN }}
 
@@ -34,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           fetch-tags: true
           fetch-depth: 0
@@ -42,6 +41,5 @@ jobs:
       - name: Check in release tags if we should do a choco release and perform the release if needed
         id: do_choco_release
         run: |
-          pip install pygithub
-          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/ &&
+          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
           python3 choco_release.py

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

@@ -0,0 +1,85 @@
+name: ci-blenderbim-daily
+
+on:
+  push:
+    paths:
+      - '.github/workflows/ci-blenderbim-daily.yml'
+      - 'src/blenderbim/**'
+      - 'src/ifcopenshell-python/ifcopenshell/**'
+      - 'src/bcf/bcf/**'
+      - 'src/ifcclash/ifcclash/**'
+      - 'src/ifccobie/**'
+      - 'src/ifcdiff/**'
+      - 'src/ifccsv/**'
+      - 'src/ifcpatch/ifcpatch/**'
+      - 'src/ifc4d/ifc4d/**'
+      - 'src/ifc5d/ifc5d/**'
+      - 'src/ifccityjson/**'
+    branches:
+      - v0.8.0
+  workflow_dispatch:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+
+  build:
+    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [py310, py311, py312]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
+          - {
+            name: "Linux Build",
+            short_name: linux,
+          }
+          - {
+            name: "MacOS Build",
+            short_name: macos,
+          }
+          - {
+            name: "MacOS ARM Build",
+            short_name: macosm1,
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+        with:
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+          python-version: '3.11'
+      - name: Get current version
+        id: version
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+      - name: Compile
+        run: |
+          cd src/blenderbim && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+      - name: Find zip file name
+        id: find_zip
+        run: |
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
+          echo "filepath=$filepath" >> $GITHUB_OUTPUT
+          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
+      - name: Upload zip file to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.find_zip.outputs.filepath }}
+          asset_name: ${{ steps.find_zip.outputs.filename }}
+          release_name: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
+          overwrite: true

.github/workflows/ci-blenderbim.yml

@@ -1,6 +1,6 @@
-name: ci-bonsai
+name: ci-blenderbim
 
-# Differences from ci-bonsai-daily.yml:
+# Differences from ci-blenderbim-daily.yml:
 # - make has IS_STABLE=TRUE
 # - action is never triggered and executed only manually
 # - doesn't add a current date to the release and tag
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py311, py312]
+        pyver: [py310, py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -32,19 +32,19 @@ 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@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
@@ -53,11 +53,12 @@ jobs:
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
-          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          cd src/blenderbim &&
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
       - name: Find zip file name
         id: find_zip
         run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
           echo "filepath=$filepath" >> $GITHUB_OUTPUT
           echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
       - name: Upload zip file to release
@@ -66,6 +67,6 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.find_zip.outputs.filepath }}
           asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}"
-          tag: "bonsai-${{steps.version.outputs.version}}"
+          release_name: "blenderbim-${{steps.version.outputs.version}}"
+          tag: "blenderbim-${{steps.version.outputs.version}}"
           overwrite: true

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

@@ -1,181 +0,0 @@
-name: ci-bonsai-daily
-
-on:
-  push:
-    paths:
-      - '.github/workflows/ci-bonsai-daily.yml'
-      - 'src/bonsai/**'
-      - 'src/ifcopenshell-python/ifcopenshell/**'
-      - 'src/bcf/bcf/**'
-      - 'src/ifcclash/ifcclash/**'
-      - 'src/ifccobie/**'
-      - 'src/ifcdiff/**'
-      - 'src/ifccsv/**'
-      - 'src/ifcpatch/ifcpatch/**'
-      - 'src/ifc4d/ifc4d/**'
-      - 'src/ifc5d/ifc5d/**'
-      - 'src/ifccityjson/**'
-    branches:
-      - v0.8.0
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py311, py312]
-        config:
-          - {
-            name: "Windows Build",
-            short_name: win,
-          }
-          - {
-            name: "Linux Build",
-            short_name: linux,
-          }
-          - {
-            name: "MacOS Build",
-            short_name: macos,
-          }
-          - {
-            name: "MacOS ARM Build",
-            short_name: macosm1,
-          }
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Get current date
-        id: date
-        # Include hours and minutes to release tag
-        # to avoid possibility of unstable repo's index.json
-        # pointing to the new file when index.json itself wasn't yet updated.
-        run: echo "date=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.find_zip.outputs.filepath }}
-          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
-          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
-          overwrite: true
-          body: "See README in https://github.com/IfcOpenShell/bonsai_unstable_repo/ on how to setup autoupdates for daily Bonsai builds."
-
-  update-extensions-repo-and-run-tests:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v5
-        with:
-          repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IFCOPENBOT_TOKEN }}
-          path: bonsai_unstable_repo
-
-      - name: Download Blender and run critical tests
-        run: |
-          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
-
-          # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
-          tar -xf blender.tar.xz
-
-          # Setup Blender.
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          # Setup unstable repo to get Bonsai build.
-          cd bonsai_unstable_repo
-          pip install -r requirements.txt
-          python setup_extensions_repo.py --last-tag
-          cd ..
-          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
-
-          # Install Bonsai.
-          blender --command extension install-file -r user_default -e $bonsai_zip
-          blender --command extension list
-
-          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
-
-          # Reregister Bonsai.
-          # Note that running it in background might miss some errors
-          # (e.g. tools are not registered in background mode).
-          blender --background --python IfcOpenShell/src/bonsai/scripts/reregister_bonsai.py
-
-          # Install sverchok.
-          wget -q -O sverchok.zip https://github.com/nortikin/sverchok/archive/refs/heads/master.zip
-          # ifcsverchok expecting sverchok to be named "sverchok" and not "sverchok-master".
-          unzip -q sverchok.zip
-          mv sverchok-master sverchok
-          zip -q -r sverchok.zip sverchok
-          rm -r sverchok
-          blender --command extension install-file -r user_default sverchok.zip
-
-          # Install ifcsverchok.
-          cd IfcOpenShell/src/ifcsverchok
-          make dist
-          sverchok_zip="$(pwd)/dist/$(ls dist)"
-          blender --command extension install-file -r user_default $sverchok_zip
-
-      - name: Update index.json on extensions repo
-        run: |
-          set -x -e
-
-          # Setup Blender.
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          cd bonsai_unstable_repo
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          git add index.json
-          git add readme.md
-          git commit -m "Update index.json"
-          git push
-
-      - name: Run bonsai tests
-        run: |
-          set -x -e
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          # Install Sun Position extension.
-          blender --online-mode --command extension sync
-          blender --online-mode --command extension install --enable --sync sun_position
-
-          cd IfcOpenShell/src/bonsai
-          pip install pytest-blender
-          pip install pytest-bdd
-          blender --background --python scripts/setup_pytest.py
-          blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background
-          make test

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/bsdd &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifc4d &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifc5d &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifccityjson &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifcclash &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/ci-ifcconvert.yml

@@ -24,6 +24,10 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
+          - {
+            name: "Windows 32bit",
+            short_name: win32,
+          }
           - {
             name: "Linux 64bit",
             short_name: linux64
@@ -37,8 +41,8 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifccsv &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifcdiff &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifcfm &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

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

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

@@ -21,7 +21,7 @@ jobs:
       date: ${{ steps.date.outputs.date }}
       verdate: ${{ steps.verdate.outputs.verdate }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Set env
         run: echo ok go
       
@@ -35,11 +35,11 @@ jobs:
 
       - name: Version + date str
         id: verdate
-        run: echo "verdate=${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}" >> $GITHUB_OUTPUT
+        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
 
       
   test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
     needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
@@ -48,67 +48,57 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        variant: [novtk, all]
         pyver: [
+#          { name: py311, distver: '3.11'},
           { name: py312, distver: '3.12'}
         ]
         platform: [
           { name: win, distver: windows-latest, pkg_dir: 'win-64' },
           { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' },
-          { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' }
+          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
         ]
     steps:
-      - name: Set Swap Space
+      - name: Set up swap space
         if: runner.os == 'Linux'
-        uses: pierotofy/set-swap-space@master
+        uses: pierotofy/set-swap-space@v1.0
         with:
           swap-size-gb: 10
-      
-      - name: set ARTIFACTS ENV vars
-        shell: bash
-        run: |
-          pwd
-          if [[ "$RUNNER_OS" == "Windows" ]]; then
-            echo "ARTIFACTS_DIR=D:/a/artifacts" >> $GITHUB_ENV
-          elif [[ "$RUNNER_OS" == "macOS" ]]; then
-            echo "ARTIFACTS_DIR=/Users/runner/work/artifacts" >> $GITHUB_ENV
-          elif [[ "$RUNNER_OS" == "Linux" ]]; then
-            echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
-          fi
-      
-      - uses: actions/checkout@v5
+
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Download and extract MacOSX SDK
-        if: ${{ matrix.platform.name == 'macOS-x86' }}
+        if: ${{ runner.os == 'macOS' }}
         run: |
           curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
 
-      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-
-            python=3.12
+            python=3.11
             anaconda-client
-            rattler-build
+            boa
 
       - name: create conda package dist dir
         run: |
-          mkdir -p ${{ env.ARTIFACTS_DIR }}
+          mkdir -p ${{ github.workspace }}/dist
 
       - name: build & test ifcopenshell
         run: |
-          rattler-build  build -r conda/recipe.yaml --output-dir '${{ env.ARTIFACTS_DIR }}'
+          conda mambabuild . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist' --variants='{variant: ${{ matrix.variant }}}'
+        working-directory: ./conda
         env:
           VERSION_OVERRIDE: ${{ needs.activate.outputs.verdate }}
 
       - name: upload to anaconda
         if: ${{ matrix.platform.name == 'win' }}
         run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda'
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'
 
       - name: upload to anaconda
         if: ${{ matrix.platform.name != 'win' }}
         run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2

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

@@ -9,7 +9,7 @@ on:
 jobs:
 
   activate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
       !startsWith(github.event.head_commit.message, 'Release ') &&
@@ -18,10 +18,10 @@ jobs:
     - run: echo ok go
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: activate
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v2
       with:
         submodules: recursive
 
@@ -35,7 +35,7 @@ jobs:
 
     -
       name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: hendrikmuhs/ccache-action@v1
 
     - 
       name: Build ifcopenshell
@@ -44,7 +44,6 @@ jobs:
         cmake \
          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-         -DCMAKE_CXX_STANDARD=17 \
          -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
          -DCMAKE_BUILD_TYPE=Release \
          -DCMAKE_PREFIX_PATH=/usr \
@@ -76,7 +75,7 @@ jobs:
         make package
       working-directory: build
     - name: Upload 
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v2
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -84,41 +83,39 @@ jobs:
         path: build/assets/Ifc*
 
   deliver:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: build
     name: Docker Build, Tag, Push
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v2
       with:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v6.0.0
+      uses: actions/download-artifact@v2
       with:
         # Artifact name
         name: ifcos-artifacts
         path: artifacts/
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v1
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3        
+      uses: docker/setup-buildx-action@v1        
     - 
       name: Login to Dockerhub
-      uses: docker/login-action@v3 
+      uses: docker/login-action@v1 
       with:
         username: aecgeeks
         password: ${{ secrets.DOCKER_HUB_TOKEN }}
     - 
       name: Build container image
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v2
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell
-        # Since the dispatch is set to `tag`, `github.ref_name` should evaluate to the pushed tag
-        # On a workflow dispatch, `ref_name` will take on the value from the dispatch payload
-        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:22.04' }}
+        tags: aecgeeks/ifcopenshell:latest
         file: ./Dockerfile
         push: true

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312]
         config:
           - {
             name: "Windows 64bit",
@@ -34,10 +34,6 @@ jobs:
             name: "Linux 64bit",
             short_name: linux64
           }
-          - {
-            name: "Linux ARM 64bit",
-            short_name: linuxarm64
-          }
           - {
             name: "MacOS Intel 64bit",
             short_name: macos64
@@ -47,10 +43,8 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v5
-        with:
-          submodules: recursive
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -65,7 +59,7 @@ jobs:
           cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
           make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

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

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifcpatch &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

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

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

.github/workflows/ci-ifcsverchok.yml

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

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

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

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile
@@ -28,7 +28,7 @@ jobs:
           cd src/ifctester &&
           make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ on:
       - 'src/ifcparse/**'
       - 'src/ifcwrap/**'
       - 'src/qtviewer/**'
-      - 'src/svgfill/**'
       - 'src/serializers/**'
       - 'conda/**'
       - 'cmake/**'
@@ -24,23 +23,23 @@ on:
 
 jobs:
   activate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
       !contains(github.event.head_commit.message, 'skip ci')
     steps:
       - run: echo ok go
 
-  compile-and-test:
-    runs-on: ubuntu-22.04
+  build:
+    runs-on: ubuntu-latest
     needs: activate
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
             submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -48,9 +47,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
+          pip install mathutils
           pip install src/bcf --no-deps
-          pip install git+https://github.com/zdhoward/aud
-          pip install pytest-xdist==3.8.0
+          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
 
       - name: Install C++ dependencies
         run: |
@@ -64,76 +63,15 @@ jobs:
           libboost-regex-dev \
           libboost-system-dev \
           libboost-thread-dev \
-          libpcre3-dev libxml2-dev \
+          swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
           libhdf5-dev libcgal-dev libeigen3-dev
           
       - name: ccache
-        # TODO: temporarily pointing to 1.2.19 to get notified by dependabot when 1.2.20 is released
-        # to update hardcoded references to commits in some other workflows.
-        # Then we can switch back to 1.2 in all actions.
-        uses: hendrikmuhs/ccache-action@v1.2.19
+        uses: hendrikmuhs/ccache-action@v1
         with:
-          key: ubuntu-22.04-${{ runner.arch }}
-
-      # RTTI is only enabled by default in Debug builds of rocksdb.
-      # Distros are using Release builds, so we're compiling it ourselves with RTTI forced on.
-      # https://github.com/facebook/rocksdb/blob/a3aa44a7167b8336f9bc15c8aba063260268ff68/CMakeLists.txt#L433
-      - name: build rocksdb
-        run: |
-          git clone https://github.com/facebook/rocksdb --branch v9.11.2
-          cd rocksdb
-          mkdir build && cd build
-          # rocksdb is using ccache automatically.
-          cmake -DFAIL_ON_WARNINGS=Off \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DWITH_TESTS=OFF \
-            -DWITH_TOOLS=OFF \
-            -DWITH_GFLAGS=OFF \
-            -DWITH_BENCHMARK_TOOLS=OFF \
-            -DWITH_CORE_TOOLS=OFF \
-            -DROCKSDB_BUILD_SHARED=Off \
-            -DCMAKE_POSITION_INDEPENDENT_CODE=On \
-            -DUSE_RTTI=On \
-            ..
-          sudo make -j$(nproc) install
-
-      # OpenCOLLADA is ancient, but we still have it in the main build.
-      # So adding it to CI to catch any breakages.
-      - name: build OpenCOLLADA
-        run: |
-          git clone https://github.com/KhronosGroup/OpenCOLLADA
-          cd OpenCOLLADA
-          git checkout v1.6.68
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/pr622_and_disable_subdirs.patch
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/allow_static_libraries_config_on_unix.patch
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_FLAGS_INIT="-fPIC"
-          sudo make -j$(nproc) install
-
-      # Ubuntu has `swig` package, but we build it to match the version we use in the main build.
-      # To avoid failing tests when checking stub generation.
-      - name: build swig
-        run: |
-          # Remove default swig to avoid conflicts.
-          sudo apt remove --purge swig swig4.0
-          sudo apt-get install -y libpcre2-dev bison
-          git clone https://github.com/swig/swig
-          cd swig
-          git checkout v4.1.0
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo make -j$(nproc) install
+          key: ${GITHUB_WORKFLOW}
 
       - name: Build ifcopenshell
         run: |
@@ -141,10 +79,9 @@ jobs:
           echo ${{ env.pythonLocation }}
           
           mkdir build && cd build
-          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
-          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
           cmake \
-               -DCMAKE_CXX_STANDARD=17 \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -152,31 +89,36 @@ jobs:
                -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
-               -DUSE_MMAP=On \
+               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
+               -DCOLLADA_SUPPORT=Off \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
                -DGLTF_SUPPORT=On \
-               -DWITH_ROCKSDB=On \
+               -DJSON_INCLUDE_DIR=/usr/include \
+               -DCGAL_INCLUDE_DIR=/usr/include \
+               -DGMP_INCLUDE_DIR=/usr/include \
+               -DMPFR_INCLUDE_DIR=/usr/include \
+               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+               -DEIGEN_DIR=/usr/include/eigen3 \
              ../cmake
           sudo make -j $(nproc)
           sudo make install
 
-      # - name: Run IfcConvert on Sample files
-      #   run: |
-      #     (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
-      #       echo $i | tee -a log; \
-      #       timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
-      #       echo $i $? >> statuses; \
-      #     done) || true
-      #     echo Failed
-      #     grep -v 0$ statuses
-      #     grep -v 0$ statuses | wc -l
-      #     echo Succeeded
-      #     grep 0$ statuses
-      #     grep 0$ statuses | wc -l
-
-      - name: Run IfcConvert on Sample file
+      - name: Run IfcConvert on Sample files
         run: |
-          IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj
+          (find test/input src/blenderbim/test/files -name '*.ifc' | while read i; do \
+            echo $i | tee -a log; \
+            timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
+            echo $i $? >> statuses; \
+          done) || true
+          echo Failed 
+          grep -v 0$ statuses
+          grep -v 0$ statuses | wc -l
+          echo Succeeded
+          grep 0$ statuses
+          grep 0$ statuses | wc -l
+
 
       - name: Test ifcopenshell-python
         run: |
@@ -184,22 +126,9 @@ jobs:
           python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
-          ERROR=0
-          make test-parallel || ERROR=1
-          cd ../bcf && make test || ERROR=1
+          make test
+          cd ../bcf && make test
           pip install requests
-          cd ../bsdd && make test || ERROR=1
-          pip install deepdiff
-          cd ../ifcdiff && make test || ERROR=1
-          cd ../ifcpatch && make test || ERROR=1
-          pip install -e ../ifctester --no-deps
-          cd ../ifctester && make test || ERROR=1
-          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
-          cd ../ifcopenshell-python
-          pip install mathutils
-          make test-mathutils || ERROR=1
-          if [ $ERROR -ne 0 ]; then
-            echo "One or more tests failed";
-            exit 1;
-          fi
+          cd ../bsdd && make test
+          cd ../ifcpatch && make test
+          cd ../ifctester && make test

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

@@ -1,38 +0,0 @@
-name: Build and Deploy Unstable Documentation
-
-on:
-  push:
-    branches:
-      - v0.8.0  # Trigger the workflow on pushes to the default branch which is currently v0.8.0
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          cd src/bonsai/docs  # Navigate to the docs directory
-          pip install -r requirements.txt  # Install dependencies from requirements.txt
-
-      - name: Build documentation
-        run: |
-          cd src/bonsai/docs  # Navigate to the docs directory
-          make html  # Build the documentation
-
-      - name: Deploy to GitHub Pages (Unstable)
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}  # SSH key for deployment
-          external_repository: IfcOpenShell/bonsaibim_org_docs_unstable  # Target repository
-          publish_branch: main  # Branch to deploy to
-          cname: docs-unstable.bonsaibim.org  # Custom domain for unstable docs
-          publish_dir: src/bonsai/docs/_build/html  # Directory containing built docs

.github/workflows/docs-deployment.yml

@@ -1,36 +0,0 @@
-name: Build and Deploy Stable Documentation
-
-on:
-  workflow_dispatch:  # Manual trigger
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          cd src/bonsai/docs
-          pip install -r requirements.txt  # Run pip install from the docs directory
-
-      - name: Build documentation
-        run: |
-          cd src/bonsai/docs
-          make html
-
-      - name: Deploy to GitHub Pages (Stable)
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          external_repository: IfcOpenShell/bonsaibim_org_docs
-          publish_branch: main
-          cname: docs.bonsaibim.org
-          publish_dir: src/bonsai/docs/_build/html

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

@@ -1,50 +0,0 @@
-name: Deploy Pyodide Demo App to GitHub Pages
-
-permissions:
-  id-token: write
-  pages: write
-
-on:
-  push:
-    paths:
-      - 'src/pyodide/**'
-      - '.github/workflows/publish-pyodide-demo-app.yml'
-    branches:
-      - v0.8.0
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-      
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout (recursive)
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Upload static files as artifact
-        id: deployment
-        uses: actions/upload-pages-artifact@v4
-        with:
-          path: src/pyodide/demo-app/
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.github/workflows/release.yml

@@ -4,20 +4,19 @@ on:
   push:
     tags:
       - 'v[0-9].[0-9].[0-9]*'
-  workflow_dispatch:
 
 jobs:
   activate:
     if: github.repository == 'IfcOpenShell/IfcOpenShell'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - run: echo ok go
   build:
     needs: activate
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Install C++ dependencies
@@ -46,7 +45,6 @@ jobs:
           mkdir build && cd build
           cmake \
            -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
-           -DCMAKE_CXX_STANDARD=17 \
            -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_PREFIX_PATH=/usr \
            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -54,8 +52,8 @@ jobs:
            -DOCC_INCLUDE_DIR=/usr/include/opencascade \
            -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
            -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.10 \
-           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
            -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
            -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
            -DGLTF_SUPPORT=On \

.gitignore

@@ -17,7 +17,6 @@
 # General Python residue
 __pycache__
 *.py.bak
-venv
 
 # Visual Studio Code files
 .vscode
@@ -74,22 +73,22 @@ src/ifcopenshell-python/test/build
 # mypy cache
 .mypy_cache
 
-# bonsai i18n
-src/bonsai/bonsai/translations.py
+# blenderbim libs
+src/blenderbim/blenderbim/libs
 
-# bonsai test temp files
-src/bonsai/test/files/temp
+# blenderbim i18n
+src/blenderbim/blenderbim/translations.py
 
-# bonsai data
-src/bonsai/bonsai/bim/data/build/
-src/bonsai/bonsai/bim/data/gantt/index.html
-src/bonsai/bonsai/bim/data/gantt/jsgantt.js
-src/bonsai/bonsai/bim/data/gantt/jsgantt.css
-src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js
-src/bonsai/bonsai/bim/data/webui/running_pid.json
+# blenderbim test temp files
+src/blenderbim/test/files/temp
+src/blenderbim/test/files/basic.ifc.cache.blend
+src/blenderbim/test/files/basic.ifc.cache.sqlite
+
+src/blenderbim/drawings
+src/blenderbim/layouts
 
 # ifcopenshell swig and compiled files
-src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
+src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # apple
@@ -101,12 +100,4 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 .cache
 
 # Brickschema
-src/bonsai/bonsai/bim/schema/Brick.ttl
-
-bonsaiDecoratorForLoads.code-workspace
-dev_environment.bat
-
-.pixi/
-
-src/ifcopenshell-python/ifcopenshell/express/*.exp
-src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
+src/blenderbim/blenderbim/bim/schema/Brick.ttl

.gitmodules

@@ -11,12 +11,9 @@
 [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
-[submodule "src/ifcopenshell-python/ifcopenshell/simple_spf"]
-	path = src/ifcopenshell-python/ifcopenshell/simple_spf
-	url = https://github.com/IfcOpenShell/step-file-parser
-[submodule "src/pyodide/demo-app/wheels"]
-	path = src/pyodide/demo-app/wheels
-	url = https://github.com/IfcOpenShell/wasm-wheels

Dockerfile

@@ -1,6 +1,6 @@
 # -*- mode: Dockerfile -*-
 
-FROM ubuntu:22.04
+FROM ubuntu:focal
 
 ARG CHANNEL
 ENV CHANNEL=${CHANNEL:-latest}
@@ -23,7 +23,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
     echo "deb http://archive.ubuntu.com/ubuntu focal-proposed multiverse" |  tee -a /etc/apt/sources.list; \
     apt-get -qq update; \
     apt-get -y install tzdata dos2unix rsync; \
-    apt-get -y install python3 libxml2 libpython3.10 \
+    apt-get -y install python3 libxml2 libpython3.8 \
                     libboost-all-dev \
                     libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                     libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \

README.md

@@ -6,14 +6,13 @@ IfcOpenShell
 <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
 </p>
 
-
 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
 parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and [IFC4x3 Add2]. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
 is possible at compile-time when using C++ and at run-time when using Python.
 
 In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), Bonsai (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
 and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
 
 For more information, see:
@@ -23,10 +22,10 @@ For more information, see:
   * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
   * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
   * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
-* [Bonsai Website](https://bonsaibim.org)
-* [Bonsai Documentation](https://docs.bonsaibim.org/index.html)
-  * [Add-on Installation](https://docs.bonsaibim.org/quickstart/installation.html)
-  * [Exploring an IFC model](https://docs.bonsaibim.org/quickstart/explore_model.html)
+* [BlenderBIM Add-on Website](https://blenderbim.org)
+* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
+  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
+  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
  
 Development is sponsored through your generous donations!
 
@@ -37,25 +36,25 @@ Contents
 
 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| [bcf](https://docs.ifcopenshell.org/bcf.html)                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/bcf-client/badges/version.svg)](https://anaconda.org/conda-forge/bcf-client) |
-| [bonsai](https://docs.ifcopenshell.org/bonsai.html)                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
-| [bsdd](https://docs.ifcopenshell.org/bsdd.html)                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
-| [ifc2ca](https://docs.ifcopenshell.org/ifc2ca.html)                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
-| [ifc4d](https://docs.ifcopenshell.org/ifc4d.html)                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |
-| [ifc5d](https://docs.ifcopenshell.org/ifc5d.html)                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
-| [ifcbimtester](https://docs.ifcopenshell.org/bimtester.html)              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
+| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) |
+| 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](https://docs.ifcopenshell.org/ifccityjson.html)               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
-| [ifcclash](https://docs.ifcopenshell.org/ifcclash.html)                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
-| [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
-| [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
-| [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
-| [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [Pyodide WASM Wheels](https://github.com/IfcOpenShell/wasm-wheels#pyodide-test-wheels) |
-| [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
-| [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
+| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
+| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
+| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
+| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
+| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
+| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
+| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
+| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
+| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
+| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
 
 The IfcOpenShell C++ codebase is split into multiple interal libraries:
 

VERSION

@@ -1 +1 @@
-0.8.5
+0.7.11

choco/blenderbim/blenderbim.nuspec

@@ -15,7 +15,7 @@
     <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/COPYING</licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.bonsaibim.org/</docsUrl>
+    <docsUrl>https://docs.blenderbim.org/</docsUrl>
     <!--<mailingListUrl></mailingListUrl>-->
     <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
     <tags>blender bim blenderbim ifc python opensource foss</tags>

choco/blenderbim/choco_release.py

@@ -14,11 +14,9 @@ import os
 import pathlib
 import re
 from urllib import request
-from github import Github
-from typing import NoReturn
 
 
-def get_repo_tag_names() -> list[str]:
+def get_repo_tag_names():
     git_return = os.popen("git tag -l").read()
     tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
     print(f"{len(tag_names)} tag_names found in repo")
@@ -45,7 +43,7 @@ def get_latest_choco_blender_version() -> list:
     return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
 
 
-def get_file_sha256_hash(file_path: str) -> str:
+def get_file_sha256_hash(file_path):
     BLOCKSIZE = 65536
     hasher = hashlib.sha256()
 
@@ -58,29 +56,16 @@ def get_file_sha256_hash(file_path: str) -> str:
     return hasher.hexdigest()
 
 
-def quit_with_error_message(message: str) -> NoReturn:
+def quit_with_error_message(message: str):
     print(f"ERROR: {message}")
     quit(0)
 
 
-def get_release_zip(tag: str) -> tuple[str, str]:
-    g = Github()
-    repo = g.get_repo("IfcOpenShell/IfcOpenShell")
-    release = repo.get_release(tag)
-    for asset in release.get_assets():
-        asset_name = asset.name
-        if python_version not in asset_name:
-            continue
-        if TARGET_OS not in asset_name:
-            continue
-        return (asset_name, asset.browser_download_url)
-    raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
-
-
 start = datetime.datetime.now()
 
 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
 URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases/download/"
 RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
 RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
 RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
@@ -94,7 +79,7 @@ os.chdir(BLENDERBIM_DIR)
 blenderbim_date_yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%y%m%d")
 should_release = False
 target_release_tag = ""
-TARGET_OS = "windows-x64"
+target_os = "win"
 
 git_status = os.popen("git status").read()
 print(git_status)
@@ -145,7 +130,10 @@ print(f"{python_version=}")
 blenderbim_build_version = target_release_tag.replace("blenderbim-", "")
 
 # url_blenderbim_py3x_win_zip
-release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
+release_zip_file_name = f"{target_release_tag}-{python_version}-{target_os}.zip"
+
+# download release
+url_blenderbim_py3x_win_zip = f"{URL_IFCOS_RELEASES}{target_release_tag}/{release_zip_file_name}"
 os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
 
 # sha256sum_blenderbim_py310_win_zip

cmake/CMakePresets.json

@@ -1,113 +0,0 @@
-{
-  "version": 6,
-  "configurePresets": [
-    {
-      "name": "shared",
-      "generator": "Ninja",
-      "hidden": true,
-      "cacheVariables": {
-        "BUILD_IFCPYTHON": "ON",
-        "BUILD_IFCGEOM": "ON",
-        "COLLADA_SUPPORT": "OFF",
-        "BUILD_EXAMPLES": "OFF",
-        "BUILD_GEOMSERVER": "OFF",
-        "GLTF_SUPPORT": "ON",
-        "BUILD_CONVERT": "ON",
-        "BUILD_IFCMAX": "OFF",
-        "IFCXML_SUPPORT": "ON",
-        "HDF5_SUPPORT": "ON",
-        "SCHEMA_VERSIONS": "4x3_add2",
-        "CMAKE_GENERATOR_PLATFORM": "",
-        "CMAKE_GENERATOR_TOOLSET": ""
-      }
-    },
-    {
-      "name": "win-shared",
-      "inherits": [
-        "shared"
-      ],
-      "hidden": true,
-      "environment": {
-        "CONDA_BUILD": "ON",
-        "CONDA_PY": "312"
-      },
-      "cacheVariables": {
-        "Boost_USE_STATIC_LIBS": "OFF",
-        "CMAKE_INSTALL_PREFIX": "$env{LIBRARY_PREFIX}",
-        "PYTHON_EXECUTABLE": "$env{PREFIX}/python.exe",
-        "PYTHON_INCLUDE_DIR": "$env{PREFIX}/include",
-        "PYTHON_LIBRARY": "$env{PREFIX}/libs/python$env{CONDA_PY}.lib",
-        "CMAKE_FIND_ROOT_PATH": "$env{LIBRARY_PREFIX}",
-        "CMAKE_PREFIX_PATH": "$env{LIBRARY_PREFIX}",
-        "LIBXML2_LIBRARIES": "$env{LIBRARY_PREFIX}/lib/libxml2.lib",
-        "OCC_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include/opencascade",
-        "OCC_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "CGAL_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "EIGEN_DIR": "$env{LIBRARY_PREFIX}/include/eigen3",
-        "JSON_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include"
-      }
-    },
-    {
-      "name": "win-release",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/prod",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/prod/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "win-debug",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-debug",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/dev",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/dev/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "win-test",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-test",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/tests",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/tests/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "SCHEMA_VERSIONS": "2x3;4;4x3_add2"
-      }
-    }
-  ]
-}

cmake/FindCGAL.cmake

@@ -1,42 +0,0 @@
-#
-# Input variables:
-# - `CGAL_INCLUDE_DIR`
-# - `CGAL_LIBRARY_DIR`
-# - `GMP_INCLUDE_DIR`
-# - `GMP_LIBRARY_DIR`
-# - `MPFR_INCLUDE_DIR`
-# - `MPFR_LIBRARY_DIR`
-# If input variables are not specified, try to find HDF5 config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `CGAL_INCLUDE_DIR`
-#
-
-UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
-
-if(NOT CGAL_INCLUDE_DIR)
-    # CGAL is not respecting default Boost_USE_STATIC_LIBS value
-    # and sometiems it's getting in the way.
-    if(NOT DEFINED Boost_USE_STATIC_LIBS)
-        set(CGAL_Boost_USE_STATIC_LIBS OFF)
-    else()
-        set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
-    endif()
-    find_package(CGAL CONFIG REQUIRED)
-    if(NOT CGAL_DIR)
-        message(
-            FATAL_ERROR
-            "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
-        )
-    endif()
-    message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
-endif()
-
-add_definitions(-DIFOPSH_WITH_CGAL)
-set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)

cmake/FindEigen3.cmake

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

cmake/FindHDF5.cmake

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

cmake/FindLibXml2.cmake

@@ -1,49 +0,0 @@
-#
-# Input variables:
-# - `LIBXML2_INCLUDE_DIR`
-# - `LIBXML2_LIBRARIES`
-# If input variables are not specified, try to find LibXml2 config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables:
-# - `LIBXML2_INCLUDE_DIR`
-# - `LIBXML2_LIBRARIES`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
-
-if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
-    # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04)
-    # CONFIG is provided using root path, so no need to clear sysroot here.
-    find_package(LibXml2 QUIET CONFIG)
-
-    if(NOT LibXml2_FOUND)
-        # Fallback to CMake's builtin FindLibXml2 module (works on Ubuntu)
-        find_package(LibXml2 REQUIRED)
-    else()
-        message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
-    endif()
-
-    if(TARGET LibXml2::LibXml2)
-        # Config mode already gives us the target
-        set(LIBXML2_LIBRARIES LibXml2::LibXml2)
-        get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
-    else()
-        # Module mode (Ubuntu)
-        set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
-        set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
-    endif()
-else()
-    find_package(LibXml2 REQUIRED)
-endif()
-
-if(MSVC AND NOT LibXml2_DIR)
-    add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
-endif()
-
-# Restore module path.
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindOpenCASCADE.cmake

@@ -1,138 +0,0 @@
-#
-# Input variables:
-# - `OCC_INCLUDE_DIR`
-# - `OCC_LIBRARY_DIR`
-# If input variables are not specified, try to find OpenCASCADE config.
-# Input variables could also be provided as environment variables.
-#
-# Output variables
-# - `OpenCASCADE_LIBRARIES`
-#
-
-UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
-
-if(OCC_INCLUDE_DIR)
-    set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
-    message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
-endif()
-
-if(OCC_LIBRARY_DIR)
-    set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
-    message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-endif()
-
-
-if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-    # OCE is not supported for find_package, because it's using a different name (`oce`)
-    # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
-    # find_package creates variables:
-    # - `OpenCASCADE_INCLUDE_DIR`
-    # - `OpenCASCADE_LIBRARIES`
-    find_package(OpenCASCADE CONFIG REQUIRED)
-    return()
-endif()
-
-# No specific paths specified, try to find package.
-if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
-    message(
-        STATUS
-        "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-        "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
-    )
-    # Parse OCC_VERSION_STRING.
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
-        REGEX "#define OCC_VERSION_MAJOR.*"
-    )
-    string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
-        REGEX "#define OCC_VERSION_MINOR.*"
-    )
-    string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
-        REGEX "#define OCC_VERSION_MAINTENANCE.*"
-    )
-    string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
-    set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-else()
-    message(
-        FATAL_ERROR
-        "Couldn't find Open CASCADE installation. "
-        "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-        "must be specified or OpenCASCADE package should be discoverable. "
-        "If you're using OCE, then providing a package is not available "
-        "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
-    )
-endif()
-
-set(
-    OpenCASCADE_LIBRARIES
-    TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
-    TKFillet TKXSBase TKOffset TKHLR
-
-    # @todo investigate the exact conditions when this is necessary
-    TKBin
-)
-
-if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OpenCASCADE_LIBRARIES  TKIGES TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
-else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OpenCASCADE_LIBRARIES TKDESTEP TKDEIGES)
-endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-
-find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
-
-if(libTKernel)
-    message(STATUS "Required Open Cascade Library files found")
-else()
-    message(
-        FATAL_ERROR
-        "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting"
-    )
-endif()
-
-if(MSVC)
-    add_definitions(-DHAVE_NO_DLL)
-    add_debug_variants(OpenCASCADE_LIBRARIES "${OpenCASCADE_LIBRARIES}" d)
-endif()
-
-if(WIN32)
-    # OCC might require linking to Winsock depending on the version and build configuration
-    list(APPEND OpenCASCADE_LIBRARIES ws2_32.lib)
-endif()
-
-# Make sure cross-referenced symbols between static OCC libraries get
-# resolved. Also add thread and rt libraries.
-get_filename_component(libTKernelExt ${libTKernel} EXT)
-if("${libTKernelExt}" STREQUAL ".a")
-    set(OCCT_STATIC ON)
-endif()
-
-if(OCCT_STATIC)
-    find_package(Threads)
-
-    if(WASM_BUILD)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-    else()
-        # OpenCASCADE_LIBRARIES repeated N times below in order to fix cyclic dependencies
-        # tfk: --start-group ... --end-group didn't work on the apple linker when last tested
-        if(APPLE)
-            set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        else()
-            set(OpenCASCADE_LIBRARIES -Wl,--start-group ${OpenCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
-        endif()
-    endif()
-
-    if(NOT APPLE AND NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "rt")
-    endif()
-    if(NOT WIN32)
-        set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} "dl")
-    endif()
-endif()
-
-add_library(OpenCASCADE_INTERFACE INTERFACE IMPORTED)
-target_include_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_INCLUDE_DIR}")
-target_link_libraries(OpenCASCADE_INTERFACE INTERFACE ${OpenCASCADE_LIBRARIES})
-target_link_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_LIBRARY_DIR}")
-set(OpenCASCADE_LIBRARIES OpenCASCADE_INTERFACE)

cmake/FindOpenCOLLADA.cmake

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

cmake/FindUSD.cmake

@@ -1,54 +0,0 @@
-#
-# Input variables:
-# - `USD_INCLUDE_DIR`
-# - `USD_LIBRARY_DIR`
-# Input variables could also be provided as environment variables.
-# TODO: Try to find USD config if varibales are not provided.
-# TODO: does usd have a config file?
-#
-# Output variables:
-# - `USD_LIBRARIES`
-
-UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
-
-if("${USD_INCLUDE_DIR}" STREQUAL "")
-    find_path(USD_INCLUDE_DIR pxr.h
-        PATHS
-            /usr/include/pxr
-            /usr/local/include/pxr
-        REQUIRED
-    )
-    if(USD_INCLUDE_DIR)
-        message(STATUS "Found USD include files in: ${USD_INCLUDE_DIR}")
-    else()
-        message(FATAL_ERROR "Unable to find USD include directory, specify USD_INCLUDE_DIR manually.")
-    endif()
-else()
-    set(USD_INCLUDE_DIR ${USD_INCLUDE_DIR} CACHE FILEPATH "USD header files")
-    message(STATUS "Looking for USD include files in: ${USD_INCLUDE_DIR}")
-endif()
-
-set(USD_LIBRARIES
-        usd_usd
-        usd_usdGeom
-        usd_usdShade
-        usd_usdLux
-        usd_vt
-        usd_sdf
-        usd_tf
-        usd_gf
-    )
-
-find_library(USD_LIBRARY
-    NAMES ${USD_LIBRARIES}
-    PATHS ${USD_LIBRARY_DIR})
-if(USD_LIBRARY)
-    message(STATUS "USD libraries ${USD_LIBRARIES} found in: ${USD_LIBRARY_DIR}")
-    link_directories(${USD_LIBRARY_DIR})
-else()
-    message(FATAL_ERROR "Unable to find USD libraries in: ${USD_LIBRARY_DIR}")
-endif()
-
-add_definitions(-DWITH_USD)
-set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)

cmake/utilities.cmake

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

conda/bld.bat

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

conda/build.sh

@@ -16,7 +16,6 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
- -DCMAKE_CXX_STANDARD=17 \
   ${CMAKE_PLATFORM_FLAGS[@]} \
  -DCMAKE_PREFIX_PATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -42,10 +41,9 @@ 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
-
-python "${RECIPE_DIR}/update_version_init.py" "${PKG_VERSION}" "${SP_DIR}/ifcopenshell/__init__.py"
+ninja install -j 1

conda/conda_build_config.yaml

@@ -1,5 +1,6 @@
-python:
-  - 3.12
+variant:
+  - novtk
+  - all
 
 occt:
   - 7.8.1
@@ -23,15 +24,14 @@ cxx_compiler_version:
 - '12'    # [linux]
 - '16'    # [osx]
 c_stdlib_version:
-  - 2.17    # [linux]
-  - 10.13   # [osx and x86_64]
-  - 11.0    # [osx and arm64]
+- '2.12'    # [linux]
+- '10.13'   # [osx]
 hdf5:
-- 1.14.6
+- 1.14.3
 libboost_devel:
-- '1.86'
+- '1.84'
 libxml2:
-- 2.13
+- '2'
 mpfr:
 - '4'
 gmp:
@@ -47,12 +47,12 @@ target_platform:
 - win-64    # [win]
 - linux-64  # [linux]
 - osx-64    # [osx]
-macos_machine:                 # [osx]
-  - x86_64-apple-darwin13.4.0  # [osx and x86_64]
-  - arm64-apple-darwin20.0.0   # [osx and arm64]
-MACOSX_DEPLOYMENT_TARGET:      # [osx]
-  - 11.0                       # [osx and arm64]
-  - 10.13                      # [osx and x86_64]
+macos_machine:
+- x86_64-apple-darwin13.4.0
+MACOSX_DEPLOYMENT_TARGET:
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 
-CONDA_BUILD_SYSROOT:  # [osx]
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx and x86_64]
+CONDA_BUILD_SYSROOT:
+  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx]

conda/meta.yaml

@@ -1,78 +1,64 @@
-context:
-  version: ${{ env.get("VERSION_OVERRIDE", default="0.8.2.1") }}
-  build: 1
+{% set version = environ.get('VERSION_OVERRIDE', '0.8.0') %}
+{% set build = 0 %}
+
+# Higher number -> Always prioritize "novtk" variant over "all" variant
+{% set build = build + 200 %}   # [variant == "novtk"]
+{% set build = build + 100 %}   # [variant == "all"]
 
 package:
   name: ifcopenshell
-  version: ${{ version }}
+  version: {{ version }}
 
 source:
-  - path: ..
+  path: ../
 
 
 build:
-  number: ${{ build }}
-  dynamic_linking:
-    binary_relocation: ${{ true if osx }}
+  number: {{ build }}
+  skip: true  # [py<39]
+  binary_relocation: false  # [osx]
+  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
+  run_exports:
+    - {{ pin_subpackage('ifcopenshell', max_pin='x.x.x') }} *{{ variant }}*
+
 
 requirements:
   build:
-    - if: build_platform != target_platform
-      then:
-        - python
-        - cross-python_${{ target_platform }}
-    - cmake <4
+    - cmake
     - ninja
     - swig >=4.1.1
-    - ${{ stdlib("c") }}
-    - ${{ compiler('c') }}
-    - ${{ compiler('cxx') }}
+    - {{ stdlib("c") }}
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
   host:
     - python
     - libboost-devel
-    - occt
+    - occt *=*{{ variant }}*
     - libxml2
     - cgal-cpp
     - hdf5
     - eigen
     - mpfr
     - nlohmann_json
-    - gmp
+    - gmp  # [unix]
+    - mpir  # [win]
     - zlib
   run:
     - python
-    - shapely
-    - typing_extensions
-    - ${{ pin_compatible('occt', upper_bound='x.x.x') }}
-    - ${{ pin_compatible('cgal-cpp', upper_bound='x.x') }}
-  run_exports:
-    - ${{ pin_subpackage('ifcopenshell', upper_bound='x.x.x') }}
+    - {{ pin_compatible('occt', max_pin='x.x.x') }} *{{ variant }}*
+    - {{ pin_compatible('cgal-cpp', max_pin='x.x') }}
+
+
+test:
+  imports:
+    - ifcopenshell
 
-tests:
-  - python:
-      imports:
-        - ifcopenshell
-      pip_check: false
-  - script:
-      - python -c "import ifcopenshell; assert ifcopenshell.version == '${{ version }}', 'print(ifcopenshell.version)'"
-    requirements:
-      run:
-        - occt * *novtk*  # Ensure that even though compiled against OCCT with VTK, it can still run with OCCT without VTK
-        - pytest
-        - python-dateutil
-        - xmlschema
-        - xsdata
-        - lxml
-        - isodate
-        - lark
-        - networkx
-        - tabulate
-        - shapely
 
 about:
+  home: https://ifcopenshell.org
   license: LGPL-3.0-or-later
   license_file: COPYING
-  summary: IfcOpenShell is a library to support the IFC file format
+  summary: 'IfcOpenShell is a library to support the IFC file format'
   description: |
     IfcOpenShell
     ============
@@ -90,14 +76,14 @@ about:
     For more information, see:
     
     * [IfcOpenShell Website](http://ifcopenshell.org)
-    * [IfcOpenShell Documentation](http://bonsaibim.org/docs-python)
-    * [IfcOpenShell C++ Installation](https://bonsaibim.org/docs-python/ifcopenshell/installation.html)
-    * [IfcOpenShell Python Installation](https://bonsaibim.org/docs-python/ifcopenshell-python/installation.html)
-    * [IfcOpenShell Python Hello World Tutorial](https://bonsaibim.org/docs-python/ifcopenshell-python/hello_world.html)
-    * [Bonsai Website](https://bonsaibim.org)
-    * [Bonsai Documentation](http://bonsaibim.org/docs)
-    * [Add-on Installation](https://bonsaibim.org/docs/users/installation.html)
-    * [Exploring an IFC model](https://bonsaibim.org/docs/users/exploring_an_ifc_model.html)
+    * [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
+    * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
+    * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+    * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
+    * [BlenderBIM Add-on Website](https://blenderbim.org)
+    * [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
+    * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
+    * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)
     
     <table>
       <thead>
@@ -307,9 +293,8 @@ about:
     [MSYS2]: https://msys2.github.io/ "MSYS2"
     [win/readme.md]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/win/readme.md "win/readme.md"
     [nix/build-all.py]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/nix/build-all.py "nix/build-all.py"
-  homepage: https://ifcopenshell.org
-  repository: https://github.com/IfcOpenShell/IfcOpenShell
-  documentation: https://ifcopenshell.org/
+  doc_url: https://ifcopenshell.org/
+  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
 
 extra:
   recipe-maintainers:

conda/update_version_init.py

@@ -1,32 +0,0 @@
-import re
-import argparse
-from pathlib import Path
-
-def update_version(file_path: str, version: str) -> None:
-    """Update the version string in the given __init__.py file."""
-    file_path = Path(file_path)
-
-    # Read the file and replace the version
-    file_contents = file_path.read_text(encoding="utf-8")
-    new_contents = re.sub(r'version = "0\.0\.0"', f'version = "{version}"', file_contents)
-
-    # Write the updated contents back to the file
-    file_path.write_text(new_contents, encoding="utf-8")
-
-    print(f"Updated version in {file_path} to {version}")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Update the version string in a Python file.")
-    parser.add_argument(
-        "version",
-        type=str,
-        help="The version string to replace '0.0.0' with (e.g., '1.2.3')."
-    )
-    parser.add_argument(
-        "file",
-        type=str,
-        help="The path to the __init__.py file where the version will be updated."
-    )
-
-    args = parser.parse_args()
-    update_version(args.file, args.version)

nix/patches/occt/no_ExpToCasExe_7_7_2.patch

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

nix/patches/occt/no_ExpToCasExe_7_8_1.patch

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

nix/patches/occt/no_ExpToCasExe_7_9_1.patch

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

nix/patches/opencollada/allow_static_libraries_config_on_unix.patch

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

pixi.toml

@@ -1,84 +0,0 @@
-[project]
-name = "IfcOpenShell"
-version = "0.8.4"
-description = "IfcOpenShell is a library to support the IFC file format"
-channels = ["conda-forge"]
-platforms = ["win-64", "linux-64", "osx-64"]
-
-[environments]
-common = { features = ["common"], no-default-feature = true }
-prod = { features = ["prod", "common"], no-default-feature = true }
-dev = { features = ["dev", "common"], no-default-feature = true }
-lint = { features = ["lint"], no-default-feature = true }
-tests = { features = ["tests", "common"], no-default-feature = true }
-
-[feature.lint.dependencies]
-ruff = "*"
-black = "*"
-
-[feature.common.dependencies]
-# Build deps
-cmake = "==3.30.5"
-ninja = "*"
-swig = "*"
-c-compiler = "*"
-cxx-compiler = "*"
-
-# Runtime deps
-python = "3.12.*"
-libboost-devel = "*"
-occt = { version = "*", build = "*novtk*" }
-cgal-cpp = "*"
-numpy = "*"
-lark = "*"
-hdf5 = "*"
-eigen = "*"
-mpfr = "*"
-gmp = "*"
-nlohmann_json = "*"
-zlib = "*"
-# Not strictly necessary
-pythonocc-core = "*"
-
-[feature.tests.dependencies]
-pytest = "*"
-shapely = "*"
-tabulate = "*"
-isodate = "*"
-python-dateutil = "*"
-xmlschema = "*"
-xsdata = "*"
-lxml = "*"
-networkx = "*"
-
-[feature.common.target.win-64.dependencies]
-vs2022_win-64 = "*"
-#vs_win-64 = "*" # Visual Studio
-#vswhere = "*" # Visual Studio
-
-[feature.common.tasks]
-init-submodules = { cmd = "git submodule update --init --recursive", outputs =["$PIXI_PROJECT_ROOT/src/svgfill/3rdparty/svgpp/*"]}
-
-[feature.prod.target.win-64.tasks]
-configure-release = { cmd = ["cmake", "--preset", "win-release", "-B", "build/win-release", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }] }
-build-release = { cmd = ["cmake", "--build", "build/win-release", "--config", "Release"], description = "Build the project" }
-
-[feature.dev.target.win-64.tasks]
-configure-debug = { cmd = ["cmake", "--preset", "win-debug", "-B", "build/win-debug", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-debug/CMakeCache.txt"] }
-build-debug = { cmd = ["cmake", "--build", "build/win-debug", "--config", "Debug"], description = "Build the project", depends-on = ["configure-debug"] }
-install-debug = { cmd = ["cmake", "--install", "build/win-debug", "--config", "Debug"], description = "Install the project" } # Optionally Install files to your desired env using --prefix
-
-vsdebug = { cmd = ["python"], description = "Run a python script with vs debugger attached" }
-
-[feature.tests.tasks]
-configure-test = { cmd = ["cmake", "--preset", "win-test", "-B", "build/win-test", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-test/CMakeCache.txt"] }
-build-test = { cmd = ["cmake", "--build", "build/win-test", "--config", "Release"], description = "Build the project", depends-on = ["configure-test"], outputs=["build/win-test/IfcGeom.lib"] }
-install-test = { cmd = ["cmake", "--install", "build/win-test", "--config", "Release"], description = "Install the project", depends-on = ["build-test"] } # Optionally Install files to your desired env using --prefix
-
-test = { cmd = "pytest .", cwd="src/ifcopenshell-python/test", depends-on=["install-test"], env = {PYTHONPATH="$PIXI_PROJECT_ROOT/src/ifcpatch"}}
-
-[feature.lint.tasks]
-lint = { cmd = "ruff check && black --diff --check ."}
-
-[feature.common.target.win-64.activation]
-#scripts = ["cmake/activate.bat"]

pyodide/README.md

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

pyodide/build_pyodide.sh

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

pyodide/cache_dependencies.py

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

pyodide/meta.yaml

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

pyodide/setup.py

@@ -1,47 +1,11 @@
-# setup.py is getting deprecated, but we still use it,
-# because `tool.setuptools.ext-modules` is still experimental in pyproject.toml
-# and we need it to get the wheel suffix right.
-import os
-from pathlib import Path
+from setuptools import setup, find_packages
 
-import tomllib
-from setuptools import Extension, find_packages, setup
-
-REPO_FOLDER = Path(__file__).parent
-
-
-def get_version() -> str:
-    if "PKG_VERSION" in os.environ:
-        # Inside pyodide build environment.
-        return os.environ["PKG_VERSION"]
-    return (REPO_FOLDER / "VERSION").read_text().strip()
-
-
-# Read dependencies from pyproject.toml
-def get_dependencies() -> list[str]:
-    pyproject_toml = REPO_FOLDER / "src" / "ifcopenshell-python" / "pyproject.toml"
-    pyproject_data = tomllib.loads(pyproject_toml.read_text())
-    dependencies = pyproject_data["project"]["dependencies"]
-    return dependencies
-
-
-setup(
-    name="ifcopenshell",
-    version=get_version(),
-    description=(
-        "IfcOpenShell is an open source (LGPL) software library "
-        "for working with the Industry Foundation Classes (IFC) file format."
-    ),
-    author="Thomas Krijnen",
-    author_email="thomas@aecgeeks.com",
-    url="https://ifcopenshell.org",
-    install_requires=get_dependencies(),
-    packages=find_packages(include=["ifcopenshell", "ifcopenshell.*"]),
-    package_data={
-        # "*.so" is needed to include prebuilt binary extension. Otherwise it would try to build it and fail.
-        "ifcopenshell": ["util/schema/*.json", "util/schema/*.ifc", "*.so"],
-        "": ["*.json", "*.ifc"],
-    },
-    # Has to provide extension to get the correct wheel suffix.
-    ext_modules=[Extension("ifcopenshell._ifcopenshell_wrapper", sources=[])],
+setup(name='IfcOpenShell',
+      version='0.8.0',
+      description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
+      author='Thomas Krijnen',
+      author_email='thomas@aecgeeks.com',
+      url='http://ifcopenshell.org',
+      packages=find_packages(),
+      package_data={'': ['*.so']},
 )

pyodide/test/test_wheel.py

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

pyproject.toml

@@ -1,72 +1,35 @@
 [tool.black]
 line-length = 120
 include = '''
-    src/.*.pyi?$
-    |nix/.*.pyi?$
+    src/(
+        bcf
+        |bcfserver
+        |blenderbim
+        |bsdd
+        |foundationserver
+        |ifc2ca
+        |ifc4d
+        |ifc5d
+        |ifcbimtester
+        |ifcblender
+        |ifccityjson
+        |ifcclash
+        |ifccsv
+        |ifcdiff
+        |ifcfm
+        |ifcpatch
+        |ifctester
+        |ifcopenshell-python
+        |ifcsverchok
+        |opencdeserver
+    )/.*.py$
 '''
 extend-exclude = '''
     src/ifcopenshell-python/ifcopenshell/express/*
     |src/ifcopenshell-python/ifcopenshell/mvd/*
-    |src/ifcopenshell-python/ifcopenshell/simple_spf/*
     |src/ifc2ca/templates/*
-    |src/svgfill
-    |src/exterior-shell-extractor
 '''
 
 [tool.pyright]
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
-reportUnnecessaryTypeIgnoreComment = true
-
-# Define here general ruff settings,
-# then they will be inherited by projects' .toml files.
-# This allows using assuming different Python version for different projects.
-[tool.ruff]
-exclude = [
-    # Submodules.
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill",
-    #
-    # Unformatted.
-    "src/exterior-shell-extractor",
-    # Incompatible with linter.
-    "src/ifc2ca/templates",
-]
-[tool.ruff.lint]
-preview = true
-select = [
-    # Default Ruff rules.
-    # "E4",        # imports
-    # "E7",        # statements
-    "E9",          # io errors
-    # "F",         # pyflakes
-    #
-    "FA",          # future annotations
-    "UP",          # pyupgrade
-    "RUF015",      # next() > list_comprehension[0]
-    "RUF022",      # sort __all__
-]
-ignore = [
-    "FA100", # Conflicts with Blender using annotations for props definitions.
-    # Maybe will enable later:
-    "UP007", # Optional to X | Y
-    "UP045", # Optional to X | None
-    "UP015", # Unnecessary mode argument
-    "UP028", # yield for -> yield from
-    "UP030", # implicit references for positional format fields
-    "UP031", # Replace % with .format
-    "UP032", # Replace .format with f-string
-]
-
-[tool.poe.tasks]
-
-ruff-main = "ruff check --extend-exclude nix/build-all.py"
-# It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
-ruff-old = "ruff check nix/build-all.py --target-version py37"
-ruff.sequence = ["ruff-main", "ruff-old"]
-
-black = "black ."
-
-format.sequence = ["black", "ruff-main", "ruff-old"]

src/bcf/Makefile

@@ -30,8 +30,8 @@ license:
 # TODO: make this based on xsd file presence
 .PHONY: models
 models:
-	xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
-	xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
+	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
+	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
 
 .PHONY: test
 test:

src/bcf/README.md

@@ -3,7 +3,3 @@
 A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
 available via `bcfxml.py` and manipulation of BCF-API is available via
 `bcfapi.py`.
-
-Python files in 'model' folder are automatically generated from .xsd files (located in 'xsd' folder).
-To regenerate them you can use `make models`.
-The only exception is 'v2/model/extensions.py', see it's note for the details.

src/bcf/bcf/agnostic/extensions.py

@@ -1,28 +0,0 @@
-import bcf.v2.model.extensions
-import bcf.v3.model.extensions
-from typing import NamedTuple, Union
-from dataclasses import fields
-
-
-class AttributeData(NamedTuple):
-    attr_type: type
-    subattr_name: str
-    subattr_xsd_name: str
-
-
-Extensions = Union[bcf.v2.model.extensions.Extensions, bcf.v3.model.extensions.Extensions]
-
-
-def get_extensions_attributes(extensions: Extensions) -> dict[str, AttributeData]:
-    """Return mapping of xsd attribute name to a tuple that consists of:
-    - Extensions attribute name
-    - Extensions attribute type type
-    - subattribute name"""
-    possible_attributes = {}
-    for field in fields(type(extensions)):
-        field_type = field.type.__args__[0]  # pyright: ignore [reportAttributeAccessIssue]
-        subfield = next(iter(fields(field_type)))
-        xsd_name = subfield.metadata["name"]
-        possible_attributes[field.name] = AttributeData(field_type, subfield.name, xsd_name)
-
-    return possible_attributes

src/bcf/bcf/agnostic/model.py

@@ -1,10 +0,0 @@
-import bcf.v2.model
-import bcf.v3.model
-from typing import Union
-
-BimSnippet = Union[bcf.v2.model.BimSnippet, bcf.v3.model.BimSnippet]
-BitMap = Union[bcf.v2.model.VisualizationInfoBitmap, bcf.v3.model.Bitmap]
-DocumentReference = Union[bcf.v2.model.TopicDocumentReference, bcf.v3.model.DocumentReference]
-HeaderFile = Union[bcf.v2.model.HeaderFile, bcf.v3.model.File]
-Topic = Union[bcf.v2.model.Topic, bcf.v3.model.Topic]
-ViewPoint = Union[bcf.v2.model.ViewPoint, bcf.v3.model.ViewPoint]

src/bcf/bcf/agnostic/topic.py

@@ -1,101 +0,0 @@
-import tempfile
-import bcf.v2.bcfxml
-import bcf.v2.model
-import bcf.v2.topic
-import bcf.v3.bcfxml
-import bcf.v3.model
-import bcf.v3.topic
-import bcf.agnostic.model as mdl
-from pathlib import Path
-from typing import Union, Optional
-from typing_extensions import assert_never
-
-TopicHandler = Union[bcf.v2.topic.TopicHandler, bcf.v3.topic.TopicHandler]
-
-
-def extract_file(
-    topic: TopicHandler,
-    entity: Union[mdl.HeaderFile, mdl.BimSnippet, mdl.DocumentReference, mdl.BitMap],
-    bcfxml: Optional[Union[bcf.v2.bcfxml.BcfXml, bcf.v3.bcfxml.BcfXml]] = None,
-    outfile: Optional[Path] = None,
-) -> Union[Path, str, None]:
-    """Extracts an element with a file into a temporary directory
-
-    These include header files, bim snippets, document references, and
-    viewpoint bitmaps. External reference are not downloaded. Instead, the
-    URI reference is returned.
-
-    :param entity: The entity with a file reference to extract
-    :param outfile: If provided, save the header file to that location.
-        Otherwise, a temporary directory is created and the filename is
-        derived from the header's original filename.
-    :param bcfxml: The BCF XML file to use for resolving document references files.
-        Required only for BCF v3 document references (in BCF v3 internal documents
-        are stored at BCF root, not in the topic).
-    :return: The filepath of the extracted file. It may be a URL if the
-        header file is external.
-    """
-    if isinstance(entity, mdl.DocumentReference):
-        if isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            reference = entity.referenced_document
-        else:
-            reference = entity.document_guid
-    else:
-        reference = entity.reference
-
-    if not reference:
-        return None
-
-    # For v3 document references external documents are detected by empty document_guid.
-    # External bitmaps are not supported by bcf.
-    if not isinstance(entity, (bcf.v3.model.DocumentReference, mdl.BitMap)) and entity.is_external:
-        return reference
-
-    if isinstance(entity, bcf.v3.model.DocumentReference):
-        # Extract document reference filename and contents.
-        if not bcfxml:
-            raise TypeError("bcfxml is required for BCF v3 document references.")
-        assert isinstance(bcfxml, bcf.v3.bcfxml.BcfXml)
-        error_msg = f"BCF XML is missing document with guid '{reference}'."
-        if not bcfxml.documents:
-            raise Exception(error_msg)
-        definition_docs = bcfxml.documents.definition.documents
-        if not definition_docs:
-            raise Exception(error_msg)
-        docs = next((doc for doc in definition_docs.document if doc.guid == reference), None)
-        if not docs:
-            raise Exception(error_msg)
-        filename = docs.filename
-        bytes_data = bcfxml.documents.documents[filename]
-    else:
-        if isinstance(entity, mdl.BimSnippet):
-            bytes_data = topic.bim_snippet
-            assert isinstance(bytes_data, bytes)
-        elif isinstance(entity, mdl.HeaderFile):
-            bytes_data = topic.reference_files[reference]
-        elif isinstance(entity, mdl.BitMap):
-            bytes_data = next(
-                byte_data
-                for vp in topic.viewpoints.values()
-                for data_reference, byte_data in vp.bitmaps.items()
-                if data_reference == reference
-            )
-        elif isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            assert isinstance(topic, bcf.v2.topic.TopicHandler)
-            bytes_data = topic.document_references[reference]
-        else:
-            assert_never(entity)
-
-        # We don't really need it if 'outfile' is None, just keeping type checker happy.
-        if isinstance(entity, mdl.HeaderFile) and entity.filename:
-            filename = entity.filename
-        else:
-            filename = Path(reference).name
-
-    if not outfile:
-        outfile = Path(tempfile.mkdtemp()) / filename
-
-    with open(outfile, "wb") as f:
-        f.write(bytes_data)
-
-    return outfile

src/bcf/bcf/agnostic/visinfo.py

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

src/bcf/bcf/bcfxml.py

@@ -30,10 +30,9 @@ from bcf.v3.model import Version as Version3
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
 
 
-BcfXml = Union[BcfXml2, BcfXml3]
-
-
-def load(filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+def load(
+    filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None
+) -> Optional[Union[BcfXml2, BcfXml3]]:
     """
     Load a BCF file.
 

src/bcf/bcf/geometry.py

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

src/bcf/bcf/inmemory_zipfile.py

@@ -6,7 +6,6 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 original idea from https://stackoverflow.com/a/19722365/1307905
 """
 
-from __future__ import annotations
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -48,7 +47,7 @@ class InMemoryZipFile:
     def data(self) -> bytes:
         return self.in_memory_data.getvalue()
 
-    def __enter__(self) -> InMemoryZipFile:
+    def __enter__(self) -> "InMemoryZipFile":
         return self
 
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:

src/bcf/bcf/v2/bcfxml.py

@@ -1,15 +1,12 @@
 """BCF XML V2 handler."""
 
-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
 from pathlib import Path
 from typing import Any, NoReturn, Optional, TypeVar
 
-import bcf.agnostic.extensions
 import bcf.v2.model as mdl
-import bcf.v2.model.extensions as mdl_extensions
 from bcf.inmemory_zipfile import InMemoryZipFile, ZipFileInterface
 from bcf.v2.topic import TopicHandler
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
@@ -27,12 +24,11 @@ class BcfXml:
         self._xml_handler = xml_handler or XmlParserSerializer()
         self._version: Optional[mdl.Version] = None
         self._project_info: Optional[mdl.ProjectExtension] = None
-        self._extensions: Optional[mdl_extensions.Extensions] = None
-        self._topics: Optional[dict[str, TopicHandler]] = None
+        self._topics: dict[str, TopicHandler] = {}
         self._extension_schema: Optional[bytes] = None
         self._zip_file = self._load_zip_file()
 
-    def __enter__(self) -> BcfXml:
+    def __enter__(self) -> "BcfXml":
         return self
 
     def __exit__(self, *args: Any) -> None:
@@ -89,67 +85,28 @@ class BcfXml:
     def extension_schema(self, value: bytes) -> None:
         self._extension_schema = value
 
-    @property
-    def extensions(self) -> Optional[mdl_extensions.Extensions]:
-        """BCF extensions."""
-
-        if not self._extensions and self.extension_schema:
-            import io
-            from xml.etree import ElementTree as etree
-
-            extensions = mdl_extensions.Extensions()
-
-            xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO(self.extension_schema))
-
-            attrs = bcf.agnostic.extensions.get_extensions_attributes(extensions)
-            xsd_to_attrs = {v.subattr_xsd_name: k for k, v in attrs.items()}
-            for node in root.findall(f".//{xs}restriction"):
-                attr_type = node.attrib.get("base")
-                if not attr_type:
-                    continue
-                attr_name = xsd_to_attrs.get(attr_type)
-                if attr_name is None:
-                    continue
-                values = []
-                for enum in node.findall(f".//{xs}enumeration"):
-                    values.append(enum.attrib["value"])
-                if not values:
-                    continue
-                attr_data = attrs[attr_name]
-                attr = attr_data.attr_type()
-                setattr(attr, attr_data.subattr_name, values)
-                setattr(extensions, attr_name, attr)
-
-            self._extensions = extensions
-        return self._extensions
-
-    @extensions.setter
-    def extensions(self, value: Optional[mdl_extensions.Extensions]) -> None:
-        self._extensions = value
-
     @property
     def topics(self) -> dict[str, TopicHandler]:
         """BCF topics."""
-        if self._topics is None:
-            self._topics = self._load_topics()
+        if not self._topics and self._zip_file:
+            self._topics = self._load_topics(self._zip_file, self._xml_handler)
         return self._topics
 
-    def _load_topics(self) -> dict[str, TopicHandler]:
+    def _load_topics(
+        self, zip_file: zipfile.ZipFile, xml_handler: AbstractXmlParserSerializer
+    ) -> dict[str, TopicHandler]:
         topics = {}
-        if self._zip_file is None:
-            return topics
-        for topic_dir in zipfile.Path(self._zip_file).iterdir():
+        for topic_dir in zipfile.Path(zip_file).iterdir():
             if not topic_dir.is_dir():
                 continue
             markup_path = topic_dir.joinpath("markup.bcf")
             if not markup_path.exists():
                 continue
-            topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
+            topics[topic_dir.name] = TopicHandler(topic_dir, xml_handler)
         return topics
 
     @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
         """
         Create a BcfXml object from a file.
 
@@ -173,7 +130,7 @@ class BcfXml:
         cls,
         project_name: Optional[str] = None,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
         """
         Create a new BcfXml object.
 
@@ -262,7 +219,7 @@ class BcfXml:
         )
 
     # region Deprecated methods
-    def new_project(self) -> BcfXml:
+    def new_project(self) -> "BcfXml":
         """Deprecated method."""
         warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
         return self.create_new()

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

@@ -36,10 +36,20 @@ from bcf.v2.model.visinfo import (
 
 __all__ = [
     "BimSnippet",
-    "BitmapFormat",
-    "ClippingPlane",
     "Comment",
     "CommentViewpoint",
+    "Header",
+    "HeaderFile",
+    "Markup",
+    "Topic",
+    "TopicDocumentReference",
+    "TopicRelatedTopic",
+    "ViewPoint",
+    "Project",
+    "ProjectExtension",
+    "Version",
+    "BitmapFormat",
+    "ClippingPlane",
     "Component",
     "ComponentColoring",
     "ComponentColoringColor",
@@ -48,20 +58,10 @@ __all__ = [
     "ComponentVisibilityExceptions",
     "Components",
     "Direction",
-    "Header",
-    "HeaderFile",
     "Line",
-    "Markup",
     "OrthogonalCamera",
     "PerspectiveCamera",
     "Point",
-    "Project",
-    "ProjectExtension",
-    "Topic",
-    "TopicDocumentReference",
-    "TopicRelatedTopic",
-    "Version",
-    "ViewPoint",
     "ViewSetupHints",
     "VisualizationInfo",
     "VisualizationInfoBitmap",

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

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

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

@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import List, Optional
 
 from xsdata.models.datatype import XmlDateTime
 
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
     reference: str = field(
         metadata={
@@ -41,7 +38,7 @@ class BimSnippet:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
     class Meta:
         global_type = False
@@ -56,7 +53,7 @@ class CommentViewpoint:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFile:
     class Meta:
         global_type = False
@@ -112,7 +109,7 @@ class HeaderFile:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReference:
     class Meta:
         global_type = False
@@ -150,7 +147,7 @@ class TopicDocumentReference:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopic:
     class Meta:
         global_type = False
@@ -165,7 +162,7 @@ class TopicRelatedTopic:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
     viewpoint: Optional[str] = field(
         default=None,
@@ -201,7 +198,7 @@ class ViewPoint:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
     date: XmlDateTime = field(
         metadata={
@@ -261,9 +258,9 @@ class Comment:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
-    file: list[HeaderFile] = field(
+    file: List[HeaderFile] = field(
         default_factory=list,
         metadata={
             "name": "File",
@@ -274,9 +271,9 @@ class Header:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
-    reference_link: list[str] = field(
+    reference_link: List[str] = field(
         default_factory=list,
         metadata={
             "name": "ReferenceLink",
@@ -308,7 +305,7 @@ class Topic:
             "namespace": "",
         },
     )
-    labels: list[str] = field(
+    labels: List[str] = field(
         default_factory=list,
         metadata={
             "name": "Labels",
@@ -388,7 +385,7 @@ class Topic:
             "namespace": "",
         },
     )
-    document_reference: list[TopicDocumentReference] = field(
+    document_reference: List[TopicDocumentReference] = field(
         default_factory=list,
         metadata={
             "name": "DocumentReference",
@@ -396,7 +393,7 @@ class Topic:
             "namespace": "",
         },
     )
-    related_topic: list[TopicRelatedTopic] = field(
+    related_topic: List[TopicRelatedTopic] = field(
         default_factory=list,
         metadata={
             "name": "RelatedTopic",
@@ -428,7 +425,7 @@ class Topic:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
     header: Optional[Header] = field(
         default=None,
@@ -446,7 +443,7 @@ class Markup:
             "required": True,
         }
     )
-    comment: list[Comment] = field(
+    comment: List[Comment] = field(
         default_factory=list,
         metadata={
             "name": "Comment",
@@ -454,7 +451,7 @@ class Markup:
             "namespace": "",
         },
     )
-    viewpoints: list[ViewPoint] = field(
+    viewpoints: List[ViewPoint] = field(
         default_factory=list,
         metadata={
             "name": "Viewpoints",

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

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

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

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

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

@@ -1,9 +1,6 @@
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional
 
 
 class BitmapFormat(Enum):
@@ -11,7 +8,7 @@ class BitmapFormat(Enum):
     JPG = "JPG"
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
     originating_system: Optional[str] = field(
         default=None,
@@ -38,7 +35,7 @@ class Component:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
     x: float = field(
         metadata={
@@ -63,7 +60,7 @@ class Direction:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
     x: float = field(
         metadata={
@@ -88,7 +85,7 @@ class Point:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
     spaces_visible: Optional[bool] = field(
         default=None,
@@ -113,7 +110,7 @@ class ViewSetupHints:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
     location: Point = field(
         metadata={
@@ -131,12 +128,12 @@ class ClippingPlane:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
     class Meta:
         global_type = False
 
-    component: list[Component] = field(
+    component: List[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -154,9 +151,9 @@ class ComponentColoringColor:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
-    component: list[Component] = field(
+    component: List[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -166,12 +163,12 @@ class ComponentSelection:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
     class Meta:
         global_type = False
 
-    component: list[Component] = field(
+    component: List[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -181,7 +178,7 @@ class ComponentVisibilityExceptions:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
     start_point: Point = field(
         metadata={
@@ -199,7 +196,7 @@ class Line:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
     """
     Attributes
@@ -239,7 +236,7 @@ class OrthogonalCamera:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
     """
     Attributes
@@ -284,7 +281,7 @@ class PerspectiveCamera:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmap:
     class Meta:
         global_type = False
@@ -333,9 +330,9 @@ class VisualizationInfoBitmap:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
-    color: list[ComponentColoringColor] = field(
+    color: List[ComponentColoringColor] = field(
         default_factory=list,
         metadata={
             "name": "Color",
@@ -345,7 +342,7 @@ class ComponentColoring:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
     exceptions: Optional[ComponentVisibilityExceptions] = field(
         default=None,
@@ -363,12 +360,12 @@ class ComponentVisibility:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
     class Meta:
         global_type = False
 
-    clipping_plane: list[ClippingPlane] = field(
+    clipping_plane: List[ClippingPlane] = field(
         default_factory=list,
         metadata={
             "name": "ClippingPlane",
@@ -377,12 +374,12 @@ class VisualizationInfoClippingPlanes:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
     class Meta:
         global_type = False
 
-    line: list[Line] = field(
+    line: List[Line] = field(
         default_factory=list,
         metadata={
             "name": "Line",
@@ -392,7 +389,7 @@ class VisualizationInfoLines:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
     view_setup_hints: Optional[ViewSetupHints] = field(
         default=None,
@@ -424,7 +421,7 @@ class Components:
     )
 
 
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
     """
     VisualizationInfo documentation.
@@ -465,7 +462,7 @@ class VisualizationInfo:
             "type": "Element",
         },
     )
-    bitmap: list[VisualizationInfoBitmap] = field(
+    bitmap: List[VisualizationInfoBitmap] = field(
         default_factory=list,
         metadata={
             "name": "Bitmap",

src/bcf/bcf/v2/topic.py

@@ -1,12 +1,11 @@
 """BCF XML V2 Topic handler."""
 
-from __future__ import annotations
 import datetime
 import tempfile
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional, Union
+from typing import Any, NoReturn, Optional
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -28,9 +27,9 @@ class TopicHandler:
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> None:
         self._markup: Optional[mdl.Markup] = None
-        self._viewpoints: Optional[dict[str, VisualizationInfoHandler]] = None
-        self._reference_files: Optional[dict[str, bytes]] = None
-        self._document_references: Optional[dict[str, bytes]] = None
+        self._viewpoints: dict[str, VisualizationInfoHandler] = {}
+        self._reference_files: dict[str, bytes] = {}
+        self._document_references: dict[str, bytes] = {}
         self._bim_snippet: Optional[bytes] = None
         self._xml_handler = xml_handler or XmlParserSerializer()
         self._topic_dir = topic_dir
@@ -64,21 +63,11 @@ class TopicHandler:
         """Return the header of the topic."""
         return self.markup.header if self.markup else None
 
-    @header.setter
-    def header(self, header: mdl.Header) -> None:
-        """Set the header of the topic."""
-        self.markup.header = header
-
     @property
     def comments(self) -> list[mdl.Comment]:
         """Return the comments of the topic."""
         return self.markup.comment if self.markup else []
 
-    @comments.setter
-    def comments(self, comments: list[mdl.Comment]) -> None:
-        assert self.markup
-        self.markup.comment = comments
-
     @property
     def bim_snippet(self) -> Optional[bytes]:
         if not self._bim_snippet and self._topic_dir:
@@ -91,24 +80,14 @@ class TopicHandler:
 
     @property
     def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._viewpoints is None:
+        if not self._viewpoints and self._topic_dir:
             self._viewpoints = self._load_viewpoints()
         return self._viewpoints
 
-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._topic_dir and self.markup and (viewpoints := self.markup.viewpoints):
-            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
-        return {}
-
     @property
     def reference_files(self) -> dict[str, bytes]:
-        if self._reference_files is not None:
+        if self._reference_files or not self.header:
             return self._reference_files
-
-        self._reference_files = {}
-        if not self.header:
-            return self._reference_files
-
         for ref in self.header.file:
             if ref.is_external:
                 continue
@@ -120,13 +99,8 @@ class TopicHandler:
 
     @property
     def document_references(self) -> dict[str, bytes]:
-        if self._document_references is not None:
+        if self._document_references or not self.topic:
             return self._document_references
-
-        self._document_references = {}
-        if not self.topic:
-            return self._document_references
-
         for doc in self.topic.document_reference:
             if doc.is_external or not doc.referenced_document:
                 continue
@@ -144,6 +118,11 @@ class TopicHandler:
                 return bim_snippet_path.read_bytes()
         return None
 
+    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+        if self.markup and (viewpoints := self.markup.viewpoints):
+            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
+        return {}
+
     @classmethod
     def create_new(
         cls,
@@ -153,7 +132,7 @@ class TopicHandler:
         topic_type: str = "",
         topic_status: str = "",
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
         """
         Create a new BCF topic.
 
@@ -192,8 +171,6 @@ class TopicHandler:
             bcf_zip: The BCF zip file to save to.
         """
         topic_dir = self.guid
-        # simulating directory creation (ZipFile in python < 3.11 doesn't have mkdir)
-        destination_zip.writestr(f"{topic_dir}/", "")
         self._save_xml(destination_zip, self._markup, "markup.bcf")
         self._save_viewpoints(destination_zip, topic_dir)
         self._save_bim_snippet(destination_zip)
@@ -243,7 +220,55 @@ class TopicHandler:
                 real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
             destination_zip.writestr(real_path.at, self.document_references[doc.referenced_document])
 
-    def add_viewpoint(self, element: entity_instance) -> VisualizationInfoHandler:
+    def extract_file(self, entity, outfile: Optional[Path] = None) -> Path:
+        """Extracts an element with a file into a temporary directory
+
+        These include header files, bim snippets, document references, and
+        viewpoint bitmaps. External reference are not downloaded. Instead, the
+        URI reference is returned.
+
+        :param entity: The entity with a file reference to extract
+        :type entity: bcf.v2.model.HeaderFile,bcf.v2.model.BimSnippet,bcf.v2.model.TopicDocumentReference
+        :param outfile: If provided, save the header file to that location.
+            Otherwise, a temporary directory is created and the filename is
+            derived from the header's original filename.
+        :type outfile: pathlib.Path,optional
+        :return: The filepath of the extracted file. It may be a URL if the
+            header file is external.
+        :rtype: Path
+        """
+        if hasattr(entity, "reference"):
+            reference = entity.reference
+        else:
+            reference = entity.referenced_document
+
+        if not reference:
+            return
+
+        if getattr(entity, "is_external", False):
+            return entity.reference
+
+        resolved_reference = self._topic_dir
+
+        for part in Path(reference).parts:
+            if part == "..":
+                resolved_reference = resolved_reference.parent
+            else:
+                resolved_reference = resolved_reference.joinpath(part)
+
+        if not outfile:
+            if getattr(entity, "filename", None):
+                filename = entity.filename
+            else:
+                filename = resolved_reference.name
+            outfile = Path(tempfile.mkdtemp()) / filename
+
+        with open(outfile, "wb") as f:
+            f.write(resolved_reference.read_bytes())
+
+        return outfile
+
+    def add_viewpoint(self, element: entity_instance) -> None:
         """Add a viewpoint pointed at the placement of an IFC element to the topic.
 
         Args:
@@ -253,9 +278,7 @@ class TopicHandler:
         self.add_visinfo_handler(new_viewpoint)
         return new_viewpoint
 
-    def add_viewpoint_from_point_and_guids(
-        self, position: NDArray[np.float64], *guids: str
-    ) -> VisualizationInfoHandler:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None:
         """Add a viewpoint pointing at an XYZ point in space
 
         Args:
@@ -268,17 +291,9 @@ class TopicHandler:
         self.add_visinfo_handler(vi_handler)
         return vi_handler
 
-    def add_visinfo_handler(
-        self, new_viewpoint: VisualizationInfoHandler, snapshot_filename: Optional[str] = None
-    ) -> mdl.ViewPoint:
+    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
         self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
-        viewpoint = mdl.ViewPoint(
-            viewpoint=new_viewpoint.guid + ".bcfv",
-            snapshot=snapshot_filename,
-            guid=new_viewpoint.guid,
-        )
-        self.markup.viewpoints.append(viewpoint)
-        return viewpoint
+        self.markup.viewpoints.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid))
 
     def __eq__(self, other: object) -> bool | NoReturn:
         return (