Merge pull request #1512 from rstelzleni/pypi-py38-packages

Enable building PyPI packages for Python 3.8 (Internal change: 2167160)
PixarAnimationStudios · May 14, 2021 · 8d107af · 8d107af
2 parents b3e094b + 7e50d92
commit 8d107af
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
@@ -30,6 +30,9 @@ stages:
         Python37:
           PYTHON_INTERPRETER: /opt/python/cp37-cp37m/bin/python
           PYTHON_TAG: cp37
+        Python38:
+          PYTHON_INTERPRETER: /opt/python/cp38-cp38/bin/python
+          PYTHON_TAG: cp38
     timeoutInMinutes: 90
     pool:
       vmImage: Ubuntu-18.04
@@ -74,6 +77,9 @@ stages:
         Python37:
           PYTHON_VERSION_SPEC: 3.7
           PYTHON_TAG: cp37
+        Python38:
+          PYTHON_VERSION_SPEC: 3.8
+          PYTHON_TAG: cp38
     timeoutInMinutes: 90
     pool:
       vmImage: 'VS2017-Win2016'
@@ -121,6 +127,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.7
           PYTHON_INTERPRETER: python3.7
           PYTHON_TAG: cp37
+        Python38:
+          PYTHON_VERSION_SPEC: 3.8
+          PYTHON_INTERPRETER: python3.8
+          PYTHON_TAG: cp38
     timeoutInMinutes: 90
     pool:
       vmImage: 'macOS-10.14'
@@ -208,6 +218,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.7
           IMAGE: 'Ubuntu-18.04'
           PYTHON_INTERPRETER: python3
+        Linux_Python38:
+          PYTHON_VERSION_SPEC: 3.8
+          IMAGE: 'Ubuntu-18.04'
+          PYTHON_INTERPRETER: python3
         Windows_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'VS2017-Win2016'
@@ -216,6 +230,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.7
           IMAGE: 'VS2017-Win2016'
           PYTHON_INTERPRETER: python
+        Windows_Python38:
+          PYTHON_VERSION_SPEC: 3.8
+          IMAGE: 'VS2017-Win2016'
+          PYTHON_INTERPRETER: python
         Mac_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'macOS-10.14'
@@ -224,6 +242,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.7
           IMAGE: 'macOS-10.14'
           PYTHON_INTERPRETER: python3
+        Mac_Python38:
+          PYTHON_VERSION_SPEC: 3.8
+          IMAGE: 'macOS-10.14'
+          PYTHON_INTERPRETER: python3
     timeoutInMinutes: 10
     pool:
       vmImage: '$(IMAGE)'

diff --git a/build_scripts/pypi/package_files/setup.py b/build_scripts/pypi/package_files/setup.py
@@ -73,7 +73,7 @@ def windows():
 import os, sys
 dllPath = os.path.split(os.path.realpath(__file__))[0]
 if sys.version_info >= (3, 8, 0):
-    os.add_dll_directory(dllPath)
+    os.environ['PXR_USD_WINDOWS_DLL_PATH'] = dllPath
 else:
     os.environ['PATH'] = dllPath + os.pathsep + os.environ['PATH']
 ''')
@@ -128,5 +128,5 @@ def windows():
         "Environment :: Console",
         "Topic :: Multimedia :: Graphics",
     ],
-    python_requires='>=3.6, <3.8',
+    python_requires='>=3.6, <3.9',
 )