Add support for Python 3.11 to usd-core PyPI package

The manylinux docker image used for Linux builds was bumped
to the earliest revision that includes Python 3.11.

(Internal change: 2314835)

diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
index cdd2b5c2224767f0a01a94188adcf3a61347bcfe..28a77d183620e4d30c32d2cd3761c5490333d172 100644 (file)
--- a/azure-pypi-pipeline.yml
+++ b/azure-pypi-pipeline.yml
@@ -60,6 +60,9 @@ stages:
         Python310:
           PYTHON_INTERPRETER: /opt/python/cp310-cp310/bin/python
           PYTHON_TAG: cp310
+        Python311:
+          PYTHON_INTERPRETER: /opt/python/cp311-cp311/bin/python
+          PYTHON_TAG: cp311
     timeoutInMinutes: 90
     pool:
       vmImage: Ubuntu-20.04
@@ -128,6 +131,9 @@ stages:
         Python310:
           PYTHON_VERSION_SPEC: 3.10
           PYTHON_TAG: cp310
+        Python311:
+          PYTHON_VERSION_SPEC: 3.11
+          PYTHON_TAG: cp311
     timeoutInMinutes: 90
     pool:
       vmImage: 'windows-2019'
@@ -187,6 +193,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.10
           PYTHON_INTERPRETER: python3.10
           PYTHON_TAG: cp310
+        Python311:
+          PYTHON_VERSION_SPEC: 3.11
+          PYTHON_INTERPRETER: python3.11
+          PYTHON_TAG: cp311
     timeoutInMinutes: 180
     pool:
       vmImage: 'macOS-11'
@@ -284,6 +294,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.10
           IMAGE: 'Ubuntu-20.04'
           PYTHON_INTERPRETER: python3
+        Linux_Python311:
+          PYTHON_VERSION_SPEC: 3.11
+          IMAGE: 'Ubuntu-20.04'
+          PYTHON_INTERPRETER: python3
         Windows_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'windows-2019'
@@ -304,6 +318,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.10
           IMAGE: 'windows-2019'
           PYTHON_INTERPRETER: python
+        Windows_Python311:
+          PYTHON_VERSION_SPEC: 3.11
+          IMAGE: 'windows-2019'
+          PYTHON_INTERPRETER: python
         Mac_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'macOS-11'
@@ -324,6 +342,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.10
           IMAGE: 'macOS-11'
           PYTHON_INTERPRETER: python3
+        Mac_Python311:
+          PYTHON_VERSION_SPEC: 3.11
+          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
index 836c9868e709e1f2eb5846235b8ff57436c538ac..5929c04847ed938fcc14cb9d7fcea3f16574b40d 100644 (file)
--- a/build_scripts/pypi/docker/Dockerfile
+++ b/build_scripts/pypi/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux2014_x86_64:2021-06-07-00faba2
+FROM quay.io/pypa/manylinux2014_x86_64:2022-05-14-b55b680
 
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
@@ -6,11 +6,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
+# The above manylinux2014 image contains CMake 3.22, but we require
+# 3.27+ for Python 3.11 support. So we install 3.27 manually here.
+RUN pipx install --force cmake==3.27.9
 
 CMD bash

diff --git a/build_scripts/pypi/package_files/setup.py b/build_scripts/pypi/package_files/setup.py
index a24628ca3a356ec348c8223646f73ffd74cf1dc5..094478476fbb2d67f2f46c16f583157c2997ca5e 100644 (file)
--- a/build_scripts/pypi/package_files/setup.py
+++ b/build_scripts/pypi/package_files/setup.py
@@ -151,5 +151,5 @@ setuptools.setup(
         "Environment :: Console",
         "Topic :: Multimedia :: Graphics",
     ],
-    python_requires='>=3.6, <3.11',
+    python_requires='>=3.6, <3.12',
 )