diff --git a/.appveyor.yml b/.appveyor.yml index 93140b89c..6cf40130e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,9 +19,9 @@ environment: install: -- curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip +- curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/main.zip - 7z x pillow-depends.zip -oc:\ -- mv c:\pillow-depends-master c:\pillow-depends +- mv c:\pillow-depends-main c:\pillow-depends - xcopy /S /Y c:\pillow-depends\test_images\* c:\pillow\tests\images - 7z x ..\pillow-depends\nasm-2.15.05-win64.zip -oc:\ - ..\pillow-depends\gs9550w32.exe /S @@ -84,7 +84,7 @@ deploy: artifact: /.*egg|wheel/ on: APPVEYOR_REPO_NAME: python-pillow/Pillow - branch: master + branch: main deploy: YES diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 35bd47be8..bc9587744 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,13 +4,13 @@ Bug fixes, feature additions, tests, documentation and more can be contributed v ## Bug fixes, feature additions, etc. -Please send a pull request to the master branch. Please include [documentation](https://pillow.readthedocs.io) and [tests](../Tests/README.rst) for new features. Tests or documentation without bug fixes or feature additions are welcome too. Feel free to ask questions [via issues](https://github.com/python-pillow/Pillow/issues/new), [Gitter](https://gitter.im/python-pillow/Pillow) or irc://irc.freenode.net#pil +Please send a pull request to the `main` branch. Please include [documentation](https://pillow.readthedocs.io) and [tests](../Tests/README.rst) for new features. Tests or documentation without bug fixes or feature additions are welcome too. Feel free to ask questions [via issues](https://github.com/python-pillow/Pillow/issues/new), [Gitter](https://gitter.im/python-pillow/Pillow) or irc://irc.freenode.net#pil - Fork the Pillow repository. -- Create a branch from master. +- Create a branch from `main`. - Develop bug fixes, features, tests, etc. - Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests. -- Create a pull request to pull the changes from your branch to the Pillow master. +- Create a pull request to pull the changes from your branch to the Pillow `main`. ### Guidelines @@ -18,7 +18,7 @@ Please send a pull request to the master branch. Please include [documentation]( - Provide tests for any newly added code. - Follow PEP 8. - When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor. -- Include [release notes](https://github.com/python-pillow/Pillow/tree/master/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests. +- Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests. ## Reporting Issues @@ -35,4 +35,4 @@ The best reproductions are self-contained scripts with minimal dependencies. If ## Security vulnerabilities -Please see our [security policy](https://github.com/python-pillow/Pillow/blob/master/.github/SECURITY.md). +Please see our [security policy](https://github.com/python-pillow/Pillow/blob/main/.github/SECURITY.md). diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 52456597b..58bb2cddf 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,14 +4,14 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main jobs: update_release_draft: if: github.repository == 'python-pillow/Pillow' runs-on: ubuntu-latest steps: - # Drafts your next release notes as pull requests are merged into "master" + # Drafts your next release notes as pull requests are merged into "main" - uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index d4aeb1fb3..46e9e5f2c 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -26,7 +26,7 @@ jobs: ubuntu-18.04-bionic-amd64, ubuntu-20.04-focal-amd64, ] - dockerTag: [master] + dockerTag: [main] include: - docker: "ubuntu-20.04-focal-arm64v8" qemu-arch: "aarch64" diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml index 28b1caff5..03c8022f3 100644 --- a/.github/workflows/test-valgrind.yml +++ b/.github/workflows/test-valgrind.yml @@ -22,7 +22,7 @@ jobs: docker: [ ubuntu-20.04-focal-amd64-valgrind, ] - dockerTag: [master] + dockerTag: [main] name: ${{ matrix.docker }} diff --git a/README.md b/README.md index 29b5b8a6a..205eada76 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Pillow logo + Pillow logo

# Pillow @@ -38,16 +38,16 @@ As of 2019, Pillow development is src="https://github.com/python-pillow/Pillow/workflows/Test%20Docker/badge.svg"> AppVeyor CI build status (Windows) + src="https://img.shields.io/appveyor/build/python-pillow/Pillow/main.svg?label=Windows%20build"> GitHub Actions wheels build status (Wheels) Travis CI wheels build status (aarch64) + src="https://img.shields.io/travis/com/python-pillow/pillow-wheels/main.svg?label=aarch64%20wheels"> Code coverage + src="https://codecov.io/gh/python-pillow/Pillow/branch/main/graph/badge.svg"> @@ -93,12 +93,12 @@ The core image library is designed for fast access to data stored in a few basic - [Documentation](https://pillow.readthedocs.io/) - [Installation](https://pillow.readthedocs.io/en/latest/installation.html) - [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html) -- [Contribute](https://github.com/python-pillow/Pillow/blob/master/.github/CONTRIBUTING.md) +- [Contribute](https://github.com/python-pillow/Pillow/blob/main/.github/CONTRIBUTING.md) - [Issues](https://github.com/python-pillow/Pillow/issues) - [Pull requests](https://github.com/python-pillow/Pillow/pulls) - [Release notes](https://pillow.readthedocs.io/en/stable/releasenotes/index.html) -- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - - [Pre-fork](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst#pre-fork) +- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) + - [Pre-fork](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst#pre-fork) ## Report a Vulnerability diff --git a/RELEASING.md b/RELEASING.md index 6045f84ac..cbedd449c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -8,8 +8,8 @@ information about how the version numbers line up with releases. Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154 -* [ ] Develop and prepare release in `master` branch. -* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `master` branch. +* [ ] Develop and prepare release in `main` branch. +* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `main` branch. * [ ] Check that all of the wheel builds [Pillow Wheel Builder](https://github.com/python-pillow/pillow-wheels) pass the tests in Travis CI and GitHub Actions. * [ ] In compliance with [PEP 440](https://www.python.org/dev/peps/pep-0440/), update version identifier in `src/PIL/_version.py` * [ ] Update `CHANGES.rst`. @@ -26,7 +26,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. make sdist twine check dist/* ``` -* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/master/RELEASING.md#binary-distributions) +* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#binary-distributions) * [ ] Check and upload all binaries and source distributions e.g.: ```bash twine check dist/* @@ -39,13 +39,13 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. Released as needed for security, installation or critical bug fixes. -* [ ] Make necessary changes in `master` branch. +* [ ] Make necessary changes in `main` branch. * [ ] Update `CHANGES.rst`. * [ ] Check out release branch e.g.: ```bash git checkout -t remotes/origin/5.2.x ``` -* [ ] Cherry pick individual commits from `master` branch to release branch e.g. `5.2.x`, then `git push`. +* [ ] Cherry pick individual commits from `main` branch to release branch e.g. `5.2.x`, then `git push`. @@ -63,7 +63,7 @@ Released as needed for security, installation or critical bug fixes. make sdist twine check dist/* ``` -* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/master/RELEASING.md#binary-distributions) +* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#binary-distributions) * [ ] Check and upload all binaries and source distributions e.g.: ```bash twine check dist/* @@ -76,7 +76,7 @@ Released as needed for security, installation or critical bug fixes. Released as needed privately to individual vendors for critical security-related bug fixes. * [ ] Prepare patch for all versions that will get a fix. Test against local installations. -* [ ] Commit against master, cherry pick to affected release branches. +* [ ] Commit against `main`, cherry pick to affected release branches. * [ ] Run local test matrix on each release & Python version. * [ ] Privately send to distros. * [ ] Run pre-release check via `make release-test` @@ -93,7 +93,7 @@ Released as needed privately to individual vendors for critical security-related make sdist twine check dist/* ``` -* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/master/RELEASING.md#binary-distributions) +* [ ] Create [binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#binary-distributions) * [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) ## Binary Distributions diff --git a/Tests/test_font_leaks.py b/Tests/test_font_leaks.py index 015210b4d..38f7ddac5 100644 --- a/Tests/test_font_leaks.py +++ b/Tests/test_font_leaks.py @@ -4,7 +4,7 @@ from .helper import PillowLeakTestCase, skip_unless_feature class TestTTypeFontLeak(PillowLeakTestCase): - # fails at iteration 3 in master + # fails at iteration 3 in main iterations = 10 mem_limit = 4096 # k @@ -24,7 +24,7 @@ class TestTTypeFontLeak(PillowLeakTestCase): class TestDefaultFontLeak(TestTTypeFontLeak): - # fails at iteration 37 in master + # fails at iteration 37 in main iterations = 100 mem_limit = 1024 # k diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh index 38f0e75d6..8c6704ac1 100755 --- a/depends/install_imagequant.sh +++ b/depends/install_imagequant.sh @@ -3,7 +3,7 @@ archive=libimagequant-2.16.0 -./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz +./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive diff --git a/depends/install_openjpeg.sh b/depends/install_openjpeg.sh index 7321b80f0..914e71e53 100755 --- a/depends/install_openjpeg.sh +++ b/depends/install_openjpeg.sh @@ -3,7 +3,7 @@ archive=openjpeg-2.4.0 -./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz +./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive diff --git a/depends/install_raqm.sh b/depends/install_raqm.sh index a7ce16792..3105465ec 100755 --- a/depends/install_raqm.sh +++ b/depends/install_raqm.sh @@ -4,7 +4,7 @@ archive=raqm-0.7.1 -./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz +./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive diff --git a/depends/install_raqm_cmake.sh b/depends/install_raqm_cmake.sh index c0dcd93b7..7d2c399df 100755 --- a/depends/install_raqm_cmake.sh +++ b/depends/install_raqm_cmake.sh @@ -4,7 +4,7 @@ archive=raqm-cmake-99300ff3 -./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz +./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive diff --git a/depends/install_webp.sh b/depends/install_webp.sh index 4a4e74305..8a9c96804 100755 --- a/depends/install_webp.sh +++ b/depends/install_webp.sh @@ -3,7 +3,7 @@ archive=libwebp-1.2.1 -./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz +./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz pushd $archive diff --git a/docs/about.rst b/docs/about.rst index 51b583ea0..96885d08d 100644 --- a/docs/about.rst +++ b/docs/about.rst @@ -19,7 +19,7 @@ The fork author's goal is to foster and support active development of PIL throug License ------- -Like PIL, Pillow is `licensed under the open source HPND License `_ +Like PIL, Pillow is `licensed under the open source HPND License `_ Why a fork? ----------- diff --git a/docs/conf.py b/docs/conf.py index 807281965..5c797b21c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -322,7 +322,7 @@ issues_github_path = "python-pillow/Pillow" # sphinxext.opengraph ogp_image = ( - "https://raw.githubusercontent.com/python-pillow/pillow-logo/master/" + "https://raw.githubusercontent.com/python-pillow/pillow-logo/main/" "pillow-logo-dark-text-1280x640.png" ) ogp_image_alt = "Pillow" diff --git a/docs/index.rst b/docs/index.rst index 3348feb89..3fbc8d0e6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -25,7 +25,7 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more `_ +`pilfont.py `_ from `pillow-scripts `_ to convert BDF and PCF font descriptors (X window font formats) to this format. diff --git a/docs/releasenotes/versioning.rst b/docs/releasenotes/versioning.rst index a8c9fc998..87f2ba422 100644 --- a/docs/releasenotes/versioning.rst +++ b/docs/releasenotes/versioning.rst @@ -11,7 +11,7 @@ Pillow follows `Semantic Versioning `_: 2. MINOR version when you add functionality in a backwards compatible manner, and 3. PATCH version when you make backwards compatible bug fixes. -Quarterly releases ("`Main Release `_") +Quarterly releases ("`Main Release `_") bump at least the MINOR version, as new functionality has likely been added in the prior three months. @@ -21,10 +21,10 @@ these occur every 12-18 months, guided by `Python's EOL schedule `_, and any APIs that have been deprecated for at least a year are removed at the same time. -PATCH versions ("`Point Release `_" -or "`Embargoed Release `_") +PATCH versions ("`Point Release `_" +or "`Embargoed Release `_") are for security, installation or critical bug fixes. These are less common as it is preferred to stick to quarterly releases. -Between quarterly releases, ".dev0" is appended to the "master" branch, indicating that +Between quarterly releases, ``.dev0`` is appended to the ``main`` branch, indicating that this is not a formally released copy. diff --git a/setup.py b/setup.py index b56e90634..3574c9137 100755 --- a/setup.py +++ b/setup.py @@ -992,7 +992,7 @@ try: "utm_source=pypi-pillow&utm_medium=pypi", "Release notes": "https://pillow.readthedocs.io/en/stable/releasenotes/" "index.html", - "Changelog": "https://github.com/python-pillow/Pillow/blob/master/" + "Changelog": "https://github.com/python-pillow/Pillow/blob/main/" "CHANGES.rst", "Twitter": "https://twitter.com/PythonPillow", },