Skip to content

Commit ba8aaf1

Browse files
committed
Merge release v25.02
2 parents 9b0c13b + bc8fbe7 commit ba8aaf1

File tree

919 files changed

+47271
-44547
lines changed

Some content is hidden

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

919 files changed

+47271
-44547
lines changed

.github/workflows/pypi.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
- TAG: cp311
3838
INTERPRETER: /opt/python/cp311-cp311/bin/python
3939
VERSION_SPEC: '3.11'
40+
- TAG: cp312
41+
INTERPRETER: /opt/python/cp312-cp312/bin/python
42+
VERSION_SPEC: '3.12'
4043
runs-on: ubuntu-20.04
4144
timeout-minutes: 60
4245
steps:
@@ -109,6 +112,9 @@ jobs:
109112
- VERSION_SPEC: '3.11'
110113
INTERPRETER: python3.11
111114
TAG: cp311
115+
- VERSION_SPEC: '3.12'
116+
INTERPRETER: python3.12
117+
TAG: cp312
112118
runs-on: macos-13
113119
timeout-minutes: 120
114120
steps:
@@ -122,6 +128,7 @@ jobs:
122128
- name: Install dependencies
123129
run: |
124130
${{ matrix.PYTHON.INTERPRETER }} -m pip install --upgrade pip
131+
${{ matrix.PYTHON.INTERPRETER }} -m pip install setuptools
125132
${{ matrix.PYTHON.INTERPRETER }} -m pip install delocate~=0.10.2 wheel
126133
- name: Build USD
127134
run: |
@@ -176,6 +183,8 @@ jobs:
176183
TAG: cp310
177184
- VERSION_SPEC: '3.11'
178185
TAG: cp311
186+
- VERSION_SPEC: '3.12'
187+
TAG: cp312
179188
runs-on: windows-2019
180189
timeout-minutes: 60
181190
steps:
@@ -188,6 +197,7 @@ jobs:
188197
check-latest: false
189198
- name: Install dependencies
190199
run: |
200+
python -m pip install setuptools
191201
python -m pip install wheel
192202
shell: cmd
193203
- name: Build USD
@@ -261,6 +271,10 @@ jobs:
261271
PYTHON_VERSION_SPEC: '3.11'
262272
IMAGE: ubuntu-20.04
263273
PYTHON_INTERPRETER: python3
274+
- NAME: Linux_Python312
275+
PYTHON_VERSION_SPEC: '3.12'
276+
IMAGE: ubuntu-20.04
277+
PYTHON_INTERPRETER: python3
264278
- NAME: Mac_Python38
265279
PYTHON_VERSION_SPEC: '3.8'
266280
IMAGE: macos-13
@@ -277,6 +291,10 @@ jobs:
277291
PYTHON_VERSION_SPEC: '3.11'
278292
IMAGE: macos-13
279293
PYTHON_INTERPRETER: python3
294+
- NAME: Mac_Python312
295+
PYTHON_VERSION_SPEC: '3.12'
296+
IMAGE: macos-13
297+
PYTHON_INTERPRETER: python3
280298
- NAME: Windows_Python38
281299
PYTHON_VERSION_SPEC: '3.8'
282300
IMAGE: windows-2019
@@ -293,6 +311,10 @@ jobs:
293311
PYTHON_VERSION_SPEC: '3.11'
294312
IMAGE: windows-2019
295313
PYTHON_INTERPRETER: python3
314+
- NAME: Windows_Python312
315+
PYTHON_VERSION_SPEC: '3.12'
316+
IMAGE: windows-2019
317+
PYTHON_INTERPRETER: python3
296318
runs-on: ${{ matrix.BUILD_CONFIG.IMAGE }}
297319
steps:
298320
- name: Install Python
@@ -319,4 +341,4 @@ jobs:
319341
name: TEST-usdinstall-${{ matrix.BUILD_CONFIG.NAME }}
320342
path: TEST-usdinstall-${{ matrix.BUILD_CONFIG.NAME }}.xml
321343
# Use always() to always run this step to publish test results when there are test failures
322-
if: ${{ always() }}
344+
if: ${{ always() }}

0 commit comments

Comments
 (0)