Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']

steps:
- uses: compas-dev/compas-actions.build@v3
- uses: compas-dev/compas-actions.build@v4
with:
python: ${{ matrix.python }}
invoke_lint: true
use_conda: true
37 changes: 25 additions & 12 deletions .github/workflows/ironpython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ on:
push:
branches:
- main
- LTS-main-1.x
- wip
pull_request:
branches:
- main
- LTS-main-1.x

jobs:
build:
Expand All @@ -18,33 +15,49 @@ jobs:
- uses: actions/checkout@v2
- name: Install dependencies
run: |
echo "Installing IronPython..."
choco install ironpython --version=2.7.8.1

echo "Downloading ironpython-pytest..."
curl -o ironpython-pytest.tar.gz -LJO https://pypi.debian.net/ironpython-pytest/latest
curl -o compas.tar.gz -LJO https://pypi.debian.net/COMPAS/latest

echo "Downloading COMPAS..."
curl -o compas.tar.gz -LJO https://pypi.debian.net/COMPAS/COMPAS-2.1.0.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot please update this to https://pypi.debian.net/COMPAS/compas-2.14.1.tar.gz (note the change in casing)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in 3214051. Changed to compas-2.14.1.tar.gz with lowercase filename.


echo "Downloading roslibpy..."
curl -o roslibpy.tar.gz -LJO https://pypi.debian.net/roslibpy/latest

echo "Downloading compas_robots..."
curl -o compas_robots.tar.gz -LJO https://pypi.debian.net/compas_robots/latest

echo "Setting up IronPython environment..."
ipy -X:Frames -m ensurepip

echo "Installing ironpython-pytest..."
ipy -X:Frames -m pip install --no-deps ironpython-pytest.tar.gz

echo "Installing COMPAS..."
ipy -X:Frames -m pip install --no-deps compas.tar.gz

echo "Installing roslibpy..."
ipy -X:Frames -m pip install --no-deps roslibpy.tar.gz
Comment on lines 43 to 44
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot fix this to download specifically 1.8.1: https://pypi.debian.net/roslibpy/roslibpy-1.8.1.tar.gz

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 1c0f0ee. Changed roslibpy download URL to specifically version 1.8.1.

ipy -X:Frames -m pip install --no-deps compas_robots.tar.gz

# untar and rename, these cannot be installed using ironpip because they not longer have a setup.py
tar -xf compas.tar.gz && for /d %i in (compas-*) do ren "%i" compas
tar -xf compas_robots.tar.gz && for /d %i in (compas_robots-*) do ren "%i" compas_robots

echo "Installing compas_robots..."
ipy -X:Frames -m pip install --no-deps compas_robots.tar.gz
- uses: NuGet/setup-nuget@v1.0.5
- uses: compas-dev/compas-actions.ghpython_components@v5
with:
source: src/compas_fab/ghpython/components
target: src/compas_fab/ghpython/components/ghuser
- name: Test import
run: |
echo "Testing import of compas_fab..."
ipy -m compas_fab
env:
IRONPYTHONPATH: ./src;./compas/src;./compas_robots/src
IRONPYTHONPATH: ./src
- name: Run tests
run: |
echo "Running tests..."
ipy tests/ipy_test_runner.py
env:
IRONPYTHONPATH: ./src;./compas/src;./compas_robots/src
IRONPYTHONPATH: ./src
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

### Fixed

* Fixed compatibility issue with `roslibpy 2.0.0` by adding upper bound `< 2` to the dependency constraint.


## [1.1.0] 2025-04-17

Expand Down
15 changes: 15 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: compas_fab
channels:
- conda-forge
- defaults
dependencies:
- python>=3.9
- pip
- compas >= 2.0.4, < 3
- compas_robots >= 0.3, < 1
- roslibpy >= 1.1, < 2
- pyserial
- pybullet
- pip:
- -r requirements-dev.txt
- -e .
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
compas >= 2.0.4, < 3
compas_robots >= 0.3, < 1
roslibpy >= 1.1.0
roslibpy >= 1.1, < 2
pyserial
Loading