From 633e4689c0d3e6934b969674e0f52d203b018b6e Mon Sep 17 00:00:00 2001
From: LiamGFX <LiamGFX@users.noreply.github.com>
Date: Mon, 14 Oct 2024 22:24:04 -0700
Subject: [PATCH] OpenUSD: Remove support for Python 3.6 and 3.7 in PyPi builds
 and switch to    Python 3.8 for Windows BuildUSD builds.

(Internal change: 2344653)
---
 .github/workflows/pypi.yml | 20 -----------------
 azure-pipelines.yml        |  2 +-
 azure-pypi-pipeline.yml    | 44 --------------------------------------
 3 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 7342f27792..1f28413346 100644
--- 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
@@ -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,10 +261,6 @@ 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
@@ -293,10 +277,6 @@ jobs:
             PYTHON_VERSION_SPEC: '3.11'
             IMAGE: macos-12
             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/azure-pipelines.yml b/azure-pipelines.yml
index 57364f62f7..6734c3587d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -51,7 +51,7 @@ jobs:
   steps:
   - script: |
       call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
-      call set PYTHONLOCATION=C:\hostedtoolcache\windows\Python\3.7.9\x64
+      call set PYTHONLOCATION=C:\hostedtoolcache\windows\Python\3.9.13\x64
       call set PYTHONBIN=%PYTHONLOCATION%\python.exe
       call set PATH=%PYTHONLOCATION%;%PYTHONLOCATION%\Scripts;%PATH%
       call set BOOST_ROOT=
diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
index 23a20bfad7..307c4445b7 100644
--- a/azure-pypi-pipeline.yml
+++ b/azure-pypi-pipeline.yml
@@ -45,12 +45,6 @@ stages:
   - job: Linux
     strategy:
       matrix:
-        Python36:
-          PYTHON_INTERPRETER: /opt/python/cp36-cp36m/bin/python
-          PYTHON_TAG: cp36
-        Python37:
-          PYTHON_INTERPRETER: /opt/python/cp37-cp37m/bin/python
-          PYTHON_TAG: cp37
         Python38:
           PYTHON_INTERPRETER: /opt/python/cp38-cp38/bin/python
           PYTHON_TAG: cp38
@@ -119,12 +113,6 @@ stages:
   - job: Windows
     strategy:
       matrix:
-        Python36:
-          PYTHON_VERSION_SPEC: 3.6
-          PYTHON_TAG: cp36
-        Python37:
-          PYTHON_VERSION_SPEC: 3.7
-          PYTHON_TAG: cp37
         Python38:
           PYTHON_VERSION_SPEC: 3.8
           PYTHON_TAG: cp38
@@ -179,14 +167,6 @@ stages:
   - job: Mac
     strategy:
       matrix:
-        Python36:
-          PYTHON_VERSION_SPEC: 3.6
-          PYTHON_INTERPRETER: python3.6
-          PYTHON_TAG: cp36
-        Python37:
-          PYTHON_VERSION_SPEC: 3.7
-          PYTHON_INTERPRETER: python3.7
-          PYTHON_TAG: cp37
         Python38:
           PYTHON_VERSION_SPEC: 3.8
           PYTHON_INTERPRETER: python3.8
@@ -284,14 +264,6 @@ stages:
   - job: Test_Install
     strategy:
       matrix:
-        Linux_Python36:
-          PYTHON_VERSION_SPEC: 3.6
-          IMAGE: 'Ubuntu-20.04'
-          PYTHON_INTERPRETER: python3
-        Linux_Python37:
-          PYTHON_VERSION_SPEC: 3.7
-          IMAGE: 'Ubuntu-20.04'
-          PYTHON_INTERPRETER: python3
         Linux_Python38:
           PYTHON_VERSION_SPEC: 3.8
           IMAGE: 'Ubuntu-20.04'
@@ -312,14 +284,6 @@ stages:
           PYTHON_VERSION_SPEC: 3.12
           IMAGE: 'Ubuntu-20.04'
           PYTHON_INTERPRETER: python3
-        Windows_Python36:
-          PYTHON_VERSION_SPEC: 3.6
-          IMAGE: 'windows-2019'
-          PYTHON_INTERPRETER: python
-        Windows_Python37:
-          PYTHON_VERSION_SPEC: 3.7
-          IMAGE: 'windows-2019'
-          PYTHON_INTERPRETER: python
         Windows_Python38:
           PYTHON_VERSION_SPEC: 3.8
           IMAGE: 'windows-2019'
@@ -340,14 +304,6 @@ stages:
           PYTHON_VERSION_SPEC: 3.12
           IMAGE: 'windows-2019'
           PYTHON_INTERPRETER: python
-        Mac_Python36:
-          PYTHON_VERSION_SPEC: 3.6
-          IMAGE: 'macOS-12'
-          PYTHON_INTERPRETER: python3
-        Mac_Python37:
-          PYTHON_VERSION_SPEC: 3.7
-          IMAGE: 'macOS-12'
-          PYTHON_INTERPRETER: python3
         Mac_Python38:
           PYTHON_VERSION_SPEC: 3.8
           IMAGE: 'macOS-12'