Merge pull request #228 from hugovk/rename-master-to-main

Rename master to main
This commit is contained in:
Andrew Murray 2021-10-16 21:01:52 +11:00 committed by GitHub
commit 73924dc8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -102,7 +102,7 @@ jobs:
python: "3.8"
macos-target: "11.0"
env:
BUILD_COMMIT: master
BUILD_COMMIT: main
PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }}
TRAVIS_OS_NAME: ${{ matrix.os-name }}

View File

@ -56,7 +56,7 @@ before_install:
install:
# Maybe get and clean and patch source
- if [[ -n "$LATEST" ]]; then BUILD_COMMIT=master; fi
- if [[ -n "$LATEST" ]]; then BUILD_COMMIT=main; fi
- clean_code $REPO_DIR $BUILD_COMMIT
- build_wheel $REPO_DIR $PLAT
- ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/"

View File

@ -9,7 +9,7 @@ This repository creates wheels for tagged versions of Pillow::
:target: https://github.com/python-pillow/pillow-wheels/actions
:alt: GitHub Actions build status
.. image:: https://img.shields.io/travis/com/python-pillow/pillow-wheels/master.svg
.. image:: https://img.shields.io/travis/com/python-pillow/pillow-wheels/main.svg
:target: https://travis-ci.com/github/python-pillow/pillow-wheels
:alt: Travis CI build status

View File

@ -1,7 +1,7 @@
# Define custom utilities
# Test for macOS with [ -n "$IS_MACOS" ]
ARCHIVE_SDIR=pillow-depends-master
ARCHIVE_SDIR=pillow-depends-main
# Package versions for fresh source builds
FREETYPE_VERSION=2.11.0
@ -21,8 +21,8 @@ LIBXCB_VERSION=1.14
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
curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip
untar pillow-depends-main.zip
build_xz
if [ -z "$IS_MACOS" ]; then
@ -139,7 +139,7 @@ function run_tests {
python3 -m pip install numpy
fi
mv ../pillow-depends-master/test_images/* ../Pillow/Tests/images
mv ../pillow-depends-main/test_images/* ../Pillow/Tests/images
# Runs tests on installed distribution from an empty directory
(cd ../Pillow && run_tests_in_repo)

View File

@ -7,7 +7,7 @@ if [ $# -eq 0 ]; then
exit
fi
git checkout master
git checkout main
git submodule update --init Pillow
cd Pillow
git fetch --all