Skip to content

Commit

Permalink
[Pillow] pillow-wheels has been incorporated into Pillow (#11156)
Browse files Browse the repository at this point in the history
Two changes for the pillow project.

1. Pillow previously had a separate repository for wheel building
scripts - https://github.com/python-pillow/pillow-wheels

However, that has been incorporated into the main repository for
simplicity - python-pillow/Pillow#7418

So this PR updates the project here to use the new location.

2. Pillow's oss-fuzz CI job is [currently failing because pip is too
old](https://github.com/python-pillow/Pillow/actions/runs/6666944851/job/18119459590#step:4:9947).
So this PR updates it.

cc @hugovk

---------

Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
  • Loading branch information
radarhere and radarhere committed Oct 27, 2023
1 parent 750c280 commit dc24b10
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions projects/pillow/Dockerfile
Expand Up @@ -24,7 +24,6 @@ RUN apt-get update && \
rsync

RUN git clone --depth 1 https://github.com/python-pillow/Pillow
RUN git clone --depth 1 https://github.com/python-pillow/pillow-wheels

RUN $SRC/Pillow/Tests/oss-fuzz/build_dictionaries.sh

Expand All @@ -33,13 +32,15 @@ COPY build_depends.sh $SRC
RUN ln -s /usr/local/bin/python3 /usr/local/bin/python \
&& ln -s /bin/true /usr/local/bin/yum_install \
&& ln -s /bin/true /usr/local/bin/yum \
&& cd $SRC/pillow-wheels \
&& git submodule update --init multibuild \
&& cd $SRC/Pillow \
&& git submodule update --init wheels/multibuild \
&& bash $SRC/build_depends.sh

# install extra test images for a better starting corpus
RUN cd Pillow/depends && ./install_extra_test_images.sh

RUN python3 -m pip install --upgrade pip

COPY build.sh $SRC/

# pillow optional runtime dependencies
Expand Down
6 changes: 3 additions & 3 deletions projects/pillow/build_depends.sh
Expand Up @@ -15,15 +15,15 @@
# limitations under the License.


. multibuild/common_utils.sh
. wheels/multibuild/common_utils.sh

export CONFIGURE_BUILD_SOURCED=1
BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
export CPPFLAGS="-I$BUILD_PREFIX/include $CPPFLAGS"
export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH"
export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"

. multibuild/library_builders.sh
. config.sh
. wheels/multibuild/library_builders.sh
. wheels/config.sh

pre_build

0 comments on commit dc24b10

Please sign in to comment.