Merge branch 'release' into FreeBSD_patches

PixarAnimationStudios · Jul 23, 2022 · 9cb79af · 9cb79af
2 parents d987053 + 3abc464
commit 9cb79af
Show file tree

Hide file tree

Showing 789 changed files with 46,335 additions and 12,144 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -268,14 +268,13 @@ For further information see the documentation on the Alembic plugin [here](http:
 
 Enable [MaterialX](https://github.com/materialx/materialx) support in the 
 build by specifying the cmake flag ```PXR_ENABLE_MATERIALX_SUPPORT=TRUE``` when 
-invoking cmake. Note that MaterialX with shared library support is required on 
-Linux and MacOS.
+invoking cmake. Note that MaterialX with shared library support is required.
 
 The additional dependencies that must be supplied when invoking cmake are:
 
-| Dependency Name    | Description                              |
-| ------------------ |----------------------------------------  |
-| MATERIALX_ROOT     | The root path to a MaterialX SDK install.| 
+| Dependency Name    | Description                                                 |
+| ------------------ |-----------------------------------------------------------  |
+| MaterialX_DIR      | Path to the CMake package config of a MaterialX SDK install.|
 
 See [3rd Party Library and Application Versions](VERSIONS.md) for version information.
 
@@ -293,6 +292,13 @@ when invoking cmake. This plugin is compatible with Draco 1.3.4. The additional
 Disable unit testing and prevent tests from being built by specifying the cmake flag ```PXR_BUILD_TESTS=FALSE```
 when invoking cmake.
 
+In order to aid with diagnosing of failing tests, test generated files for failing test are explicitly put in the following directories, where
+<ctest_run_timestamp> (formatted as "%Y-%m-%dT%H.%M.%S") represents the timestamp when ctest was run for the failing test.
+```
+${CMAKE_BINARY_DIR}/Testing/Failed-Diffs/<ctest_run_timestamp>/${TEST_NAME}/${filename}.result.${ext}
+${CMAKE_BINARY_DIR}/Testing/Failed-Diffs/<ctest_run_timestamp>/${TEST_NAME}/${filename}.baseline.${ext}
+```
+
 ## Other Build Options
 
 ##### Plugin Metadata Location

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,10 @@ if (PXR_BUILD_PRMAN_PLUGIN)
     endif()
 endif()
 
+if (PXR_BUILD_TESTS)
+    pxr_tests_prologue()
+endif()
+
 if (PXR_BUILD_DOCUMENTATION)
     pxr_build_documentation()
 endif()   

diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ The following dependencies are optional:
 
 The following dependencies are required:
 
- - [PySide](http://wiki.qt.io/PySide) or [PySide2](http://wiki.qt.io/PySide2)
+ - [PySide6](http://wiki.qt.io/PySide6) or [PySide2](http://wiki.qt.io/PySide2)
  - [PyOpenGL](https://pypi.python.org/pypi/PyOpenGL/)
 
 Getting and Building the Code
@@ -110,7 +110,7 @@ additional documentation for running cmake directly.
 - Optional (Can be ignored by passing `--no-python` as an argument to `build_usd.py`)
     - Python (required for [bindings and tests](BUILDING.md#python)) 
     - PyOpenGL (required for [usdview](BUILDING.md#usd-imaging))
-    - PySide or PySide2 (required for [usdview](BUILDING.md#usd-imaging))
+    - PySide6 or PySide2 (required for [usdview](BUILDING.md#usd-imaging))
 
 #### 2. Download the USD source code
 

diff --git a/VERSIONS.md b/VERSIONS.md
@@ -1,9 +1,8 @@
 3rd Party Library and Application Versions
 ------------------------------------------
 
-USD relies on an ecosystem of libraries and applications.  This page outlines
-the versions of these libraries used and tested against at Pixar as well as
-ones that have been tried by others.
+USD relies on an ecosystem of libraries and applications. This page outlines
+the versions of these libraries used and tested against at Pixar.
 
 Note that not everything here is required, see README.md for more information
 about which are required and which are optional for the various subsystems.
@@ -15,39 +14,28 @@ 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) | MSVC 14.0 (Visual Studio 2015) |
-| CMake         | 3.14.6               | 3.18.6                       | 3.16.5                         |
+| 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        | 2.7.16, 3.6.8        | 2.7.10, 3.7.7                | 2.7.12, 3.7.4, 3.8.10          |
-| Boost         | 1.66.0, 1.70.0       | 1.70.0                       | 1.70.0                         |
-| Intel TBB     | 2018 Update 6        | 2018 Update 1                | 2018 Update 6                  |
+| 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.4.4                | 3.4.4                        | 3.4.4                          |
 | OpenImageIO   | 2.1.16.0             | 2.1.16.0                     | 2.1.16.0                       |
 | OpenColorIO   | 1.1.0                | 1.1.0                        | 1.1.0                          |
-| OSL           | 1.8.12               |                              |                                |
-| Ptex          | 2.1.33               | 2.1.33                       | 2.1.33                         |
-| PySide2       | 2.0.0~alpha0, 5.14.1 | 5.14.1                       | 5.14.1                         |
+| 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                 |
 | PyOpenGL      | 3.1.5                | 3.1.5                        | 3.1.5                          |
-| Embree        | 3.2.2                | 3.2.2                        | 3.2.2                          |
-| RenderMan     | 23.5                 | 23.5                         | 23.5                           |
+| Embree        | 3.2.2                | 3.13.3                       | 3.2.2                          |
+| RenderMan     | 24.0                 | 24.0                         | 24.0                           |
 | Alembic       | 1.7.10               | 1.7.10                       | 1.7.10                         |
-| OpenEXR       | 2.3.0                | 2.3.0                        | 2.3.0                          |
-| MaterialX     | 1.38.0               | 1.38.0                       | 1.38.0                         |
+| OpenEXR       | 2.4.4                | 2.4.4                        | 2.5.2                          |
+| MaterialX     | 1.38.4               | 1.38.4                       | 1.38.4                         |
 | Jinja2        | 2.0                  |                              |                                |
 | Flex          | 2.5.39               |                              |                                |
 | Bison         | 2.4.1                |                              |                                |
 | Doxygen       | 1.8.14               |                              |                                |
 | GraphViz      | 2.40.1               |                              |                                |
-| OpenVDB       | 6.1.0                | 6.1.0                        | 6.1.0                          |
+| OpenVDB       | 7.1.0                | 7.1.0                        | 7.1.0                          |
 | Vulkan SDK    | 1.2.135.0            | 1.2.135.0                    | 1.2.135.0                      |
-
-## Other Known Versions
-
-These other versions have been known to work as well:
-
-| Software      | Linux        | macOS        | Windows      |
-| ------------- | ------------ | ------------ | ------------ |
-| C++ Compiler  |              |              | MSVC 15.0 (Visual Studio 2017) |
-| Boost         |              |              | 1.65.1 (VS 2017) |
-| PySide        | 1.2.2, 1.2.4 | 1.2.4        | 1.2.4        |
-| HDF5          | 1.8.11       | 1.8.11       | 1.8.11       |
-| OpenImageIO   | 1.9.1        |              |              |
+| Draco         | 1.3.6                | 1.3.6                        | 1.3.6                          |
diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
@@ -17,6 +17,21 @@ trigger:
         exclude:
         - /
 
+# Azure does not support an empty string as a default argument, so we use a
+# special 'none' string for post_release_tag.
+parameters:
+- name: post_release_tag
+  displayName: Post Release Version Tag
+  type: string
+  default: 'none'
+
+variables:
+- name: post_release_tag_arg
+  ${{ if eq(parameters.post_release_tag, 'none') }}:
+    value: ''
+  ${{ else }}:
+    value: ${{ format('--post-release-tag {0}', parameters.post_release_tag) }}
+
 stages:
 - stage: Build_and_Package
   jobs:
@@ -54,7 +69,7 @@ stages:
         docker exec usdmanylinux sh -c 'cp LICENSE.txt ./packaging'
       displayName: "Creating packaging directory"
     - bash: |
-        docker exec -w /opt/USD/packaging usdmanylinux $(PYTHON_INTERPRETER) setup.py bdist_wheel --python-tag ${PYTHON_TAG}
+        docker exec -w /opt/USD/packaging usdmanylinux $(PYTHON_INTERPRETER) setup.py $(post_release_tag_arg) bdist_wheel --python-tag ${PYTHON_TAG}
       displayName: 'Running setup.py'
     - bash: |
         docker exec usdmanylinux /bin/bash -c 'PYTHONPATH=/opt/USD/packaging/pypi/lib/python LD_LIBRARY_PATH=/opt/USD/packaging/pypi/lib:$LD_LIBRARY_PATH auditwheel repair packaging/dist/*.whl'
@@ -115,7 +130,7 @@ stages:
     - script: |
         cd D:\packaging
         dir
-        python setup.py bdist_wheel --python-tag $(PYTHON_TAG) --plat-name win_amd64
+        python setup.py $(post_release_tag_arg) bdist_wheel --python-tag $(PYTHON_TAG) --plat-name win_amd64
       displayName: 'Running setup.py'
     - task: PublishPipelineArtifact@0
       inputs:
@@ -167,7 +182,7 @@ stages:
       displayName: "Creating packaging directory"
     - bash: |
         cd ./packaging
-        $(PYTHON_INTERPRETER) setup.py bdist_wheel --python-tag ${PYTHON_TAG} --plat-name macosx_10_9_x86_64
+        $(PYTHON_INTERPRETER) setup.py $(post_release_tag_arg) bdist_wheel --python-tag ${PYTHON_TAG} --plat-name macosx_10_9_x86_64
       displayName: 'Running setup.py'
     - bash: |
         delocate-wheel -v -w dist-delocated packaging/dist/*