Skip to content

Commit 0244f25

Browse files
sunyabpixar-oss
authored andcommitted
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)
1 parent bba8761 commit 0244f25

3 files changed

Lines changed: 27 additions & 8 deletions

File tree

azure-pypi-pipeline.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ stages:
6060
Python310:
6161
PYTHON_INTERPRETER: /opt/python/cp310-cp310/bin/python
6262
PYTHON_TAG: cp310
63+
Python311:
64+
PYTHON_INTERPRETER: /opt/python/cp311-cp311/bin/python
65+
PYTHON_TAG: cp311
6366
timeoutInMinutes: 90
6467
pool:
6568
vmImage: Ubuntu-20.04
@@ -128,6 +131,9 @@ stages:
128131
Python310:
129132
PYTHON_VERSION_SPEC: 3.10
130133
PYTHON_TAG: cp310
134+
Python311:
135+
PYTHON_VERSION_SPEC: 3.11
136+
PYTHON_TAG: cp311
131137
timeoutInMinutes: 90
132138
pool:
133139
vmImage: 'windows-2019'
@@ -187,6 +193,10 @@ stages:
187193
PYTHON_VERSION_SPEC: 3.10
188194
PYTHON_INTERPRETER: python3.10
189195
PYTHON_TAG: cp310
196+
Python311:
197+
PYTHON_VERSION_SPEC: 3.11
198+
PYTHON_INTERPRETER: python3.11
199+
PYTHON_TAG: cp311
190200
timeoutInMinutes: 180
191201
pool:
192202
vmImage: 'macOS-11'
@@ -284,6 +294,10 @@ stages:
284294
PYTHON_VERSION_SPEC: 3.10
285295
IMAGE: 'Ubuntu-20.04'
286296
PYTHON_INTERPRETER: python3
297+
Linux_Python311:
298+
PYTHON_VERSION_SPEC: 3.11
299+
IMAGE: 'Ubuntu-20.04'
300+
PYTHON_INTERPRETER: python3
287301
Windows_Python36:
288302
PYTHON_VERSION_SPEC: 3.6
289303
IMAGE: 'windows-2019'
@@ -304,6 +318,10 @@ stages:
304318
PYTHON_VERSION_SPEC: 3.10
305319
IMAGE: 'windows-2019'
306320
PYTHON_INTERPRETER: python
321+
Windows_Python311:
322+
PYTHON_VERSION_SPEC: 3.11
323+
IMAGE: 'windows-2019'
324+
PYTHON_INTERPRETER: python
307325
Mac_Python36:
308326
PYTHON_VERSION_SPEC: 3.6
309327
IMAGE: 'macOS-11'
@@ -324,6 +342,10 @@ stages:
324342
PYTHON_VERSION_SPEC: 3.10
325343
IMAGE: 'macOS-11'
326344
PYTHON_INTERPRETER: python3
345+
Mac_Python311:
346+
PYTHON_VERSION_SPEC: 3.11
347+
IMAGE: 'macOS-11'
348+
PYTHON_INTERPRETER: python3
327349
timeoutInMinutes: 10
328350
pool:
329351
vmImage: '$(IMAGE)'
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
FROM quay.io/pypa/manylinux2014_x86_64:2021-06-07-00faba2
1+
FROM quay.io/pypa/manylinux2014_x86_64:2022-05-14-b55b680
22

33
ENV LANG en_US.UTF-8
44
ENV LANGUAGE en_US:en
55

66
WORKDIR /opt/USD
77

88
# XXX:
9-
# The above manylinux2014 image contains CMake 3.20, but we require
10-
# 3.24+ for Python 3.10 support. Newer images include later cmake
11-
# versions but for some reason (possibly the use of gcc 10?) wheels
12-
# created from these images crash in TBB. So for now, we use this
13-
# older image but install a newer CMake.
14-
RUN pipx install --force cmake==3.24.3
9+
# The above manylinux2014 image contains CMake 3.22, but we require
10+
# 3.27+ for Python 3.11 support. So we install 3.27 manually here.
11+
RUN pipx install --force cmake==3.27.9
1512

1613
CMD bash

build_scripts/pypi/package_files/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,5 @@ def windows():
151151
"Environment :: Console",
152152
"Topic :: Multimedia :: Graphics",
153153
],
154-
python_requires='>=3.6, <3.11',
154+
python_requires='>=3.6, <3.12',
155155
)

0 commit comments

Comments
 (0)