Fixed merge conflict

PixarAnimationStudios · Oct 31, 2024 · d1ebe6f · d1ebe6f
2 parents cbd73ac + e45ffe6
commit d1ebe6f
Show file tree

Hide file tree

Showing 357 changed files with 17,748 additions and 22,540 deletions.
diff --git a/.github/workflows/buildusd.yml b/.github/workflows/buildusd.yml
@@ -24,15 +24,38 @@ jobs:
         with:
           require: 'write'
           username: ${{ github.event.comment.user.login }}
+  GetGitRef:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 5
+    outputs:
+      ref: ${{ steps.setter.outputs.ref }}
+    steps:
+      - name: Get push ref
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          echo "REF=${{ github.ref }}" >> $GITHUB_ENV
+      - name: Get PR ref
+        if: ${{ github.event.issue.pull_request }}
+        run: |
+          echo "REF=refs/pull/${{ github.event.issue.number }}/merge" >> $GITHUB_ENV
+      - name: Print ENV_VAR
+        run: |
+          echo "The value of REF is $REF"
+      - name: Set ENV_VAR
+        id: setter
+        run: |
+          echo "ref=$REF" >> "$GITHUB_OUTPUT"
   Linux:
-    needs: [GetUser]
+    needs: [GetUser, GetGitRef]
     if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     steps:
       - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{needs.GetGitRef.outputs.ref}}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4
@@ -68,14 +91,16 @@ jobs:
           path: USDinst
 
   macOS:
-    needs: [GetUser]
+    needs: [GetUser, GetGitRef]
     if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 120
     steps:
       - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{needs.GetGitRef.outputs.ref}}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4
@@ -91,7 +116,7 @@ jobs:
       - name: Install dependencies
         run: |
           export PATH=/Applications/CMake.app/Contents/bin:$PATH
-          sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_14.1.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
@@ -115,14 +140,16 @@ jobs:
           path: USDinst
 
   Windows:
-    needs: [GetUser]
+    needs: [GetUser, GetGitRef]
     if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
     runs-on: windows-2019
     timeout-minutes: 120
     steps:
       - run: echo ${{ needs.GetUser.outputs.require-result }}
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{needs.GetGitRef.outputs.ref}}
       - name: Restore cached artifacts
         id: cache-usd-build-dependency
         uses: actions/cache/restore@v4

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -25,9 +25,6 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - TAG: cp37
-            INTERPRETER: /opt/python/cp37-cp37m/bin/python
-            VERSION_SPEC: '3.7'
           - TAG: cp38
             INTERPRETER: /opt/python/cp38-cp38/bin/python
             VERSION_SPEC: '3.8'
@@ -100,9 +97,6 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - VERSION_SPEC: '3.7'
-            INTERPRETER: python3.7
-            TAG: cp37
           - VERSION_SPEC: '3.8'
             INTERPRETER: python3.8
             TAG: cp38
@@ -115,7 +109,7 @@ jobs:
           - VERSION_SPEC: '3.11'
             INTERPRETER: python3.11
             TAG: cp311
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 120
     steps:
       - name: Checkout code
@@ -131,7 +125,7 @@ jobs:
           ${{ matrix.PYTHON.INTERPRETER }} -m pip install delocate~=0.10.2 wheel
       - name: Build USD
         run: |
-          sudo xcode-select -s /Applications/Xcode_13.3.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
           ${{ matrix.PYTHON.INTERPRETER }} build_scripts/build_usd.py --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --generator Xcode --build-target universal --build $GITHUB_WORKSPACE/USDgen/build --src $GITHUB_WORKSPACE/USDgen/src $GITHUB_WORKSPACE/USDinst -v
       - name: Packaging USD
         run: |
@@ -174,8 +168,6 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - VERSION_SPEC: '3.7'
-            TAG: cp37
           - VERSION_SPEC: '3.8'
             TAG: cp38
           - VERSION_SPEC: '3.9'
@@ -253,10 +245,6 @@ jobs:
     strategy:
       matrix:
         BUILD_CONFIG:
-          - NAME: Linux_Python37
-            PYTHON_VERSION_SPEC: '3.7'
-            IMAGE: ubuntu-20.04
-            PYTHON_INTERPRETER: python3
           - NAME: Linux_Python38
             PYTHON_VERSION_SPEC: '3.8'
             IMAGE: ubuntu-20.04
@@ -273,30 +261,22 @@ jobs:
             PYTHON_VERSION_SPEC: '3.11'
             IMAGE: ubuntu-20.04
             PYTHON_INTERPRETER: python3
-          - NAME: Mac_Python37
-            PYTHON_VERSION_SPEC: '3.7'
-            IMAGE: macos-12
-            PYTHON_INTERPRETER: python3
           - NAME: Mac_Python38
             PYTHON_VERSION_SPEC: '3.8'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python39
             PYTHON_VERSION_SPEC: '3.9'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3
           - NAME: Mac_Python310
             PYTHON_VERSION_SPEC: '3.10'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3  
           - NAME: Mac_Python311
             PYTHON_VERSION_SPEC: '3.11'
-            IMAGE: macos-12
+            IMAGE: macos-13
             PYTHON_INTERPRETER: python3          
-          - NAME: Windows_Python37
-            PYTHON_VERSION_SPEC: '3.7'
-            IMAGE: windows-2019
-            PYTHON_INTERPRETER: python3
           - NAME: Windows_Python38
             PYTHON_VERSION_SPEC: '3.8'
             IMAGE: windows-2019

diff --git a/BUILDING.md b/BUILDING.md
@@ -36,7 +36,6 @@ Some examples:
 cmake                                       \
 -DTBB_ROOT_DIR=/path/to/tbb                 \
 -DOPENSUBDIV_ROOT_DIR=/path/to/opensubdiv   \
--DBOOST_ROOT=/path/to/boost                 \
 /path/to/USD/source
 
 cmake --build . --target install -- -j <NUM_CORES>
@@ -51,7 +50,6 @@ cmake                                       \
 -G "Xcode"                                  \
 -DTBB_ROOT_DIR=/path/to/tbb                 \
 -DOPENSUBDIV_ROOT_DIR=/path/to/opensubdiv   \
--DBOOST_ROOT=/path/to/boost                 \
 /path/to/USD/source
 
 cmake --build . --target install -- -j <NUM_CORES>
@@ -67,7 +65,6 @@ build USD.
 -G "Visual Studio 15 2017 Win64"            ^
 -DTBB_ROOT_DIR=C:\path\to\tbb               ^
 -DOPENSUBDIV_ROOT_DIR=C:\path\to\opensubdiv ^
--DBOOST_ROOT=C:\path\to\boost               ^
 \path\to\USD\source
 
 cmake --build . --target install -- /m:%NUMBER_OF_PROCESSORS%
@@ -722,14 +719,7 @@ Client code can also override the default as needed.
 
 ## Build Issues FAQ
 
-1. Boost_NO_BOOST_CMAKE: 
-We currently set Boost_NO_BOOST_CMAKE=ON explicitly in USD builds for all 
-platforms to avoid issues with Boost config files (introduced in Boost version 
-1.70) and python, program options component requirements. If the user wants 
-to use Boost specified config files for their USD build, specify 
--DBoost_NO_BOOST_CMAKE=OFF when running cmake.
-
-2. Windows and Python 3.8+ (non-Anaconda)
+1. Windows and Python 3.8+ (non-Anaconda)
 Python 3.8 and later on Windows will no longer search PATH for DLL dependencies.
 Instead, clients can call `os.add_dll_directory(p)` to set paths to search.
 By default on that platform USD will iterate over PATH and add all paths using