Skip to content

Commit

Permalink
Merge release v25.02
Browse files Browse the repository at this point in the history
  • Loading branch information
pixar-oss committed Jan 21, 2025
2 parents 9b0c13b + bc8fbe7 commit ba8aaf1
Show file tree
Hide file tree
Showing 919 changed files with 47,271 additions and 44,547 deletions.
24 changes: 23 additions & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
- TAG: cp311
INTERPRETER: /opt/python/cp311-cp311/bin/python
VERSION_SPEC: '3.11'
- TAG: cp312
INTERPRETER: /opt/python/cp312-cp312/bin/python
VERSION_SPEC: '3.12'
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -109,6 +112,9 @@ jobs:
- VERSION_SPEC: '3.11'
INTERPRETER: python3.11
TAG: cp311
- VERSION_SPEC: '3.12'
INTERPRETER: python3.12
TAG: cp312
runs-on: macos-13
timeout-minutes: 120
steps:
Expand All @@ -122,6 +128,7 @@ jobs:
- name: Install dependencies
run: |
${{ matrix.PYTHON.INTERPRETER }} -m pip install --upgrade pip
${{ matrix.PYTHON.INTERPRETER }} -m pip install setuptools
${{ matrix.PYTHON.INTERPRETER }} -m pip install delocate~=0.10.2 wheel
- name: Build USD
run: |
Expand Down Expand Up @@ -176,6 +183,8 @@ jobs:
TAG: cp310
- VERSION_SPEC: '3.11'
TAG: cp311
- VERSION_SPEC: '3.12'
TAG: cp312
runs-on: windows-2019
timeout-minutes: 60
steps:
Expand All @@ -188,6 +197,7 @@ jobs:
check-latest: false
- name: Install dependencies
run: |
python -m pip install setuptools
python -m pip install wheel
shell: cmd
- name: Build USD
Expand Down Expand Up @@ -261,6 +271,10 @@ jobs:
PYTHON_VERSION_SPEC: '3.11'
IMAGE: ubuntu-20.04
PYTHON_INTERPRETER: python3
- NAME: Linux_Python312
PYTHON_VERSION_SPEC: '3.12'
IMAGE: ubuntu-20.04
PYTHON_INTERPRETER: python3
- NAME: Mac_Python38
PYTHON_VERSION_SPEC: '3.8'
IMAGE: macos-13
Expand All @@ -277,6 +291,10 @@ jobs:
PYTHON_VERSION_SPEC: '3.11'
IMAGE: macos-13
PYTHON_INTERPRETER: python3
- NAME: Mac_Python312
PYTHON_VERSION_SPEC: '3.12'
IMAGE: macos-13
PYTHON_INTERPRETER: python3
- NAME: Windows_Python38
PYTHON_VERSION_SPEC: '3.8'
IMAGE: windows-2019
Expand All @@ -293,6 +311,10 @@ jobs:
PYTHON_VERSION_SPEC: '3.11'
IMAGE: windows-2019
PYTHON_INTERPRETER: python3
- NAME: Windows_Python312
PYTHON_VERSION_SPEC: '3.12'
IMAGE: windows-2019
PYTHON_INTERPRETER: python3
runs-on: ${{ matrix.BUILD_CONFIG.IMAGE }}
steps:
- name: Install Python
Expand All @@ -319,4 +341,4 @@ jobs:
name: TEST-usdinstall-${{ matrix.BUILD_CONFIG.NAME }}
path: TEST-usdinstall-${{ matrix.BUILD_CONFIG.NAME }}.xml
# Use always() to always run this step to publish test results when there are test failures
if: ${{ always() }}
if: ${{ always() }}
Loading

0 comments on commit ba8aaf1

Please sign in to comment.