-
Notifications
You must be signed in to change notification settings - Fork 38
Fix compatibility with roslibpy 2.0.0 and improve CI build system #453
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 7 commits
63ff3b6
27158d3
000629d
2b65525
190d1e4
5bebc93
6a9521a
1c0f0ee
f3db57a
3214051
a6c4bfe
0826764
41f8f7e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,8 @@ on: | |
| push: | ||
| branches: | ||
| - main | ||
| - LTS-main-1.x | ||
| - wip | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - LTS-main-1.x | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
@@ -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 | ||
|
|
||
| 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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @copilot fix this to download specifically 1.8.1: There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
| 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 . |
| 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 |
There was a problem hiding this comment.
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)There was a problem hiding this comment.
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.