Merge pull request PixarAnimationStudios#248 from autodesk-forks/sync…

…/dev/23.02 Regular update adsk/dev branch from pixar dev Tag 23.02 for release
autodesk-forks · Jan 30, 2023 · fa65ac3 · fa65ac3
2 parents 435ca0a + 97d2ba3
commit fa65ac3
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [23.02] - 2023-01-20
+## [23.02] - 2023-01-24
 
 Version 23.02 is the last release that supports Python 2. Support for Python 2 
 will be removed in the next release.

diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
@@ -51,6 +51,9 @@ stages:
         Python39:
           PYTHON_INTERPRETER: /opt/python/cp39-cp39/bin/python
           PYTHON_TAG: cp39
+        Python310:
+          PYTHON_INTERPRETER: /opt/python/cp310-cp310/bin/python
+          PYTHON_TAG: cp310
     timeoutInMinutes: 90
     pool:
       vmImage: Ubuntu-20.04
@@ -116,6 +119,9 @@ stages:
         Python39:
           PYTHON_VERSION_SPEC: 3.9
           PYTHON_TAG: cp39
+        Python310:
+          PYTHON_VERSION_SPEC: 3.10
+          PYTHON_TAG: cp310
     timeoutInMinutes: 90
     pool:
       vmImage: 'windows-2019'
@@ -171,6 +177,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.9
           PYTHON_INTERPRETER: python3.9
           PYTHON_TAG: cp39
+        Python310:
+          PYTHON_VERSION_SPEC: 3.10
+          PYTHON_INTERPRETER: python3.10
+          PYTHON_TAG: cp310
     timeoutInMinutes: 180
     pool:
       vmImage: 'macOS-11'
@@ -264,6 +274,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.9
           IMAGE: 'Ubuntu-20.04'
           PYTHON_INTERPRETER: python3
+        Linux_Python310:
+          PYTHON_VERSION_SPEC: 3.10
+          IMAGE: 'Ubuntu-20.04'
+          PYTHON_INTERPRETER: python3
         Windows_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'windows-2019'
@@ -280,6 +294,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.9
           IMAGE: 'windows-2019'
           PYTHON_INTERPRETER: python
+        Windows_Python310:
+          PYTHON_VERSION_SPEC: 3.10
+          IMAGE: 'windows-2019'
+          PYTHON_INTERPRETER: python
         Mac_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'macOS-11'
@@ -296,6 +314,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.9
           IMAGE: 'macOS-11'
           PYTHON_INTERPRETER: python3
+        Mac_Python310:
+          PYTHON_VERSION_SPEC: 3.10
+          IMAGE: 'macOS-11'
+          PYTHON_INTERPRETER: python3
     timeoutInMinutes: 10
     pool:
       vmImage: '$(IMAGE)'

diff --git a/build_scripts/pypi/docker/Dockerfile b/build_scripts/pypi/docker/Dockerfile
@@ -4,4 +4,13 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
 WORKDIR /opt/USD
+
+# XXX:
+# The above manylinux2014 image contains CMake 3.20, but we require
+# 3.24+ for Python 3.10 support. Newer images include later cmake
+# versions but for some reason (possibly the use of gcc 10?) wheels
+# created from these images crash in TBB. So for now, we use this
+# older image but install a newer CMake.
+RUN pipx install --force cmake==3.24.3
+
 CMD bash
diff --git a/build_scripts/pypi/package_files/setup.py b/build_scripts/pypi/package_files/setup.py
@@ -151,5 +151,5 @@ def windows():
         "Environment :: Console",
         "Topic :: Multimedia :: Graphics",
     ],
-    python_requires='>=3.6, <3.10',
+    python_requires='>=3.6, <3.11',
 )
diff --git a/docs/contributing_supplemental.rst b/docs/contributing_supplemental.rst
@@ -0,0 +1,47 @@
+===================
+Contributing to USD
+===================
+
+Supplemental Terms
+******************
+
+By and in consideration for using a Pixar site (e.g., Pixar's USD-proposals
+site), providing Submissions to Pixar, or by clicking a box that states that
+you accept or agree to these terms, you signify your agreement to these
+Supplemental Terms.
+
+You hereby grant to Pixar and our licensees, distributors, agents,
+representatives and other authorized users, a perpetual, non-exclusive,
+irrevocable, fully-paid, royalty-free, sub-licensable and transferable
+(in whole or part) worldwide license under all copyrights, trademarks, patents,
+trade secret rights, data rights, privacy and publicity rights and other
+proprietary rights you or your affiliates now or hereafter own or control, to
+reproduce, transmit, display, exhibit, distribute, index, comment on, perform,
+create derivative works based upon, modify, make, use, sell, have made, import,
+and otherwise exploit in any manner, the Submissions and any implementations of
+the Submissions, in whole or in part, including in all media formats and
+channels now known or hereafter devised, for any and all purposes, including
+entertainment, research, news, advertising, promotional, marketing, publicity,
+trade or commercial purposes, all without further notice to you, with or without
+attribution, and without the requirement of any permission from or payment to
+you or any other person or entity.  
+
+As used herein, Submissions shall mean any text, proposals, white papers,
+specifications, messages, technologies, ideas, concepts, pitches, suggestions,
+stories, screenplays, treatments, formats, artwork, photographs, drawings,
+videos, audiovisual works, musical compositions (including lyrics), sound
+recordings, characterizations, software code, algorithms, structures, your
+and/or other persons' names, likenesses, voices, usernames, profiles, actions,
+appearances, performances and/or other biographical information or material,
+and/or other similar materials that you submit, post, upload, embed, display,
+communicate or otherwise distribute to or for Pixar or a Pixar site.
+
+These Supplemental Terms are in addition to any prior or contemporaneous
+agreement (and shall remain in effect notwithstanding any future agreement)
+that you may have with Pixar.
+
+At any time, we may update these Supplemental Terms (including by modification,
+deletion and/or addition of any portion thereof).  Any update to these
+Supplemental Terms will be effective thirty (30) calendar days following our
+posting of the updated Supplemental Terms to a Pixar site.
+
diff --git a/docs/contributing_to_usd.rst b/docs/contributing_to_usd.rst
@@ -28,49 +28,6 @@ Once your CLA is signed, send it to `usd-cla@pixar.com
 and wait for confirmation that we've received it. After that, you can submit
 pull requests.
 
-Supplemental Terms
-******************
-
-By and in consideration for using a Pixar site (e.g., Pixar's USD-proposals
-site), providing Submissions to Pixar, or by clicking a box that states that
-you accept or agree to these terms, you signify your agreement to these
-Supplemental Terms.
-
-You hereby grant to Pixar and our licensees, distributors, agents,
-representatives and other authorized users, a perpetual, non-exclusive,
-irrevocable, fully-paid, royalty-free, sub-licensable and transferable
-(in whole or part) worldwide license under all copyrights, trademarks, patents,
-trade secret rights, data rights, privacy and publicity rights and other
-proprietary rights you or your affiliates now or hereafter own or control, to
-reproduce, transmit, display, exhibit, distribute, index, comment on, perform,
-create derivative works based upon, modify, make, use, sell, have made, import,
-and otherwise exploit in any manner, the Submissions and any implementations of
-the Submissions, in whole or in part, including in all media formats and
-channels now known or hereafter devised, for any and all purposes, including
-entertainment, research, news, advertising, promotional, marketing, publicity,
-trade or commercial purposes, all without further notice to you, with or without
-attribution, and without the requirement of any permission from or payment to
-you or any other person or entity.  
-
-As used herein, Submissions shall mean any text, proposals, white papers,
-specifications, messages, technologies, ideas, concepts, pitches, suggestions,
-stories, screenplays, treatments, formats, artwork, photographs, drawings,
-videos, audiovisual works, musical compositions (including lyrics), sound
-recordings, characterizations, software code, algorithms, structures, your
-and/or other persons' names, likenesses, voices, usernames, profiles, actions,
-appearances, performances and/or other biographical information or material,
-and/or other similar materials that you submit, post, upload, embed, display,
-communicate or otherwise distribute to or for Pixar or a Pixar site.
-
-These Supplemental Terms are in addition to any prior or contemporaneous
-agreement (and shall remain in effect notwithstanding any future agreement)
-that you may have with Pixar.
-
-At any time, we may update these Supplemental Terms (including by modification,
-deletion and/or addition of any portion thereof).  Any update to these
-Supplemental Terms will be effective thirty (30) calendar days following our
-posting of the updated Supplemental Terms to a Pixar site.
-
 Coding Conventions
 ******************
 

diff --git a/pxr/base/gf/plane.h b/pxr/base/gf/plane.h
@@ -32,6 +32,7 @@
 #include "pxr/base/gf/api.h"
 
 #include <iosfwd>
+#include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/pxr/base/tf/stringUtils.cpp b/pxr/base/tf/stringUtils.cpp
@@ -37,6 +37,7 @@
 #include <boost/type_traits/is_signed.hpp>
 #include <boost/utility/enable_if.hpp>
 
+#include <algorithm>
 #include <climits>
 #include <cstdarg>
 #include <ctype.h>

diff --git a/third_party/renderman-24/plugin/hdPrman/tokens.h b/third_party/renderman-24/plugin/hdPrman/tokens.h
@@ -25,16 +25,15 @@
 #define EXT_RMANPKG_24_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
 
 #include "pxr/pxr.h"
-#include "pxr/imaging/hd/api.h"
-#include "pxr/imaging/hd/version.h"
+#include "hdPrman/api.h"
 #include "pxr/base/tf/staticTokens.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
 #define HD_PRMAN_TOKENS                         \
     (meshLightSourceGeom)                       
 
-TF_DECLARE_PUBLIC_TOKENS(HdPrmanTokens, HD_API, HD_PRMAN_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanTokens, HDPRMAN_API, HD_PRMAN_TOKENS);
 
 PXR_NAMESPACE_CLOSE_SCOPE