Skip to content

Commit 649e33c

Browse files
authored
Don't set SETUPTOOLS_USE_DISTUTILS=stdlib (#31370)
* Don't set SETUPTOOLS_USE_DISTUTILS=stdlib since it doesn't work on Py3.12 * Unblock tests.
1 parent 611676d commit 649e33c

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

.github/workflows/build_wheels.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ jobs:
274274
CIBW_BUILD: ${{ matrix.os_python.python }}
275275
# TODO: https://github.com/apache/beam/issues/23048
276276
CIBW_SKIP: "*-musllinux_*"
277-
CIBW_ENVIRONMENT: "SETUPTOOLS_USE_DISTUTILS=stdlib"
278277
CIBW_BEFORE_BUILD: pip install cython==0.29.36 numpy --config-settings=setup-args="-Dallow-noblas=true" && pip install --upgrade setuptools
279278
run: cibuildwheel --print-build-identifiers && cibuildwheel --output-dir wheelhouse
280279
shell: bash
@@ -301,7 +300,6 @@ jobs:
301300
CIBW_BUILD: ${{ matrix.os_python.python }}
302301
# TODO: https://github.com/apache/beam/issues/23048
303302
CIBW_SKIP: "*-musllinux_*"
304-
CIBW_ENVIRONMENT: "SETUPTOOLS_USE_DISTUTILS=stdlib"
305303
CIBW_BEFORE_BUILD: pip install cython==0.29.36 numpy --config-settings=setup-args="-Dallow-noblas=true" && pip install --upgrade setuptools
306304
run: cibuildwheel --print-build-identifiers && cibuildwheel --output-dir wheelhouse
307305
shell: bash

.test-infra/jenkins/CommonJobProperties.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ class CommonJobProperties {
101101
environmentVariables {
102102
// Set SPARK_LOCAL_IP for spark tests.
103103
env('SPARK_LOCAL_IP', '127.0.0.1')
104-
// Set SETUPTOOLS_USE_DISTUTILS to workaround issue with setuptools
105-
// 50.0 and Ubuntu executors (BEAM-10841)
106-
env('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
107104
}
108105
credentialsBinding {
109106
string("CODECOV_TOKEN", "beam-codecov-token")

sdks/python/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ platform_identifiers_map.each { platform, idsuffix ->
161161
try {
162162
exec {
163163
environment CIBW_BUILD: "cp${pyversion}-${idsuffix}"
164-
environment CIBW_ENVIRONMENT: "SETUPTOOLS_USE_DISTUTILS=stdlib"
165164
executable 'sh'
166165
args '-c', ". ${envdir}/bin/activate && " +
167166
// note: sync cibuildwheel version with GitHub Action

sdks/python/setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ def get_portability_package_data():
383383
'pytz>=2018.3',
384384
'redis>=5.0.0,<6',
385385
'regex>=2020.6.8',
386-
'requests>=2.24.0,<3.0.0,!=2.32.0,!=2.32.1',
386+
# unblock tests until new version of `docker` is released.
387+
# https://github.com/docker/docker-py/pull/3257
388+
'requests>=2.24.0,<3.0.0,!=2.32.*',
387389
'typing-extensions>=3.7.0',
388390
'zstandard>=0.18.0,<1',
389391
# Dynamic dependencies must be specified in a separate list, otherwise

0 commit comments

Comments
 (0)