Skip to content

Commit 947f13c

Browse files
authored
chore: use SWIG PyPI distribution instead of building from sources (pypa#1353)
1 parent 51324db commit 947f13c

File tree

5 files changed

+25
-58
lines changed

5 files changed

+25
-58
lines changed

docker/Dockerfile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,6 @@ RUN export GIT_ROOT=git-2.36.2 && \
8282
manylinux-entrypoint /build_scripts/build-git.sh
8383

8484

85-
FROM build_base AS build_swig
86-
COPY build_scripts/build-swig.sh /build_scripts/
87-
RUN export SWIG_ROOT=swig-4.0.2 && \
88-
export SWIG_HASH=d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc && \
89-
export SWIG_DOWNLOAD_URL=https://sourceforge.net/projects/swig/files/swig/${SWIG_ROOT} && \
90-
export PCRE_ROOT=pcre-8.45 && \
91-
export PCRE_HASH=4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09 && \
92-
export PCRE_DOWNLOAD_URL=https://sourceforge.net/projects/pcre/files/pcre/8.45 && \
93-
manylinux-entrypoint /build_scripts/build-swig.sh
94-
95-
9685
FROM build_base AS build_cpython
9786
COPY build_scripts/build-sqlite3.sh /build_scripts/
9887
RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390100 && \
@@ -156,7 +145,6 @@ RUN manylinux-entrypoint /build_scripts/finalize-python.sh
156145

157146
FROM runtime_base
158147
COPY --from=build_git /manylinux-rootfs /
159-
COPY --from=build_swig /manylinux-rootfs /
160148
COPY --from=build_cpython /manylinux-rootfs /
161149
COPY --from=all_python /opt/_internal /opt/_internal/
162150
COPY build_scripts/finalize.sh \

docker/build_scripts/build-swig.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.9
3+
# To update, run:
4+
#
5+
# pip-compile --generate-hashes --output-file=docker/build_scripts/requirements-tools/swig .nox/update_python_tools/tmp/swig.in
6+
#
7+
swig==4.0.2 \
8+
--hash=sha256:0ce44ba7551487da90b35ecd72d14cf46cfbeaa5e119c00b0cd1386246b249a7 \
9+
--hash=sha256:2530b8b916e305a75de81c4bb0db7672a819fdd1ad5e108a3843a9e1063fb732 \
10+
--hash=sha256:3868be948fbd248bab2068b1e1066de5efa56c5a71eba9941cc60f77d3e176b7 \
11+
--hash=sha256:512e584c0dabcb8a687d73c50fca912bc2b82d54921831bf910bd81dafe58c60 \
12+
--hash=sha256:5b1949ef7b3db85ca0b61d2c32a00ae784994933e1c79d84456e11dc11ac1ed5 \
13+
--hash=sha256:70034598862962f2b99b434f505d954cc9326bd15509430479db8013dbbeb5d7 \
14+
--hash=sha256:9a48d596ed3e04b2311ca1bea9728d8baaa1b85e4803e7ecde42753f881c5656 \
15+
--hash=sha256:9cd3321a997edad3ea9a1fc67eee5758fd615b12b3da684c1ded5683a38371f9 \
16+
--hash=sha256:9ed57acc8e181c6e04a4e3adec29b5e5831a34d2bdbc4996a992984c7b6ef59c \
17+
--hash=sha256:b5aec1cdf64765c31da72d6fb2d92230fbe087a8160a4573d53d7fda4818fc95 \
18+
--hash=sha256:c34367a96b31a58e97f6411203eee132060614ad198a4c2e2b3d73fbaeb6220d \
19+
--hash=sha256:cb7c9eb45a6516044d12b25c7c3c30d54986bb74f345ecfc860a72fc8f6427eb \
20+
--hash=sha256:e3f2c8fe646f9094116ec012422b0ddc82aa1f7bbb8b2123003cdec02a9582c3 \
21+
--hash=sha256:ed8f49783901924d794083cb8ee0d95dd09ab9b3eb9a8c2b75f785096ce60a3b \
22+
--hash=sha256:fb4cfa651da8f187217e15383438a09cc3a05d2b17da1ae4f1bd734bc6389861
23+
# via -r .nox/update_python_tools/tmp/swig.in

requirements-tools.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
auditwheel
22
cmake
33
patchelf
4+
swig

update_native_dependencies.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ def _update_with_root(tool, dry_run):
5252
"automake": "autotools-mirror/automake",
5353
"libtool": "autotools-mirror/libtool",
5454
"git": "git/git",
55-
"swig": "swig/swig",
5655
"openssl": "openssl/openssl",
5756
}
5857
major = {
@@ -149,7 +148,7 @@ def main():
149148
args = parser.parse_args()
150149
_update_cpython(args.dry_run)
151150
_update_sqlite(args.dry_run)
152-
for tool in ["autoconf", "automake", "libtool", "git", "swig", "openssl"]:
151+
for tool in ["autoconf", "automake", "libtool", "git", "openssl"]:
153152
_update_with_root(tool, args.dry_run)
154153
for tool in ["libxcrypt"]:
155154
_update_with_gh(tool, args.dry_run)

0 commit comments

Comments
 (0)