diff --git a/README.rst b/README.rst index c26b33787..007c693bc 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,24 @@ This repository creates wheels for tagged versions of Pillow:: :target: https://travis-ci.org/python-pillow/pillow-wheels :alt: Travis CI build status (wheels) +Archives +-------- + +https://github.com/python-pillow/pillow-depends contains archives for libraries +that will be built as part of the Pillow build. + +In general, there is no need to put library archives there, because the +``multibuild`` scripts will download them from their respective URLs. + +But, the build will look in that repository before downloading from the +URL, so if there is a library that often fails to download, or you think might +fail to download, then download it and add it to the git repository. + +See the ``pre_build`` in ``config.sh`` and the ``fetch_unpack`` routine in +``multibuild/common_utils.sh`` for the logic, and the build recipes in +``multibuild/library_builders.sh`` for the filename to give to the downloaded +archive. + Dependencies ------------ @@ -40,4 +58,4 @@ Download wheels from Rackspace:: Upload wheels to PyPI:: cd a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com - twine upload Pillow-* + twine upload Pillow-* \ No newline at end of file diff --git a/archives/README.rst b/archives/README.rst deleted file mode 100644 index c3ead01f1..000000000 --- a/archives/README.rst +++ /dev/null @@ -1,18 +0,0 @@ -################################## -Archives for pillow library builds -################################## - -This directory contains archives for libraries that will be built as part of -the Pillow build. - -In general, there is no need to put library archives here, because the -``multibuild`` scripts will download them from their respective URLs. - -But, ``multibuild`` will look in this directory before downloading from the -URL, so if there is a library that often fails to download, or you think might -fail to download, then download it to this directory and add it to the git -repository. - -See the ``fetch_unpack`` routine in ``multibuild/common_utils.sh`` for the -logic, and the build recipes in ``multibuild/library_builders.sh`` for the -filename to give to the downloaded archive. diff --git a/archives/freetype-2.9.1.tar.gz b/archives/freetype-2.9.1.tar.gz deleted file mode 100644 index 01ad8ea24..000000000 Binary files a/archives/freetype-2.9.1.tar.gz and /dev/null differ diff --git a/archives/jpegsrc.v9c.tar.gz b/archives/jpegsrc.v9c.tar.gz deleted file mode 100644 index 4b782b54b..000000000 Binary files a/archives/jpegsrc.v9c.tar.gz and /dev/null differ diff --git a/archives/lcms2-2.9.tar.gz b/archives/lcms2-2.9.tar.gz deleted file mode 100644 index 630767728..000000000 Binary files a/archives/lcms2-2.9.tar.gz and /dev/null differ diff --git a/archives/libpng-1.6.32.tar.gz b/archives/libpng-1.6.32.tar.gz deleted file mode 100644 index 752b19285..000000000 Binary files a/archives/libpng-1.6.32.tar.gz and /dev/null differ diff --git a/archives/libwebp-1.0.0.tar.gz b/archives/libwebp-1.0.0.tar.gz deleted file mode 100644 index dd32ba8ab..000000000 Binary files a/archives/libwebp-1.0.0.tar.gz and /dev/null differ diff --git a/archives/openjpeg-2.1.0.tar.gz b/archives/openjpeg-2.1.0.tar.gz deleted file mode 100644 index efca2f7c9..000000000 Binary files a/archives/openjpeg-2.1.0.tar.gz and /dev/null differ diff --git a/archives/tiff-4.0.9.tar.gz b/archives/tiff-4.0.9.tar.gz deleted file mode 100644 index b0996702a..000000000 Binary files a/archives/tiff-4.0.9.tar.gz and /dev/null differ diff --git a/archives/zlib-1.2.11.tar.xz b/archives/zlib-1.2.11.tar.xz deleted file mode 100644 index 305b7a058..000000000 Binary files a/archives/zlib-1.2.11.tar.xz and /dev/null differ diff --git a/config.sh b/config.sh index e6aac10a6..bb475452d 100644 --- a/config.sh +++ b/config.sh @@ -1,6 +1,8 @@ # Define custom utilities # Test for OSX with [ -n "$IS_OSX" ] +ARCHIVE_SDIR=pillow-depends-master + # Package versions for fresh source builds FREETYPE_VERSION=2.9.1 LIBPNG_VERSION=1.6.32 @@ -14,6 +16,8 @@ LIBWEBP_VERSION=1.0.0 function pre_build { # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. + curl -fsSL -o pillow-depends-master.zip https://github.com/python-pillow/pillow-depends/archive/master.zip + untar pillow-depends-master.zip if [ -n "$IS_OSX" ]; then # Update to latest zlib for OSX build build_new_zlib