Skip to content

Commit

Permalink
Merge release v23.11
Browse files Browse the repository at this point in the history
  • Loading branch information
pixar-oss committed Oct 26, 2023
2 parents 10b6243 + a4cad2f commit 0b18ad3
Show file tree
Hide file tree
Showing 1,039 changed files with 36,006 additions and 17,441 deletions.
539 changes: 539 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Build Status

| | Linux | Windows | macOS |
|:-------:|:---------:|:---------:|:---------:|
| 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) |
| 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) |
| 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) |
| 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) |

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

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

Supported Platforms
-------------------
Expand Down Expand Up @@ -107,10 +107,10 @@ additional documentation for running cmake directly.

#### 2. Download the USD source code

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

```
> git clone https://github.com/PixarAnimationStudios/USD
> git clone https://github.com/PixarAnimationStudios/OpenUSD
Cloning into 'USD'...
```

Expand Down
30 changes: 15 additions & 15 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,33 @@ about which are required and which are optional for the various subsystems.

## Tested

Our test machines have the following software versions installed
Our test machines have the following software versions installed.

| Software | Linux | macOS | Windows |
| ------------- | -------------------- | ---------------------------- | ------------------------------ |
| OS | CentOS Linux 7 | 10.15.7 | Windows 10 |
| C++ Compiler | gcc 6.3.1 | Apple clang 12.0.0 (Xcode 12.4) | Visual Studio 2017 15.9 |
| CMake | 3.14.6 | 3.19.5 | 3.16.5 |
| Python | 3.6.8 | 3.7.7 | 3.7.4, 3.8.10 |
| Boost | 1.70.0 | 1.76.0 | 1.70.0 |
| Intel TBB | 2019 Update 6 | 2018 Update 1, 2019 Update 6 | 2019 Update 6 |
| OpenSubdiv | 3.5.0 | 3.5.0 | 3.5.0 |
| OpenImageIO | 2.1.16.0 | 2.3.15.0 | 2.1.16.0 |
| OpenColorIO | 1.1.0 | 1.1.0 | 1.1.0 |
| C++ Compiler | gcc 9.3.1 | Apple clang 13.1.6 (Xcode 13.3) | Visual Studio 2017 15.9 |
| CMake | 3.17.5 | 3.19.5 | 3.25.3 |
| Python | 3.9.16 | 3.9.13 | 3.9.13 |
| Boost | 1.76.0 | 1.78.0 | 1.76.0 |
| Intel TBB | 2020 Update 3 | 2018 Update 1, 2020 Update 3 | 2020 Update 3 |
| OpenSubdiv | 3.5.1 | 3.5.1 | 3.5.1 |
| OpenImageIO | 2.3.21.0 | 2.3.21.0 | 2.3.21.0 |
| OpenColorIO | 2.1.3 | 2.1.3 | 2.1.3 |
| OSL | 1.10.9 | | |
| Ptex | 2.3.2 | 2.1.33 | 2.1.33 |
| Qt for Python | PySide2 5.14.1 | PySide6 6.3.1 | PySide2 5.14.1 |
| Ptex | 2.4.2 | 2.4.2 | 2.4.2 |
| Qt for Python | PySide2 5.15.2.1 | PySide6 6.3.1 | PySide2 5.15.2.1 |
| PyOpenGL | 3.1.5 | 3.1.5 | 3.1.5 |
| Embree | 3.2.2 | 3.13.3 | 3.2.2 |
| RenderMan | 24.4, 25.0 | 24.4, 25.0 | 24.4, 25.0 |
| Alembic | 1.7.10 | 1.8.3 | 1.7.10 |
| OpenEXR | 2.4.3 | 2.4.3 | 2.5.2 |
| Alembic | 1.8.5 | 1.8.5 | 1.8.5 |
| OpenEXR | 3.1.11 | 3.1.11 | 3.1.11 |
| MaterialX | 1.38.7 | 1.38.7 | 1.38.7 |
| Jinja2 | 2.0 | | |
| Flex | 2.5.39 | | |
| Bison | 2.4.1 | | |
| Doxygen | 1.8.14 | | |
| Doxygen | 1.9.6 | | |
| GraphViz | 2.40.1 | | |
| OpenVDB | 7.1.0 | 7.1.0 | 7.1.0 |
| OpenVDB | 9.1.0 | 7.1.0, 9.1.0 | 9.1.0 |
| Vulkan SDK | 1.2.135.0 | 1.2.135.0 | 1.2.135.0 |
| Draco | 1.3.6 | 1.3.6 | 1.3.6 |
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
- job: macOS
timeoutInMinutes: 120
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
steps:
- script: |
# Update PATH to ensure that pyside2-uic can be found
export PATH=/Library/Frameworks/Python.framework/Versions/3.11/bin:$PATH
sudo xcode-select -s /Applications/Xcode_13.2.app/Contents/Developer
sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
# Set SYSTEM_VERSION_COMPAT while installing Python packages to
# accommodate the macOS version numbering change from 10.x to 11
export SYSTEM_VERSION_COMPAT=1
Expand Down
18 changes: 12 additions & 6 deletions azure-pypi-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
name: PyPI_Packaging

# Trigger this build whenever this pipeline file is changed, or when setup.py
# or other supporting files are updated. This way we will build new pypi
# packages each time we update the version number, or any other information
# listed here or in setup.py, like supported python versions.
# Trigger this build whenever the dev or release branches are updated,
# or on pull requests that affect PyPI-related files.
#
# Ideally we'd run this pipeline for all pull requests, but doing so consumes
# our limited number of slots on Azure and almost always just duplicates the
# build done in the main pipeline.
trigger:
branches:
include:
- dev
- release

pr:
branches:
include:
- dev
- release
paths:
include:
- azure-pypi-pipeline.yml
- build_scripts/pypi/*.py
- build_scripts/pypi/package_files/*
exclude:
- /

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

0 comments on commit 0b18ad3

Please sign in to comment.