COMPAS FAB 2.0 release

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.2
+current_version = 1.1.0
 message = Bump version to {new_version}
 commit = True
 tag = True
@@ -21,6 +21,6 @@ replace = __version__ = "{new_version}"
 search = Unreleased
 replace = [{new_version}] {now:%Y-%m-%d}
 
-[bumpversion:glob:src/compas_fab/ghpython/components/**/code.py]
+[bumpversion:glob:src/compas_fab/ghpython/components_cpython/**/code.py]
 search = v{current_version}
 replace = v{new_version}

.github/workflows/build.yml

@@ -4,20 +4,45 @@ on:
   push:
     branches:
       - main
-      - wip
   pull_request:
+    branches:
+      - main
 
 jobs:
   build:
     if: "!contains(github.event.pull_request.labels.*.name, 'docs-only')"
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.8', '3.9', '3.10']
+        python: ['3.9', '3.13']
 
     steps:
-      - uses: compas-dev/compas-actions.build@v3
+      - uses: compas-dev/compas-actions.build@v5
+        env:
+          CFLAGS: ${{ startsWith(matrix.os, 'macos') && '-fno-define-target-os-macros' || '' }}
         with:
           python: ${{ matrix.python }}
           invoke_lint: true
+
+  build-cpython-components:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v6
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e .[dev]
+
+    - name: Create CPython Grasshopper user objects
+      run: |
+        invoke build-cpython-ghuser-components
+
+    - uses: actions/upload-artifact@v5
+      with:
+        name: compas_fab_components
+        path: src/compas_fab/ghpython/components_cpython/ghuser

.github/workflows/docs.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - LTS-main-1.x
     tags:
       - 'v*'
   pull_request_review:
@@ -14,7 +15,11 @@ jobs:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
     runs-on: ubuntu-latest
     steps:
-      - uses: compas-dev/compas-actions.docs@v3
+      - uses: compas-dev/compas-actions.docs@v5
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           doc_url: https://compas.dev/compas_fab
+          # Site is built with MkDocs (via `invoke docs`); `v5` of the action
+          # added the `generator` switch so it can deploy MkDocs sites in
+          # addition to the original Sphinx flow.
+          generator: mkdocs

.github/workflows/integration.yml

@@ -4,34 +4,52 @@ on:
   push:
     branches:
       - main
-      - wip
   pull_request:
+    branches:
+      - main
+      - LTS-main-1.x
 
 jobs:
   build:
-    name: ubuntu-py38-integration
+    name: ubuntu-py39-integration
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v6
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
-      - name: Set up docker containers
+          python-version: '3.9'
+
+      - name: Bring up both ROS stacks
+        # Defaults: ROS 1 rosbridge on 9090, ROS 2 rosbridge on 9091, ROS 2
+        # HTTP assets on 9092. See `tests/integration_setup/README.md`.
         run: |
-          docker-compose -f "tests/integration_setup/docker-compose.yml" up -d --build
+          docker compose -f tests/integration_setup/docker-compose.yml      up -d --build
+          docker compose -f tests/integration_setup/docker-compose-ros2.yml up -d --build
           docker ps -a
+
       - name: Install dependencies
+        # `pip install -r requirements-dev.txt` alone installs the dev tools
+        # but NOT the package itself nor its runtime deps. The top-level
+        # `conftest.py` then crashes on `from twisted.internet import ...`
+        # because twisted only arrives transitively via `roslibpy` (a runtime
+        # dep). Installing the package with the `[dev]` extra pulls both.
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install wheel
-      - name: Install
-        run: |
-          python -m pip install --no-cache-dir -r requirements-dev.txt
-      - name: Run integration tests
+          python -m pip install --upgrade pip wheel
+          python -m pip install --no-cache-dir -e ".[dev]"
+
+      - name: Run tests + doctests
+        # `COMPAS_FAB_RUN_ROS_INTEGRATION_TESTS=1` opts the `ros1_client` /
+        # `ros2_client` fixtures into actually connecting (otherwise every
+        # integration test is skipped). `--doctest-modules` picks up
+        # doctests embedded in `src/compas_fab/` modules.
+        env:
+          COMPAS_FAB_RUN_ROS_INTEGRATION_TESTS: "1"
         run: |
           pytest --doctest-modules
-          pytest docs
+
       - name: Tear down docker containers
+        if: always()
         run: |
-          docker-compose -f "tests/integration_setup/docker-compose.yml" down
+          docker compose -f tests/integration_setup/docker-compose.yml      down
+          docker compose -f tests/integration_setup/docker-compose-ros2.yml down

.github/workflows/pr-checks.yml

@@ -4,13 +4,14 @@ on:
     types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
+      - LTS-main-1.x
 
 jobs:
   build:
     name: Check Actions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v6
       - name: Changelog check
         uses: Zomzog/changelog-checker@v1.1.0
         with:

.github/workflows/publish_yak.yml

@@ -29,41 +29,17 @@ jobs:
         }
 
     - name: Checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -e .[dev]
 
     - name: Create CPython Grasshopper user objects
       run: |
         invoke build-cpython-ghuser-components
 
-    - name: Create IronPython Grasshopper user objects
-      run: |
-        choco install ironpython --version=2.7.8.1
-        invoke clean
-        invoke build-ghuser-components
-
-    - name: Create Rhino7 Yak package
-      shell: pwsh
-      run: |
-        invoke yakerize -m $Env:YAK_TEMPLATE\manifest.yml -l $Env:YAK_TEMPLATE\icon.png -g $Env:USER_OBJECTS -t rh7
-      env:
-        USER_OBJECTS: src\compas_fab\ghpython\components\ghuser
-        YAK_TEMPLATE: src\compas_fab\ghpython\yak_template
-
-    - name: Publish to Yak server (Rhino 7)
-      shell: pwsh
-      run: |
-        $test_flag = if ($Env:TEST_FLAG) { $Env:TEST_FLAG } else { "" }
-        $file = Get-ChildItem -Path dist\yak_package\*rh7*.yak -File | Select-Object -ExpandProperty Name
-        $command = "invoke publish-yak -y dist\yak_package\$file $test_flag".Trim()
-        Invoke-Expression $command
-      env:
-        YAK_TOKEN: ${{ secrets.YAK_DF_TOKEN }}
-
     - name: Create Rhino8 Yak package
       shell: pwsh
       run: |

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.8', '3.9', '3.10']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: compas-dev/compas-actions.build@v3
@@ -29,8 +29,8 @@ jobs:
           pypi_token: ${{ secrets.PYPI_PASSWORD }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_ghpython_components: true
-          gh_source: src/compas_fab/ghpython/components
-          gh_target: src/compas_fab/ghpython/components/ghuser
+          gh_source: src/compas_fab/ghpython/components_cpython
+          gh_target: src/compas_fab/ghpython/components_cpython/ghuser
           gh_prefix: "COMPAS FAB: "
-          gh_interpreter: "ironpython"
+          gh_interpreter: "cpython"
           release_name_prefix: COMPAS FAB

.gitignore

@@ -117,6 +117,7 @@ docs/generated/*
 
 temp/**
 !temp/.gitkeep
+.DS_Store
 
 # Grasshopper generated objects
-src/compas_fab/ghpython/components/ghuser/*.ghuser
+src/compas_fab/ghpython/components_cpython/ghuser/*.ghuser

AUTHORS.md

@@ -0,0 +1,19 @@
+# Authors
+
+- Gramazio Kohler Research [@gramaziokohler](https://github.com/gramaziokohler)
+- Romana Rust <<rust@arch.ethz.ch>> [@romanarust](https://github.com/romanarust)
+- Gonzalo Casas <<casas@arch.ethz.ch>> [@gonzalocasas](https://github.com/gonzalocasas)
+- Stefana Parascho <<parascho@arch.ethz.ch>> [@stefanaparascho](https://github.com/stefanaparascho)
+- David Jenny <<jenny@arch.ethz.ch>> [@DavidJenny](https://github.com/DavidJenny)
+- Kathrin Dörfler <<doerfler@arch.ethz.ch>> [@kathrindoerfler](https://github.com/kathrindoerfler)
+- Matthias Helmreich <<helmreich@arch.ethz.ch>> [@mhelmrei](https://github.com/mhelmrei)
+- Augusto Gandia <<gandia@arch.ethz.ch>> [@augustogandia](https://github.com/augustogandia)
+- Zhao Ma <<ma@arch.ethz.ch>> [@xarthurx](https://github.com/xarthurx)
+- Inés Ariza <<ariza@arch.ethz.ch>> [@inesariza](https://github.com/inesariza)
+- Matteo Pacher <<pacher@arch.ethz.ch>> [@matteo-pacher](https://github.com/matteo-pacher)
+- Beverly Lytle <<lytle@arch.ethz.ch>> [@beverlylytle](https://github.com/beverlylytle)
+- Yijiang Huang <<yijiangh@mit.edu>> [@yijiangh](https://github.com/yijiangh)
+- Chen Kasirer <<kasirer@arch.ethz.ch>> [@chenkasirer](https://github.com/chenkasirer)
+- Edvard Bruun <<ebruun@princeton.edu>> [@ebruun](https://github.com/ebruun)
+- Victor Pok Yin Leung <<leung@arch.ethz.ch>> [@yck011522](https://github.com/yck011522)
+- Begüm Saral <<begum.saral@tum.de>> [@begums](https://github.com/begums)