Skip to content

Commit b98773d

Browse files
authored
Update may 2023 (#44)
* Fix errors caused by upgrade to swig 4.1.1 * Work on swig updates * Continuing work on swig updates * Work on testing and fixing swig errors * Work updating viewer to new Tesseract version * Bump tesseract_python and tesseract_viewer_python versions * Use custom targets to build python wheels * Work on wrapping tesseract_task_composer * Use _wrap_ functions instead of implicit constructors for command language Poly types * Fix task composer dll loading anchor env variable * Begin adding improved Python documentation * Work on improved documentation * Work on improved documentation * Add collision check example * Add robot kinematics example * Add plugin note to collision checking example * Add note on the resource locator to example * Fix some sphinx warnings * Add planning examples * Update readme * Add resource locator mention * Add examples to sphinx * Add notes to modules * More documentation and usage notes * Update links and add attribution * Add autodoc note * Update documentation name * Use temporary dep repos for build * Use master branch for tesseract dep * Fix missing task composer env variable * Fix tests. Require swig 4.1.1 to avoid memory errors * Build swig version 4.1.1 in wheels build * Install curl on ubuntu wheel build * Add document building to wheel CI * Work on api docs deployment * Work on api docs deployment * Fix api_docs workflow * Fix api_docs workflow * Add support for markers in viewer * Use version 0.153.0 of threejs * Add clear markers by name and tag * Add trajectory plotting using markers * Don't show vr button if not available * Fix tesseract_task_composer_python module link libraries * Update to upstream tesseract_task_composer include files * Fix animations updates and handle multiple websocket connections * Fix unique_ptr swig typemaps * Use trajopt master * Fix UPtr support in Python for tesseract_task_composer * Add documentation notes about make_unique and UPtr cast functions * Fix planning problem uptr constructor and pytests * Swig include task_composer_pipeline.h * Switch order of trajectory list arguments to have joint_names first. Add documentation for viewer * Update readme * Use trajopt master branch * Update generated api docs * Add extract_python_docs.py tool * Add anchor for task_composer_task_plugin_factory * Fix prismatic joints in viewer * Use tesseract_planning master * Fix plugin anchor includes * Use tesseract 0.18.1 and trajopt 0.6.0 * Fix trajopt namespace rename * Use tesseract_planning 0.18.2 * Update docs
1 parent e458c75 commit b98773d

File tree

170 files changed

+9853
-3062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+9853
-3062
lines changed

.github/workflows/api_docs.yml

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
11
name: DeployDocumentation
22

33
on:
4-
push:
5-
branches:
6-
- master
4+
workflow_dispatch:
5+
inputs:
6+
run_number:
7+
description: 'Run number of the wheels workflow to pull documentation from'
8+
required: true
79

810
jobs:
9-
deploy_documentation:
10-
runs-on: ubuntu-18.04
11+
collect_documentation:
12+
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@v1
13-
14-
- name: Build Doxygen Documentation
15-
uses: mattnotmitt/doxygen-action@v1
14+
- uses: dawidd6/action-download-artifact@v2
1615
with:
17-
doxyfile-path: 'doxygen.config'
18-
19-
- name: Deploy Documentation
20-
uses: peaceiris/actions-gh-pages@v3
16+
workflow: 'wheels.yml'
17+
run_number: ${{ github.event.inputs.run_number }}
18+
name: 'python-docs-ubuntu-20.04-3.10'
19+
path: 'docs'
20+
- uses: actions/upload-pages-artifact@v1
2121
with:
22-
github_token: ${{ secrets.GITHUB_TOKEN }}
23-
publish_dir: ./docs
24-
keep_files: true
22+
path: 'docs'
23+
deploy_documentation:
24+
# Add a dependency to the build job
25+
needs: collect_documentation
26+
27+
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
28+
permissions:
29+
pages: write # to deploy to Pages
30+
id-token: write # to verify the deployment originates from an appropriate source
31+
32+
# Deploy to the github-pages environment
33+
environment:
34+
name: github-pages
35+
url: ${{ steps.deployment.outputs.page_url }}
36+
37+
# Specify runner + deployment step
38+
runs-on: ubuntu-latest
39+
steps:
40+
- name: Deploy to GitHub Pages
41+
id: deployment
42+
uses: actions/deploy-pages@v1

.github/workflows/wheels.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- dev
78
pull_request:
89
release:
910
types:
@@ -75,7 +76,13 @@ jobs:
7576
liburdfdom-dev liboctomap-dev liborocos-kdl-dev libpcl-dev
7677
libflann-dev libjsoncpp-dev libyaml-cpp-dev git cmake ninja-build
7778
build-essential autoconf automake libtool bison libpcre2-dev libpcre3-dev
78-
lcov libbullet-dev libbullet-extras-dev python3-venv -y -qq
79+
lcov libbullet-dev libbullet-extras-dev python3-venv curl -y -qq
80+
- name: build-swig
81+
uses: johnwason/swig-build-action@v1
82+
with:
83+
cache-key: ${{ matrix.config.os }}-${{ matrix.config.python_version }}
84+
version: "4.1.1"
85+
7986
- uses: actions/setup-python@v4
8087
id: setup-python
8188
with:
@@ -84,6 +91,7 @@ jobs:
8491
run: |
8592
python -m pip install --upgrade pip
8693
python -m pip install auditwheel wheel numpy setuptools colcon-common-extensions vcstool patchelf
94+
python -m pip install -r ws/src/tesseract_python/docs/requirements.txt
8795
- name: vcs import
8896
working-directory: ws/src
8997
run: vcs import --input tesseract_python/dependencies_with_ext.rosinstall
@@ -100,22 +108,34 @@ jobs:
100108
-DTESSERACT_PYTHON_BUILD_WHEEL=ON
101109
-DTESSERACT_PYTHON_WHEEL_PLATFORM=${{ matrix.config.py_platform }}
102110
-DTESSERACT_ENABLE_EXAMPLES=OFF -DTESSERACT_PLUGIN_FACTORY_CALLBACKS=ON
111+
-DTESSERACT_PYTHON_BUILD_DOCUMENTATION=ON
103112
- name: test
104113
shell: bash
105114
run: |
106115
python3 -m venv venv
107116
source venv/bin/activate
108117
python -m pip install --upgrade pip
109118
python -m pip install ws/build/tesseract_python/python/wheelhouse/*
110-
python -m pip install pytest
119+
python -m pip install pytest
111120
export TESSERACT_SUPPORT_DIR=$GITHUB_WORKSPACE/ws/src/tesseract/tesseract_support
121+
export TESSERACT_TASK_COMPOSER_DIR=$GITHUB_WORKSPACE/ws/src/tesseract_planning/tesseract_task_composer
112122
cd ws/src/tesseract_python/tesseract_python
113123
pytest -s
124+
- name: build docs
125+
shell: bash
126+
working-directory: ws/build/tesseract_python
127+
run: |
128+
cmake --build . --config Release --target tesseract_python_doc
114129
- name: archive wheels
115130
uses: actions/upload-artifact@v2
116131
with:
117132
name: 'python-wheels-${{ matrix.config.os }}-${{ matrix.config.python_version }}'
118133
path: ws/build/tesseract_python/python/*
134+
- name: archive docs
135+
uses: actions/upload-artifact@v2
136+
with:
137+
name: 'python-docs-${{ matrix.config.os }}-${{ matrix.config.python_version }}'
138+
path: ws/build/tesseract_python/docs/*
119139
build-win:
120140
runs-on: windows-2019
121141
strategy:
@@ -152,14 +172,15 @@ jobs:
152172
python-version: '${{ matrix.config.python_version }}'
153173
architecture: ${{ matrix.config.arch }}
154174
- name: vcpkg build
155-
uses: johnwason/vcpkg-action@v4
175+
uses: johnwason/vcpkg-action@v5
156176
with:
157177
pkgs: >-
158178
${{ env.VCPKG_PKGS }}
159179
triplet: ${{ matrix.config.vcpkg_triplet }}
160180
extra-args: --clean-after-build
161181
token: ${{ github.token }}
162182
cache-key: win-${{ matrix.config.arch }}-python-${{ matrix.config.python_version }}
183+
revision: master
163184
- name: pip3
164185
run: |
165186
python -m pip install numpy setuptools wheel pytest delvewheel colcon-common-extensions vcstool
@@ -208,6 +229,7 @@ jobs:
208229
python -m pip install pytest
209230
if %errorlevel% neq 0 exit /b %errorlevel%
210231
set TESSERACT_SUPPORT_DIR=%GITHUB_WORKSPACE%\ws\src\tesseract\tesseract_support
232+
set TESSERACT_TASK_COMPOSER_DIR=%GITHUB_WORKSPACE%\ws\src\tesseract_planning\tesseract_task_composer
211233
if %errorlevel% neq 0 exit /b %errorlevel%
212234
cd %GITHUB_WORKSPACE%\ws\src\tesseract_python\tesseract_python
213235
if %errorlevel% neq 0 exit /b %errorlevel%

.github/workflows/windows_noetic_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ jobs:
4646
if %errorlevel% neq 0 exit /b %errorlevel%
4747
call "%CD%\install_isolated\setup.bat"
4848
set TESSERACT_SUPPORT_DIR=%CD%\src\tesseract\tesseract_support
49+
set TESSERACT_TASK_COMPOSER_DIR=%GITHUB_WORKSPACE%\src\tesseract_planning\tesseract_task_composer
4950
C:/opt/ros/noetic/x64/python.exe -m pytest src\tesseract_python\tesseract_python
5051
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)