Merge branch 'main' into webservices

.bumpversion.cfg

@@ -1,25 +1,21 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 2.0.0
 message = Bump version to {new_version}
 commit = True
 tag = True
 
-[bumpversion:file:docs/conf.py]
-search = version = release = '{current_version}'
-replace = version = release = '{new_version}'
-
 [bumpversion:file:docs/doc_versions.txt]
 search = {current_version}
 replace = {new_version}
 	{current_version}
 
 [bumpversion:file:CHANGELOG.md]
 search = Unreleased
-replace = {new_version}
+replace = [{new_version}] {now:%Y-%m-%d}
 
 [bumpversion:file:src/compas_rrc/__version__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
 
 [bumpversion:glob:docker/**/docker-compose.yml]
 search = compasrrc/compas_rrc_driver:v{current_version}

.github/workflows/build.yml

@@ -9,64 +9,16 @@ on:
       - main
 
 jobs:
-  build-cpython:
+  build:
+    if: "!contains(github.event.pull_request.labels.*.name, 'docs-only')"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        name: [
-          "windows-py38",
-          "macos-py37",
-          "ubuntu-py39",
-        ]
-        include:
-          - name: "windows-py38"
-            os: windows-latest
-            python-version: 3.8
-          - name: "macos-py37"
-            os: macos-latest
-            python-version: 3.7
-          - name: "ubuntu-py39"
-            os: ubuntu-latest
-            python-version: 3.9
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python: ['3.8', '3.9', '3.10']
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: compas-dev/compas-actions.build@v3
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install wheel
-          python -m pip install cython --install-option="--no-cython-compile"
-      - name: Install
-        run: |
-          python -m pip install --no-cache-dir -r requirements-dev.txt
-      - name: Run linter
-        run: |
-          invoke lint
-      - name: Run tests
-        run: |
-          pytest
-  build-ironpython:
-    name: windows-ironpython
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          curl -o compas.tar.gz -LJO https://pypi.debian.net/compas/latest
-          curl -o compas_fab.tar.gz -LJO https://pypi.debian.net/compas_fab/latest
-          curl -o roslibpy.tar.gz -LJO https://pypi.debian.net/roslibpy/latest
-          curl -o ironpython-pytest.tar.gz -LJO https://pypi.debian.net/ironpython-pytest/latest
-          choco install ironpython --version=2.7.8.1
-          ipy -X:Frames -m ensurepip
-          ipy -X:Frames -m pip install --no-deps compas.tar.gz
-          ipy -X:Frames -m pip install --no-deps compas_fab.tar.gz
-          ipy -X:Frames -m pip install --no-deps roslibpy.tar.gz
-          ipy -X:Frames -m pip install --no-deps ironpython-pytest.tar.gz
-      - name: Run tests
-        env:
-          IRONPYTHONPATH: ./src
-        run: |
-          ipy tests/ipy_test_runner.py
+          python: ${{ matrix.python }}
+          invoke_lint: true

.github/workflows/docs.yml

@@ -0,0 +1,20 @@
+name: docs
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  docs:
+    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
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          doc_url: https://compas-rrc.github.io/compas_rrc

.github/workflows/ironpython.yml

@@ -0,0 +1,45 @@
+name: ironpython
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: windows-ironpython
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          choco install ironpython --version=2.7.8.1
+          curl -o ironpython-pytest.tar.gz -LJO https://pypi.debian.net/ironpython-pytest/latest
+          curl -o roslibpy.tar.gz -LJO https://pypi.debian.net/roslibpy/latest
+          curl -o compas.tar.gz -LJO https://pypi.debian.net/compas/latest
+          curl -o compas_robots.tar.gz -LJO https://pypi.debian.net/compas_robots/latest
+          curl -o compas_fab.tar.gz -LJO https://pypi.debian.net/compas_fab/latest
+          ipy -X:Frames -m ensurepip
+          ipy -X:Frames -m pip install --no-deps ironpython-pytest.tar.gz
+          ipy -X:Frames -m pip install --no-deps roslibpy.tar.gz
+          ipy -X:Frames -m pip install --no-deps compas.tar.gz
+          ipy -X:Frames -m pip install --no-deps compas_robots.tar.gz
+          ipy -X:Frames -m pip install --no-deps compas_fab.tar.gz
+    #   - uses: NuGet/[email protected]
+    #   - uses: compas-dev/compas-actions.ghpython_components@v5
+    #     with:
+    #       source: src/compas_rrc/ghpython/components
+    #       target: src/compas_rrc/ghpython/components/ghuser
+      - name: Test import
+        run: |
+          ipy -c "import compas_rrc"
+        env:
+          IRONPYTHONPATH: ./src
+      - name: Run tests
+        run: |
+          ipy tests/ipy_test_runner.py
+        env:
+          IRONPYTHONPATH: ./src

.github/workflows/pr-checks.yml

@@ -10,7 +10,7 @@ jobs:
     name: Check Actions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Changelog check
         uses: Zomzog/[email protected]
         with:

.github/workflows/release.yml

@@ -0,0 +1,36 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+name: Create Release
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python: ['3.8', '3.9', '3.10']
+
+    steps:
+      - uses: compas-dev/compas-actions.build@v3
+        with:
+          python: ${{ matrix.python }}
+          invoke_lint: true
+          check_import: true
+
+  publish:
+    needs: build
+    runs-on: windows-latest
+    steps:
+      - uses: compas-dev/compas-actions.publish@v2
+        with:
+          pypi_token: ${{ secrets.PYPI_PASSWORD }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          build_ghpython_components: false
+        #   gh_source: src/compas_rrc/ghpython/components
+        #   gh_target: src/compas_rrc/ghpython/components/ghuser
+        #   gh_prefix: "COMPAS RRC: "
+          gh_interpreter: "ironpython"
+          release_name_prefix: COMPAS RRC

.gitignore

@@ -109,5 +109,6 @@ ENV/
 
 # autogenerated sphinx
 docs/reference/generated/
+docs/api/generated/
 
 /temp/

CHANGELOG.md

@@ -9,35 +9,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* Added `to_configuration` and `to_configuration_primitive` to `compas_rrc.ExternalAxes` and `compas_rrc.RobotJoints`
 * Add `is_connected` property to `AbbClient`
 
 ### Changed
 
 * Changed all instructions to inherit from `BaseInstruction` instead of `ROSMsg`.
 * Changed `MoveGeneric` to require new interface arguments on the constructor.
 
-### Fixed
-
-### Deprecated
-
 ### Removed
 
-## 1.1.0
+
+## [2.0.0] 2024-03-28
 
 ### Added
 
-* Prepared github actions for continuous integration
-* Added compas plugin for automatic Rhino install
+* Added `to_configuration` and `to_configuration_primitive` to `compas_rrc.ExternalAxes` and `compas_rrc.RobotJoints`
 
 ### Changed
 
-### Fixed
-
-### Deprecated
+* Update minimum requirements to `compas_fab > 1.x` and `compas > 2.x`
 
 ### Removed
 
+## 1.1.0
+
+### Added
+
+* Prepared github actions for continuous integration
+* Added compas plugin for automatic Rhino install
+
 ## 1.0.0
 
 * Initial version

CITATION.cff

@@ -12,7 +12,7 @@ authors:
   orcid: "https://orcid.org/0000-0000-0000-0000"
 title: "COMPAS RRC: Online control for ABB robots over a simple-to-use Python interface."
 doi: 10.5281/zenodo.4639418
-version: v1.1.0
+version: v2.0.0
 date-released: 2020-07-03
 repository-code: "https://github.com/compas-rrc/compas_rrc"
 url: "https://compas-rrc.github.io/compas_rrc"

MANIFEST.in

@@ -11,9 +11,11 @@ include .editorconfig
 
 include AUTHORS.rst
 include CHANGELOG.md
+include CITATION.cff
 include CONTRIBUTING.rst
 include LICENSE
 include README.rst
+include requirements.txt
 
 include requirements-dev.txt tasks.py pytest.ini
 

docker/real_controller_one_robot/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   ros-master:
-    image: compasrrc/compas_rrc_driver:v1.1.0
+    image: compasrrc/compas_rrc_driver:v2.0.0
     container_name: ros-master
     environment:
       - ROS_HOSTNAME=ros-master
@@ -12,7 +12,7 @@ services:
       - roscore
 
   ros-bridge:
-    image: compasrrc/compas_rrc_driver:v1.1.0
+    image: compasrrc/compas_rrc_driver:v2.0.0
     container_name: ros-bridge
     environment:
       - ROS_HOSTNAME=ros-bridge
@@ -29,7 +29,7 @@ services:
       - unregister_timeout:=28800      # This horribly long timeout of 8 hours is to workaround this issue: https://github.com/RobotWebTools/rosbridge_suite/issues/138
 
   abb-driver-1:
-    image: compasrrc/compas_rrc_driver:v1.1.0
+    image: compasrrc/compas_rrc_driver:v2.0.0
     container_name: abb-driver-1
     environment:
       - ROS_HOSTNAME=abb-driver-1