Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
branches:
- main
- devel
- 'release/**'
pull_request:
types: [opened, synchronize, reopened]

Expand All @@ -27,8 +28,7 @@ jobs:
- id: trigger-deploy
env:
REPO_NAME: ${{ secrets.REPO_NAME }}
BRANCH_REF: ${{ secrets.BRANCH_REF }}
if: "${{ github.repository == env.REPO_NAME && github.ref == env.BRANCH_REF }}"
if: "${{ github.repository == env.REPO_NAME && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/devel' || startsWith(github.ref, 'refs/heads/release/')) }}"
run: echo "defined=true" >> "$GITHUB_OUTPUT"

build-docs:
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/license-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ jobs:
# - name: Install jq
# run: sudo apt-get update && sudo apt-get install -y jq

- name: Clean up disk space
run: |
rm -rf /opt/hostedtoolcache

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10' # Adjust as needed
python-version: '3.11' # Adjust as needed

- name: Install dependencies using ./isaaclab.sh -i
run: |
# first install isaac sim
pip install --upgrade pip
pip install 'isaacsim[all,extscache]==4.5.0' --extra-index-url https://pypi.nvidia.com
pip install 'isaacsim[all,extscache]==${{ vars.ISAACSIM_BASE_VERSION || '5.0.0' }}' --extra-index-url https://pypi.nvidia.com
chmod +x ./isaaclab.sh # Make sure the script is executable
# install all lab dependencies
./isaaclab.sh -i
Expand All @@ -48,6 +52,12 @@ jobs:
- name: Print License Report
run: pip-licenses --from=mixed --format=markdown

# Print pipdeptree
- name: Print pipdeptree
run: |
pip install pipdeptree
pipdeptree

- name: Check licenses against whitelist and exceptions
run: |
# Define the whitelist of allowed licenses
Expand Down Expand Up @@ -118,9 +128,3 @@ jobs:
else
echo "All packages were checked."
fi

# Print pipdeptree
- name: Print pipdeptree
run: |
pip install pipdeptree
pipdeptree
27 changes: 26 additions & 1 deletion .github/workflows/license-exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
},
{
"package": "typing_extensions",
"license": "UNKNOWN",
"license": "Python Software Foundation License",
"comment": "PSFL / OSRB"
},
{
Expand Down Expand Up @@ -400,5 +400,30 @@
"package": "fsspec",
"license" : "UNKNOWN",
"comment": "BSD"
},
{
"package": "numpy-quaternion",
"license": "UNKNOWN",
"comment": "MIT"
},
{
"package": "aiohappyeyeballs",
"license": "Other/Proprietary License; Python Software Foundation License",
"comment": "PSFL / OSRB"
},
{
"package": "cffi",
"license": "UNKNOWN",
"comment": "MIT"
},
{
"package": "trio",
"license": "UNKNOWN",
"comment": "MIT"
},
{
"package": "pipdeptree",
"license": "UNKNOWN",
"comment": "MIT"
}
]
3 changes: 1 addition & 2 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ name: Run linters using pre-commit

on:
pull_request:
push:
branches: [main]
types: [opened, synchronize, reopened]

jobs:
pre-commit:
Expand Down
3 changes: 2 additions & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ multi-docs:

.PHONY: current-docs
current-docs:
@$(SPHINXBUILD) "$(SOURCEDIR)" "$(BUILDDIR)/current" $(SPHINXOPTS)
@rm -rf "$(BUILDDIR)/current"
@$(SPHINXBUILD) -W --keep-going "$(SOURCEDIR)" "$(BUILDDIR)/current" $(SPHINXOPTS)
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
# Whitelist pattern for remotes
smv_remote_whitelist = r"^.*$"
# Whitelist pattern for branches (set to None to ignore all branches)
smv_branch_whitelist = os.getenv("SMV_BRANCH_WHITELIST", r"^(main|devel)$")
smv_branch_whitelist = os.getenv("SMV_BRANCH_WHITELIST", r"^(main|devel|release/.*)$")
# Whitelist pattern for tags (set to None to ignore all tags)
smv_tag_whitelist = os.getenv("SMV_TAG_WHITELIST", r"^v[1-9]\d*\.\d+\.\d+$")
html_sidebars = {
Expand Down
11 changes: 6 additions & 5 deletions docs/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if "%1" == "multi-docs" (
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-multiversion
)
%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
where %SPHINXBUILD% >NUL 2>NUL
if errorlevel 1 (
echo.
echo.The 'sphinx-multiversion' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
Expand All @@ -37,8 +37,8 @@ if "%1" == "current-docs" (
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
where %SPHINXBUILD% >NUL 2>NUL
if errorlevel 1 (
echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point
Expand All @@ -49,7 +49,8 @@ if "%1" == "current-docs" (
echo.http://sphinx-doc.org/
exit /b 1
)
%SPHINXBUILD% %SOURCEDIR% %BUILDDIR%\current %SPHINXOPTS% %O%
if exist "%BUILDDIR%\current" rmdir /s /q "%BUILDDIR%\current"
%SPHINXBUILD% -W "%SOURCEDIR%" "%BUILDDIR%\current" %SPHINXOPTS%
goto end
)

Expand Down
2 changes: 1 addition & 1 deletion docs/source/api/lab/isaaclab.assets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Asset Base

.. autoclass:: AssetBaseCfg
:members:
:exclude-members: __init__, class_type
:exclude-members: __init__, class_type, InitialStateCfg

Rigid Object
------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/api/lab/isaaclab.sensors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ USD Camera
:members:
:inherited-members:
:show-inheritance:
:exclude-members: __init__, class_type
:exclude-members: __init__, class_type, OffsetCfg

Tile-Rendered USD Camera
------------------------
Expand Down