From fd50dc2dc5715fa3a06b7ea135eb032b5b3460da Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 15 Oct 2021 16:02:27 +0300 Subject: [PATCH] Rename master to main --- .github/workflows/wheels.yml | 2 +- .travis.yml | 2 +- README.rst | 2 +- config.sh | 8 ++++---- update-pillow-tag.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 943a6a03e..8a9c60a39 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -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 }} diff --git a/.travis.yml b/.travis.yml index a8c077317..480f09bb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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}/" diff --git a/README.rst b/README.rst index 96df9923e..1f266fea3 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/config.sh b/config.sh index f619abceb..362650970 100644 --- a/config.sh +++ b/config.sh @@ -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) diff --git a/update-pillow-tag.sh b/update-pillow-tag.sh index e5cd00c67..efad3766d 100755 --- a/update-pillow-tag.sh +++ b/update-pillow-tag.sh @@ -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