Skip to content

Commit

Permalink
Merge branch 'ershi/dependency-update' into 'main'
Browse files Browse the repository at this point in the history
Update docs dependencies and pipelines

See merge request omniverse/warp!760
  • Loading branch information
shi-eric committed Sep 29, 2024
2 parents 46c1433 + 0e7f9b3 commit ec49b8a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 13 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ jobs:

pull-request-docs:
runs-on: ubuntu-latest
needs: build-warp-ubuntu
if: ${{ github.event_name == 'pull_request' }}
outputs:
artifact-url: ${{ steps.build-docs-output.outputs.artifact-url }}
Expand All @@ -242,10 +243,15 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Download Warp binaries
uses: actions/download-artifact@v4
with:
name: build-artifact-ubuntu
path: warp/bin/
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/requirements.txt
pip install --no-cache-dir -r docs/requirements.txt
- name: Build Sphinx documentation
run: python build_docs.py
- name: Upload artifacts
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/requirements.txt
pip install --no-cache-dir -r docs/requirements.txt
- name: Build Warp without CUDA Support
run: python build_lib.py
- name: Build Sphinx documentation
run: python build_docs.py
- name: Upload artifacts
Expand All @@ -46,7 +48,7 @@ jobs:
mv docs/_build/html/* .
mv docs/_build/html/.nojekyll .
mv docs/_build/html/.buildinfo .
rm -rf docs warp
rm -rf docs warp _build __pycache__
git add . .nojekyll .buildinfo
git commit -m "Deploy Sphinx documentation"
git push -f origin gh-pages
14 changes: 9 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ruff lint:
- .runner-utility-linux-x86_64
before_script:
- python -m pip install --upgrade pip
- pip install --upgrade ruff==0.5.5
- pip install --upgrade ruff==0.6.8
script:
- ruff check --output-format full --exit-zero # Just to get something in the log
- ruff check --output-format gitlab > gl-code-quality-report.json
Expand All @@ -134,7 +134,7 @@ ruff format:
- .runner-utility-linux-x86_64
before_script:
- python -m pip install --upgrade pip
- pip install --upgrade ruff==0.5.5
- pip install --upgrade ruff==0.6.8
script:
- ruff format --diff

Expand Down Expand Up @@ -395,7 +395,7 @@ linux-x86_64 test warp-init:
# artifacts.
windows-x86_64 docs:
stage: test
needs: []
needs: [windows-x86_64 build]
extends:
- .runner-utility-windows-x86_64
artifacts:
Expand All @@ -405,7 +405,7 @@ windows-x86_64 docs:
- !reference [.snippets, define-powershell-GetTime]
- Write-Output "$([char]27)[0Ksection_start:$(GetTime):install_dependencies[collapsed=true]$([char]13)$([char]27)[0KInstalling dependencies"
- powershell -command "Get-Volume | Format-Table -AutoSize"
- $python_name = $DEFAULT_PYTHON + "-windows-x86_64"
- $python_name = "3.12.6+nv1-windows-x86_64"
- tools/packman/packman.cmd install -l _build/target-deps/python python $python_name
- '& $env:CI_PROJECT_DIR\_build\target-deps\python\python.exe -m venv _venv'
- .\_venv\Scripts\Activate.ps1
Expand Down Expand Up @@ -668,15 +668,19 @@ publish wheels to gitlab package registry:
.build-docs-common:
stage: deploy
image: python:3.11-slim
needs: []
needs: [linux-x86_64 build]
extends:
- .runner-utility-linux-x86_64
artifacts:
paths:
- public
before_script:
- echo -e "\\e[0Ksection_start:`date +%s`:install_dependencies[collapsed=true]\\r\\e[0KSet up docs environment"
- df -h
- apt-get update && apt-get install make --no-install-recommends -y
# Move compiled binaries out of platform-specific directory
- mv warp/bin/linux-x86_64/warp.so warp/bin/
- mv warp/bin/linux-x86_64/warp-clang.so warp/bin/
- python -m pip install --upgrade pip
- python -m pip install -r docs/requirements.txt
- echo -e "\\e[0Ksection_end:`date +%s`:install_dependencies\\r\\e[0K"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ci:
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.5.0
rev: v0.6.8
hooks:
# Run the linter.
- id: ruff
Expand Down
8 changes: 4 additions & 4 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
furo==2024.7.18
sphinx==7.4.7
furo==2024.8.6
sphinx==8.0.2
sphinx_copybutton==0.5.2
numpy==1.26.4
ruff==0.5.5
numpy==2.1.1
ruff==0.6.8

0 comments on commit ec49b8a

Please sign in to comment.