Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Python 3.11 #30818

Merged
merged 11 commits into from
Sep 12, 2022
Merged

Support Python 3.11 #30818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
10397a4
Support Python 3.11
gnossen Sep 1, 2022
8808066
Update build images for 3.11
gnossen Sep 1, 2022
5191904
Whoopsie
gnossen Sep 2, 2022
8decd1a
The architecture of this thing is garbage
gnossen Sep 2, 2022
ed68e63
Silence ownership warning
gnossen Sep 8, 2022
9f4fe18
Account for change in git behavior
gnossen Sep 8, 2022
f79287f
Fix directory
gnossen Sep 8, 2022
f3488d5
I am in great pain
gnossen Sep 9, 2022
bc55416
Update Windows and arm linux
gnossen Sep 9, 2022
cf85867
Agh
gnossen Sep 9, 2022
a02c3a3
Clean up
gnossen Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Package for gRPC Python.

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Installation
------------
Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio_channelz/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Channelz is a live debug tool in gRPC Python.

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Dependencies
------------
Expand Down
1 change: 1 addition & 0 deletions src/python/grpcio_channelz/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def run(self):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio_health_checking/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Reference package for GRPC Python health checking.

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Dependencies
------------
Expand Down
1 change: 1 addition & 0 deletions src/python/grpcio_health_checking/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def run(self):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio_reflection/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Reference package for reflection in GRPC Python.

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Dependencies
------------
Expand Down
1 change: 1 addition & 0 deletions src/python/grpcio_reflection/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def run(self):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio_status/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Reference package for GRPC Python status proto mapping.

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Dependencies
------------
Expand Down
1 change: 1 addition & 0 deletions src/python/grpcio_status/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def run(self):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: Apache Software License',
]

Expand Down
2 changes: 1 addition & 1 deletion src/python/grpcio_testing/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Testing utilities for gRPC Python

Supported Python Versions
-------------------------
Python >= 3.6
Python >= 3.7

Dependencies
------------
Expand Down
3 changes: 3 additions & 0 deletions tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.7.10" "3.7.10" /opt
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.8.8" "3.8.8" /opt/python/cp38-cp38
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.2" "3.9.2" /opt/python/cp39-cp39
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.0" "3.10.0rc1" /opt/python/cp310-cp310
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.0" "3.11.0rc1" /opt/python/cp311-cp311

ENV AUDITWHEEL_ARCH armv7l
ENV AUDITWHEEL_PLAT linux_armv7l
Expand Down Expand Up @@ -59,3 +60,5 @@ ENV CXX ${CROSS_TRIPLE}-g++
# truncate it.
# TODO(jtattermusch): Remove this hack when possible.
RUN echo "# file contents removed to avoid resetting PATH set by the docker image" >/etc/profile

RUN git config --global --add safe.directory /var/local/jenkins/grpc
5 changes: 4 additions & 1 deletion tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Docker file for building gRPC manylinux Python artifacts.

FROM quay.io/pypa/manylinux2014_x86_64:2021-08-26-12e5da0
FROM quay.io/pypa/manylinux2014_x86_64:2022-08-29-0fd77fa

# manylinux_2_17 is the preferred alias of manylinux2014
ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
Expand All @@ -29,6 +29,7 @@ RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython

#=================
# Install ccache
Expand All @@ -43,3 +44,5 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
&& make -j4 && make install \
&& cd ../.. \
&& rm -rf ccache-4.5.1 ccache.tar.gz

RUN git config --global --add safe.directory /var/local/jenkins/grpc
8 changes: 6 additions & 2 deletions tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Docker file for building gRPC manylinux Python artifacts.

FROM quay.io/pypa/manylinux2014_i686:2021-08-26-12e5da0
FROM quay.io/pypa/manylinux2014_i686:2022-08-29-0fd77fa

# manylinux_2_17 is the preferred alias of manylinux2014
ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
Expand All @@ -29,6 +29,7 @@ RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython

#=================
# Install ccache
Expand All @@ -42,4 +43,7 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
&& make -j4 && make install \
&& cd ../.. \
&& rm -rf ccache-4.5.1 ccache.tar.gz
&& rm -rf ccache-4.5.1 ccache.tar.gz


RUN git config --global --add safe.directory /var/local/jenkins/grpc
gnossen marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 4 additions & 1 deletion tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM quay.io/pypa/musllinux_1_1_x86_64:2021-11-15-a808c18
FROM quay.io/pypa/musllinux_1_1_x86_64:2022-08-29-0fd77fa

###################################
# Install Python build requirements
Expand All @@ -21,6 +21,7 @@ RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython

#=================
# Install ccache
Expand All @@ -35,3 +36,5 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
&& make -j4 && make install \
&& cd ../.. \
&& rm -rf ccache-4.5.1 ccache.tar.gz

RUN git config --global --add safe.directory /var/local/jenkins/grpc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do we know it's /var/local/jenkins/grpc? Is this $HOME? Should we then use the env var?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not home. As far as I know, there is no env var provided for this. It's simply hardcoded in the docker images. We could set an env var in run_tests.py, but I think that refactor is out of the scope of this PR.

5 changes: 4 additions & 1 deletion tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM quay.io/pypa/musllinux_1_1_i686:2021-11-15-a808c18
FROM quay.io/pypa/musllinux_1_1_i686:2022-08-29-0fd77fa

###################################
# Install Python build requirements
Expand All @@ -21,6 +21,7 @@ RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython

#=================
# Install ccache
Expand All @@ -35,3 +36,5 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
&& make -j4 && make install \
&& cd ../.. \
&& rm -rf ccache-4.5.1 ccache.tar.gz

RUN git config --global --add safe.directory /var/local/jenkins/grpc
17 changes: 17 additions & 0 deletions tools/internal_ci/helper_scripts/install_python_interpreters.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,20 @@ $Python310x64Config = @{
PythonInstallerHash = "9ea305690dbfd424a632b6a659347c1e"
}
Install-Python @Python310x64Config

# Python 3.11
$Python311x86Config = @{
PythonVersion = "3.11.0"
PythonInstaller = "python-3.11.0rc1"
PythonInstallPath = "C:\Python311_32bit"
PythonInstallerHash = "d2e5420e53d9e71c82b4a19763dbaa12"
}
Install-Python @Python311x86Config

$Python311x64Config = @{
PythonVersion = "3.11.0"
PythonInstaller = "python-3.11.0rc1-amd64"
PythonInstallPath = "C:\Python311"
PythonInstallerHash = "5943d8702e40a5ccd62e5a8d4c8852aa"
}
Install-Python @Python311x64Config
8 changes: 8 additions & 0 deletions tools/internal_ci/helper_scripts/prepare_build_macos_rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ then
shasum -c /tmp/python_installer_checksum.sha256
time sudo installer -pkg ./python-3.10.5-macos11.pkg -target /
fi

# Install Python 3.11 if it doesn't exist
if [ ! -f "/usr/local/bin/python3.11" ]; then
time curl -O https://www.python.org/ftp/python/3.11.0/python-3.11.0rc1-macos11.pkg
echo "eec3f817797b1d61f48f29b96ac0443ea19f3170 python-3.11.0rc1-macos11.pkg" > /tmp/python_installer_checksum.sha256
shasum -c /tmp/python_installer_checksum.sha256
time sudo installer -pkg ./python-3.11.0rc1-macos11.pkg -target /
fi
fi

if [ "${PREPARE_BUILD_INSTALL_DEPS_CSHARP}" == "true" ]
Expand Down
23 changes: 16 additions & 7 deletions tools/run_tests/artifacts/artifact_targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,40 +441,49 @@ def targets():
PythonArtifact('manylinux2014', 'x64', 'cp37-cp37m', presubmit=True),
PythonArtifact('manylinux2014', 'x64', 'cp38-cp38', presubmit=True),
PythonArtifact('manylinux2014', 'x64', 'cp39-cp39'),
PythonArtifact('manylinux2014', 'x64', 'cp310-cp310', presubmit=True),
PythonArtifact('manylinux2014', 'x64', 'cp310-cp310'),
PythonArtifact('manylinux2014', 'x64', 'cp311-cp311', presubmit=True),
PythonArtifact('manylinux2014', 'x86', 'cp37-cp37m', presubmit=True),
PythonArtifact('manylinux2014', 'x86', 'cp38-cp38', presubmit=True),
PythonArtifact('manylinux2014', 'x86', 'cp39-cp39'),
PythonArtifact('manylinux2014', 'x86', 'cp310-cp310', presubmit=True),
PythonArtifact('manylinux2014', 'x86', 'cp310-cp310'),
PythonArtifact('manylinux2014', 'x86', 'cp311-cp311', presubmit=True),
PythonArtifact('manylinux2014', 'aarch64', 'cp37-cp37m',
presubmit=True),
PythonArtifact('manylinux2014', 'aarch64', 'cp38-cp38', presubmit=True),
PythonArtifact('manylinux2014', 'aarch64', 'cp39-cp39'),
PythonArtifact('manylinux2014', 'aarch64', 'cp310-cp310'),
# TODO(https://github.com/grpc/grpc/issues/30927): Support aarch64 with 3.11. Blocked on dockcross support.
PythonArtifact('linux_extra', 'armv7', 'cp37-cp37m', presubmit=True),
PythonArtifact('linux_extra', 'armv7', 'cp38-cp38'),
PythonArtifact('linux_extra', 'armv7', 'cp39-cp39'),
PythonArtifact('linux_extra', 'armv7', 'cp310-cp310', presubmit=True),
PythonArtifact('musllinux_1_1', 'x64', 'cp310-cp310', presubmit=True),
PythonArtifact('linux_extra', 'armv7', 'cp310-cp310'),
PythonArtifact('linux_extra', 'armv7', 'cp311-cp311', presubmit=True),
PythonArtifact('musllinux_1_1', 'x64', 'cp310-cp310'),
PythonArtifact('musllinux_1_1', 'x64', 'cp311-cp311', presubmit=True),
PythonArtifact('musllinux_1_1', 'x64', 'cp37-cp37m', presubmit=True),
PythonArtifact('musllinux_1_1', 'x64', 'cp38-cp38'),
PythonArtifact('musllinux_1_1', 'x64', 'cp39-cp39'),
PythonArtifact('musllinux_1_1', 'x86', 'cp310-cp310', presubmit=True),
PythonArtifact('musllinux_1_1', 'x86', 'cp310-cp310'),
PythonArtifact('musllinux_1_1', 'x86', 'cp311-cp311', presubmit=True),
PythonArtifact('musllinux_1_1', 'x86', 'cp37-cp37m', presubmit=True),
PythonArtifact('musllinux_1_1', 'x86', 'cp38-cp38'),
PythonArtifact('musllinux_1_1', 'x86', 'cp39-cp39'),
PythonArtifact('macos', 'x64', 'python3.7', presubmit=True),
PythonArtifact('macos', 'x64', 'python3.8'),
PythonArtifact('macos', 'x64', 'python3.9'),
PythonArtifact('macos', 'x64', 'python3.10', presubmit=True),
PythonArtifact('macos', 'x64', 'python3.11', presubmit=True),
PythonArtifact('windows', 'x86', 'Python37_32bit', presubmit=True),
PythonArtifact('windows', 'x86', 'Python38_32bit'),
PythonArtifact('windows', 'x86', 'Python39_32bit'),
PythonArtifact('windows', 'x86', 'Python310_32bit', presubmit=True),
PythonArtifact('windows', 'x86', 'Python310_32bit'),
PythonArtifact('windows', 'x86', 'Python311_32bit', presubmit=True),
PythonArtifact('windows', 'x64', 'Python37', presubmit=True),
PythonArtifact('windows', 'x64', 'Python38'),
PythonArtifact('windows', 'x64', 'Python39'),
PythonArtifact('windows', 'x64', 'Python310', presubmit=True),
PythonArtifact('windows', 'x64', 'Python310'),
PythonArtifact('windows', 'x64', 'Python311', presubmit=True),
RubyArtifact('linux', 'x86-mingw32', presubmit=True),
RubyArtifact('linux', 'x64-mingw32', presubmit=True),
RubyArtifact('linux', 'x64-mingw-ucrt', presubmit=True),
Expand Down