diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dab6d634b..ce85daa77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Test on: push: branches: - - master + - main pull_request: paths-ignore: - 'docs/**' diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 568133113..d13705565 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -27,7 +27,7 @@ jobs: private_key: ${{ secrets.CIBUILDWHEEL_BOT_APP_PRIVATE_KEY }} - name: Create Pull Request - if: github.ref == 'refs/heads/master' && github.repository == 'pypa/cibuildwheel' + if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel' uses: peter-evans/create-pull-request@v3 with: commit-message: Update dependencies diff --git a/.travis.yml b/.travis.yml index e5f34fdf2..7f9f080b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: python branches: only: - - master + - main jobs: include: diff --git a/README.md b/README.md index 69f53167a..00f5a28b2 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ cibuildwheel [![PyPI](https://img.shields.io/pypi/v/cibuildwheel.svg)](https://pypi.python.org/pypi/cibuildwheel) [![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.readthedocs.io/en/stable/?badge=stable) [![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions) -[![Travis Status](https://img.shields.io/travis/com/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.com/pypa/cibuildwheel) -[![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/master?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/master) -[![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/master?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel) -[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=master) +[![Travis Status](https://img.shields.io/travis/com/pypa/cibuildwheel/main?logo=travis)](https://travis-ci.com/pypa/cibuildwheel) +[![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main) +[![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/main?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel) +[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main) [Documentation](https://cibuildwheel.readthedocs.org) @@ -95,7 +95,7 @@ jobs: path: ./wheelhouse/*.whl ``` -For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/pypa/cibuildwheel/tree/master/examples). +For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/pypa/cibuildwheel/tree/main/examples). Options ------- diff --git a/appveyor.yml b/appveyor.yml index 96d8a950d..192c8b9b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% - ps: | $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } - if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { + if (-not ($BRANCH -eq 'main' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code' } @@ -27,7 +27,7 @@ test_script: python -u ./bin/run_tests.py branches: only: - - master + - main skip_commits: files: diff --git a/bin/make_dependency_update_pr.py b/bin/make_dependency_update_pr.py index c3631aa8f..be8a57ad5 100755 --- a/bin/make_dependency_update_pr.py +++ b/bin/make_dependency_update_pr.py @@ -40,7 +40,7 @@ def main(): timestamp = time.strftime("%Y-%m-%dT%H-%M-%S", time.gmtime()) branch_name = f"update-constraints-{timestamp}" - shell(f"git checkout -b {branch_name} origin/master", check=True) + shell(f"git checkout -b {branch_name} origin/main", check=True) try: shell("bin/update_dependencies.py", check=True) @@ -63,7 +63,7 @@ def main(): "pr", "create", "--repo=pypa/cibuildwheel", - "--base=master", + "--base=main", "--title=Update dependencies", f"--body='{body}'", ], diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md index de95cca7c..bddeea0fe 100644 --- a/docs/deliver-to-pypi.md +++ b/docs/deliver-to-pypi.md @@ -33,4 +33,4 @@ Obviously, manual steps are for chumps, so we can automate this a little by usin If you don't need much control over the release of a package, you can set up cibuildwheel to deliver the wheels straight to PyPI. This doesn't require anycloud storage to work - you just need to bump the version and tag it. -[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/master/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/master/examples/github-deploy.yml) are example configurations that automatically upload wheels to PyPI. Also check out [this example repo](https://github.com/pypa/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up. +[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) are example configurations that automatically upload wheels to PyPI. Also check out [this example repo](https://github.com/pypa/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up. diff --git a/docs/setup.md b/docs/setup.md index 70c282117..01fba8a76 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -96,7 +96,7 @@ Commit this file, and push to GitHub - either to your default branch, or to a PR For more info on this file, check out the [docs](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions). -[`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/master/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. +[`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. # Azure Pipelines [linux/mac/windows] {: #azure-pipelines} @@ -127,7 +127,7 @@ Commit this file, enable building of your repo on Travis CI, and push. Then setup a deployment method by following the [Travis CI deployment docs](https://docs.travis-ci.com/user/deployment/), or see [Delivering to PyPI](deliver-to-pypi.md). For more info on `.travis.yml`, check out the [docs](https://docs.travis-ci.com/). -[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/master/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. +[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. # AppVeyor [linux/mac/windows] {: #appveyor} diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index c732160e9..c7bba1982 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -64,7 +64,7 @@ jobs: name: artifact path: dist - - uses: pypa/gh-action-pypi-publish@master + - uses: pypa/gh-action-pypi-publish@main with: user: __token__ password: ${{ secrets.pypi_password }} diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 9bdcaa039..448868b99 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -1,7 +1,7 @@ # In this configuration, the package is tested against multiple versions of python # on Linux and on one version of Python on Windows. If and only if all tests pass # will the wheels be built and deployed. Further, deployment is only initiated if -# the current branch is "master", the current commit is tagged, and the current +# the current branch is "main", the current commit is tagged, and the current # repo is yours (e.g. it won't run on a Pull Request). For convenience, a source # distribution is also created. diff --git a/test/test_ssl.py b/test/test_ssl.py index 32864cf26..5283a59d4 100644 --- a/test/test_ssl.py +++ b/test/test_ssl.py @@ -11,8 +11,8 @@ context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) data = urlopen("https://www.nist.gov", context=context) - data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/master/CI.md", context=context) - data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/master/CI.md") + data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md", context=context) + data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md") """ ) )