Skip to content

Commit cf594c7

Browse files
committed
debug some more
1 parent ab520d4 commit cf594c7

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ else
106106
exit 1
107107
fi
108108

109-
#docker run --rm -v $(pwd)/tests:/tests:ro quay.io/pypa/${POLICY}_${PLATFORM}:${COMMIT_SHA} /tests/run_tests.sh
109+
docker run --rm -v $(pwd)/tests:/tests:ro quay.io/pypa/${POLICY}_${PLATFORM}:${COMMIT_SHA} /tests/run_tests.sh
110110

111111
if [ ${USE_LOCAL_CACHE} -ne 0 ]; then
112112
if [ -d $(pwd)/.buildx-cache-${POLICY}_${PLATFORM} ]; then

docker/Dockerfile

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -104,45 +104,14 @@ RUN export OPENSSL_ROOT=openssl-3.0.15 && \
104104
export OPENSSL_DOWNLOAD_URL=https://github.com/openssl/openssl/releases/download/${OPENSSL_ROOT} && \
105105
manylinux-entrypoint /build_scripts/build-openssl.sh
106106

107-
108-
FROM build_cpython_system_ssl AS build_cpython36
109-
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
110-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.6.15
111-
112-
FROM build_cpython_system_ssl AS build_cpython37
113-
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
114-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.7.17
115-
116-
117-
FROM build_cpython AS build_cpython38
118-
COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt
119-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.20
120-
121-
FROM build_cpython AS build_cpython39
122-
COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt
123-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.9.20
124-
125107
FROM build_cpython AS build_cpython310
126108
COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt
127109
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.10.15
128110

129-
FROM build_cpython AS build_cpython311
130-
COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt
131-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.10
132-
133111
FROM build_cpython AS build_cpython312
134112
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
135113
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.7
136114

137-
FROM build_cpython AS build_cpython313
138-
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
139-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0
140-
141-
FROM build_cpython AS build_cpython313_nogil
142-
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
143-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0 nogil
144-
145-
146115
FROM runtime_base
147116
COPY --from=build_git /manylinux-rootfs /
148117
COPY --from=build_cpython_system_ssl /manylinux-rootfs /

docker/build_scripts/build-cpython.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ fi
7878
./configure \
7979
CFLAGS_NODIST="${MANYLINUX_CFLAGS} ${MANYLINUX_CPPFLAGS} ${CFLAGS_EXTRA}" \
8080
LDFLAGS_NODIST="${MANYLINUX_LDFLAGS}" \
81-
--prefix=${PREFIX} ${CONFIGURE_ARGS} > /dev/null
82-
make > /dev/null
81+
--prefix=${PREFIX} ${CONFIGURE_ARGS}
82+
make
8383
make install > /dev/null
8484
popd
8585
rm -rf Python-${CPYTHON_VERSION} Python-${CPYTHON_VERSION}.tgz Python-${CPYTHON_VERSION}.tgz.asc

tests/run_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ else
1717
EXPECTED_PYTHON_COUNT=10
1818
EXPECTED_PYTHON_COUNT_ALL=13
1919
else
20-
EXPECTED_PYTHON_COUNT=9
21-
EXPECTED_PYTHON_COUNT_ALL=9
20+
EXPECTED_PYTHON_COUNT=2
21+
EXPECTED_PYTHON_COUNT_ALL=2
2222
fi
2323
fi
2424

0 commit comments

Comments
 (0)