Skip to content

Commit 0b18ad3

Browse files
pixar-osspixar-oss
committed
Merge release v23.11
2 parents 10b6243 + a4cad2f commit 0b18ad3

File tree

1,039 files changed

+36006
-17441
lines changed

Some content is hidden

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

1,039 files changed

+36006
-17441
lines changed

‎CHANGELOG.md‎

Lines changed: 539 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Build Status
1212

1313
| | Linux | Windows | macOS |
1414
|:-------:|:---------:|:---------:|:---------:|
15-
| dev | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=dev&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=dev&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=dev&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=dev) |
16-
| release | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=release&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=release&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/USD/_apis/build/status/PixarAnimationStudios.USD?branchName=release&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/USD/_build/latest?definitionId=2&branchName=release) |
15+
| dev | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=dev&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=dev) |
16+
| release | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=Linux)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=Windows)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) | [![Build Status](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_apis/build/status/PixarAnimationStudios.OpenUSD?branchName=release&jobName=macOS)](https://dev.azure.com/PixarAnimationStudios/OpenUSD/_build/latest?definitionId=2&branchName=release) |
1717

1818
Additional Documentation
1919
------------------------
@@ -30,7 +30,7 @@ Need help understanding certain concepts in USD? See
3030
visit our [forum](https://groups.google.com/forum/#!forum/usd-interest).
3131

3232
If you are experiencing undocumented problems with the software, please
33-
[file a bug](https://github.com/PixarAnimationStudios/USD/issues/new).
33+
[file a bug](https://github.com/PixarAnimationStudios/OpenUSD/issues/new).
3434

3535
Supported Platforms
3636
-------------------
@@ -107,10 +107,10 @@ additional documentation for running cmake directly.
107107

108108
#### 2. Download the USD source code
109109

110-
You can download source code archives from [GitHub](https://www.github.com/PixarAnimationStudios/USD) or use `git` to clone the repository.
110+
You can download source code archives from [GitHub](https://www.github.com/PixarAnimationStudios/OpenUSD) or use `git` to clone the repository.
111111

112112
```
113-
> git clone https://github.com/PixarAnimationStudios/USD
113+
> git clone https://github.com/PixarAnimationStudios/OpenUSD
114114
Cloning into 'USD'...
115115
```
116116

‎VERSIONS.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ about which are required and which are optional for the various subsystems.
99

1010
## Tested
1111

12-
Our test machines have the following software versions installed
12+
Our test machines have the following software versions installed.
1313

1414
| Software | Linux | macOS | Windows |
1515
| ------------- | -------------------- | ---------------------------- | ------------------------------ |
1616
| OS | CentOS Linux 7 | 10.15.7 | Windows 10 |
17-
| C++ Compiler | gcc 6.3.1 | Apple clang 12.0.0 (Xcode 12.4) | Visual Studio 2017 15.9 |
18-
| CMake | 3.14.6 | 3.19.5 | 3.16.5 |
19-
| Python | 3.6.8 | 3.7.7 | 3.7.4, 3.8.10 |
20-
| Boost | 1.70.0 | 1.76.0 | 1.70.0 |
21-
| Intel TBB | 2019 Update 6 | 2018 Update 1, 2019 Update 6 | 2019 Update 6 |
22-
| OpenSubdiv | 3.5.0 | 3.5.0 | 3.5.0 |
23-
| OpenImageIO | 2.1.16.0 | 2.3.15.0 | 2.1.16.0 |
24-
| OpenColorIO | 1.1.0 | 1.1.0 | 1.1.0 |
17+
| C++ Compiler | gcc 9.3.1 | Apple clang 13.1.6 (Xcode 13.3) | Visual Studio 2017 15.9 |
18+
| CMake | 3.17.5 | 3.19.5 | 3.25.3 |
19+
| Python | 3.9.16 | 3.9.13 | 3.9.13 |
20+
| Boost | 1.76.0 | 1.78.0 | 1.76.0 |
21+
| Intel TBB | 2020 Update 3 | 2018 Update 1, 2020 Update 3 | 2020 Update 3 |
22+
| OpenSubdiv | 3.5.1 | 3.5.1 | 3.5.1 |
23+
| OpenImageIO | 2.3.21.0 | 2.3.21.0 | 2.3.21.0 |
24+
| OpenColorIO | 2.1.3 | 2.1.3 | 2.1.3 |
2525
| OSL | 1.10.9 | | |
26-
| Ptex | 2.3.2 | 2.1.33 | 2.1.33 |
27-
| Qt for Python | PySide2 5.14.1 | PySide6 6.3.1 | PySide2 5.14.1 |
26+
| Ptex | 2.4.2 | 2.4.2 | 2.4.2 |
27+
| Qt for Python | PySide2 5.15.2.1 | PySide6 6.3.1 | PySide2 5.15.2.1 |
2828
| PyOpenGL | 3.1.5 | 3.1.5 | 3.1.5 |
2929
| Embree | 3.2.2 | 3.13.3 | 3.2.2 |
3030
| RenderMan | 24.4, 25.0 | 24.4, 25.0 | 24.4, 25.0 |
31-
| Alembic | 1.7.10 | 1.8.3 | 1.7.10 |
32-
| OpenEXR | 2.4.3 | 2.4.3 | 2.5.2 |
31+
| Alembic | 1.8.5 | 1.8.5 | 1.8.5 |
32+
| OpenEXR | 3.1.11 | 3.1.11 | 3.1.11 |
3333
| MaterialX | 1.38.7 | 1.38.7 | 1.38.7 |
3434
| Jinja2 | 2.0 | | |
3535
| Flex | 2.5.39 | | |
3636
| Bison | 2.4.1 | | |
37-
| Doxygen | 1.8.14 | | |
37+
| Doxygen | 1.9.6 | | |
3838
| GraphViz | 2.40.1 | | |
39-
| OpenVDB | 7.1.0 | 7.1.0 | 7.1.0 |
39+
| OpenVDB | 9.1.0 | 7.1.0, 9.1.0 | 9.1.0 |
4040
| Vulkan SDK | 1.2.135.0 | 1.2.135.0 | 1.2.135.0 |
4141
| Draco | 1.3.6 | 1.3.6 | 1.3.6 |

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- job: macOS
2626
timeoutInMinutes: 120
2727
pool:
28-
vmImage: 'macOS-11'
28+
vmImage: 'macOS-12'
2929
steps:
3030
- script: |
3131
# Update PATH to ensure that pyside2-uic can be found
3232
export PATH=/Library/Frameworks/Python.framework/Versions/3.11/bin:$PATH
33-
sudo xcode-select -s /Applications/Xcode_13.2.app/Contents/Developer
33+
sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
3434
# Set SYSTEM_VERSION_COMPAT while installing Python packages to
3535
# accommodate the macOS version numbering change from 10.x to 11
3636
export SYSTEM_VERSION_COMPAT=1

‎azure-pypi-pipeline.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
name: PyPI_Packaging
22

3-
# Trigger this build whenever this pipeline file is changed, or when setup.py
4-
# or other supporting files are updated. This way we will build new pypi
5-
# packages each time we update the version number, or any other information
6-
# listed here or in setup.py, like supported python versions.
3+
# Trigger this build whenever the dev or release branches are updated,
4+
# or on pull requests that affect PyPI-related files.
5+
#
6+
# Ideally we'd run this pipeline for all pull requests, but doing so consumes
7+
# our limited number of slots on Azure and almost always just duplicates the
8+
# build done in the main pipeline.
79
trigger:
810
branches:
911
include:
1012
- dev
1113
- release
14+
15+
pr:
16+
branches:
17+
include:
18+
- dev
19+
- release
1220
paths:
1321
include:
1422
- azure-pypi-pipeline.yml
1523
- build_scripts/pypi/*.py
1624
- build_scripts/pypi/package_files/*
17-
exclude:
18-
- /
1925

2026
# Azure does not support an empty string as a default argument, so we use a
2127
# special 'none' string for post_release_tag.

0 commit comments

Comments
 (0)