From cb9866a1387ac7216e28c558d212c0356ff7e1af Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 17 May 2021 17:50:07 -0400 Subject: [PATCH 1/5] chore: rename joerick/cibuildwheel -> pypa/cibuildwheel --- .github/workflows/update-dependencies.yml | 2 +- README.md | 22 +++++++++++----------- appveyor.yml | 2 +- bin/bump_version.py | 2 +- bin/make_dependency_update_pr.py | 2 +- bin/run_example_ci_configs.py | 14 ++++++-------- cibuildwheel/__main__.py | 2 +- cibuildwheel/macos.py | 2 +- cibuildwheel/windows.py | 2 +- docs/contributing.md | 4 ++-- docs/deliver-to-pypi.md | 2 +- docs/faq.md | 6 +++--- docs/setup.md | 4 ++-- examples/github-apple-silicon.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- mkdocs.yml | 2 +- setup.cfg | 4 ++-- test/test_pep518.py | 2 +- test/test_ssl.py | 4 ++-- unit_test/download_test.py | 2 +- 23 files changed, 45 insertions(+), 47 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 57a64468e..568133113 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 == 'joerick/cibuildwheel' + if: github.ref == 'refs/heads/master' && github.repository == 'pypa/cibuildwheel' uses: peter-evans/create-pull-request@v3 with: commit-message: Update dependencies diff --git a/README.md b/README.md index cb480cc72..dfd515960 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,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/joerick/cibuildwheel/workflows/Test/badge.svg)](https://github.com/joerick/cibuildwheel/actions) -[![Travis Status](https://img.shields.io/travis/joerick/cibuildwheel/master?logo=travis)](https://travis-ci.org/joerick/cibuildwheel) -[![AppVeyor status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/master) -[![CircleCI Status](https://img.shields.io/circleci/build/gh/joerick/cibuildwheel/master?logo=circleci)](https://circleci.com/gh/joerick/cibuildwheel) +[![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions) +[![Travis Status](https://img.shields.io/travis/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.org/pypa/cibuildwheel) +[![AppVeyor status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/pypa/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/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master) @@ -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/joerick/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/master/examples). Options ------- @@ -322,7 +322,7 @@ Here are some repos that use cibuildwheel. -> Add your repo here! Let us know on [GitHub Discussions](https://github.com/joerick/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`. +> Add your repo here! Let us know on [GitHub Discussions](https://github.com/pypa/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`. > > I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions! @@ -393,7 +393,7 @@ _5 February 2021_ ```yaml - name: Build wheels - uses: joerick/cibuildwheel@version # e.g. v1.9.0 + uses: pypa/cibuildwheel@version # e.g. v1.9.0 with: output-dir: wheelhouse # env: @@ -721,7 +721,7 @@ _26 May 2019_ - 🌟 Add support for building on Azure pipelines! This lets you build all Linux, Mac and Windows wheels on one service, so it promises to be the easiest to set up! Check out the quickstart in the docs, or - [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example) + [cibuildwheel-azure-example](https://github.com/pypa/cibuildwheel-azure-example) for an example project. (#126, #132) - 🛠 Internal change - the end-to-end test projects format was updated, so we can more precisely assert what should be produced for each one. (#136, #137). @@ -897,9 +897,9 @@ Credits Massive props also to- -- @zfrenchee for [help debugging many issues](https://github.com/joerick/cibuildwheel/issues/2) -- @lelit for some great bug reports and [contributions](https://github.com/joerick/cibuildwheel/pull/73) -- @mayeut for a [phenomenal PR](https://github.com/joerick/cibuildwheel/pull/71) patching Python itself for better compatibility! +- @zfrenchee for [help debugging many issues](https://github.com/pypa/cibuildwheel/issues/2) +- @lelit for some great bug reports and [contributions](https://github.com/pypa/cibuildwheel/pull/73) +- @mayeut for a [phenomenal PR](https://github.com/pypa/cibuildwheel/pull/71) patching Python itself for better compatibility! - @czaki for being a super-contributor over many PRs and helping out with countless issues! - @mattip for his help with adding PyPy support to cibuildwheel diff --git a/appveyor.yml b/appveyor.yml index 080908a2c..96d8a950d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ init: install: python -m pip install -e ".[dev]" pytest-custom-exit-code # the '-u' flag is required so the output is in the correct order. -# See https://github.com/joerick/cibuildwheel/pull/24 for more info. +# See https://github.com/pypa/cibuildwheel/pull/24 for more info. test_script: python -u ./bin/run_tests.py branches: diff --git a/bin/bump_version.py b/bin/bump_version.py index a6dbdb2fe..60b8ce5ba 100755 --- a/bin/bump_version.py +++ b/bin/bump_version.py @@ -52,7 +52,7 @@ def bump_version() -> None: cd_date, cd_time, cd_tz = commit_date_str.split(" ") url_opts = urllib.parse.urlencode({"q": f"is:pr merged:>{cd_date}T{cd_time}{cd_tz}"}) - url = f"https://github.com/joerick/cibuildwheel/pulls?{url_opts}" + url = f"https://github.com/pypa/cibuildwheel/pulls?{url_opts}" print(f"PRs merged since last release:\n {url}") print() diff --git a/bin/make_dependency_update_pr.py b/bin/make_dependency_update_pr.py index ba20f9787..c3631aa8f 100755 --- a/bin/make_dependency_update_pr.py +++ b/bin/make_dependency_update_pr.py @@ -62,7 +62,7 @@ def main(): "gh", "pr", "create", - "--repo=joerick/cibuildwheel", + "--repo=pypa/cibuildwheel", "--base=master", "--title=Update dependencies", f"--body='{body}'", diff --git a/bin/run_example_ci_configs.py b/bin/run_example_ci_configs.py index dfac9b769..8c4248012 100755 --- a/bin/run_example_ci_configs.py +++ b/bin/run_example_ci_configs.py @@ -39,7 +39,7 @@ def generate_basic_project(path): CIService( name="appveyor", dst_config_path="appveyor.yml", - badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/{branch})", + badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/pypa/cibuildwheel/branch/{branch})", ), CIService( name="azure-pipelines", @@ -49,22 +49,22 @@ def generate_basic_project(path): CIService( name="circleci", dst_config_path=".circleci/config.yml", - badge_md="[![CircleCI](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch})", + badge_md="[![CircleCI](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch})", ), CIService( name="github", dst_config_path=".github/workflows/example.yml", - badge_md="[![Build](https://github.com/joerick/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/joerick/cibuildwheel/actions)", + badge_md="[![Build](https://github.com/pypa/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/pypa/cibuildwheel/actions)", ), CIService( name="travis-ci", dst_config_path=".travis.yml", - badge_md="[![Build Status](https://travis-ci.org/joerick/cibuildwheel.svg?branch={branch})](https://travis-ci.org/joerick/cibuildwheel)", + badge_md="[![Build Status](https://travis-ci.org/pypa/cibuildwheel.svg?branch={branch})](https://travis-ci.org/pypa/cibuildwheel)", ), CIService( name="gitlab", dst_config_path=".gitlab-ci.yml", - badge_md="[![Gitlab](https://gitlab.com/joerick/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/joerick/cibuildwheel/-/commits/{branch})", + badge_md="[![Gitlab](https://gitlab.com/pypa/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/pypa/cibuildwheel/-/commits/{branch})", ), ] @@ -140,9 +140,7 @@ def run_example_ci_configs(config_files=None): print() print("> **Examples test run**") print("> ") - print( - f"> Branch: [{branch_name}](https://github.com/joerick/cibuildwheel/tree/{branch_name})" - ) + print(f"> Branch: [{branch_name}](https://github.com/pypa/cibuildwheel/tree/{branch_name})") print("> ") print("> | Service | Config | Status |") print("> |---|---|---|") diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index baa0227eb..c27c426f8 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -70,7 +70,7 @@ def main() -> None: description="Build wheels for all the platforms.", epilog=""" Most options are supplied via environment variables. - See https://github.com/joerick/cibuildwheel#options for info. + See https://github.com/pypa/cibuildwheel#options for info. """, ) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index c5a22b689..f3c1f8eab 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -373,7 +373,7 @@ def build(options: BuildOptions) -> None: built_wheel_dir.mkdir(parents=True) # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org - # see https://github.com/joerick/cibuildwheel/pull/369 + # see https://github.com/pypa/cibuildwheel/pull/369 call( [ "pip", diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 048842896..54f333b83 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -266,7 +266,7 @@ def build(options: BuildOptions) -> None: shutil.rmtree(built_wheel_dir) built_wheel_dir.mkdir(parents=True) # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org - # see https://github.com/joerick/cibuildwheel/pull/369 + # see https://github.com/pypa/cibuildwheel/pull/369 call( [ "pip", diff --git a/docs/contributing.md b/docs/contributing.md index 60b8f825b..635550afd 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -29,7 +29,7 @@ cibuildwheel doesn't really do anything itself - it's always deferring to other We're not responsible for errors in those tools, for fixing errors/crashes there. But cibuildwheel's job is providing users with an 'integrated' user experience across those tools. We provide an abstraction. The user says 'build me some wheels', not 'open the docker container, build a wheel with pip, fix up the symbols with auditwheel' etc. However, errors have a habit of breaking abstractions. And this is where users get confused, because the mechanism of cibuildwheel is laid bare, and they must understand a little bit how it works to debug. -So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/joerick/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves. +So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/pypa/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves. Maintainer notes ---------------- @@ -136,4 +136,4 @@ twine upload dist/* git push && git push --tags ``` -Then head to https://github.com/joerick/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry. +Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry. diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md index a68ba928d..de95cca7c 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/joerick/cibuildwheel/blob/master/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/joerick/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/joerick/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up. +[`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. diff --git a/docs/faq.md b/docs/faq.md index b25abe219..07a74a332 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -12,7 +12,7 @@ If your wheel didn't compile, check the list below for some debugging tips. - Windows: missing C feature. The Windows C compiler doesn't support C language features invented after 1990, so you'll have to backport your C code to C90. For me, this mostly involved putting my variable declarations at the top of the function like an animal. -- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/joerick/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv. +- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv. ### Building Python 2.7 / PyPy2 wheels @@ -183,7 +183,7 @@ python3 -m twine upload wheelhouse/*.whl Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler. -Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/joerick/cibuildwheel/issues/423) for details and references). +Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references). To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used: @@ -210,7 +210,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: joerick/cibuildwheel@v1.11.0 +uses: pypa/cibuildwheel@v1.11.0 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. diff --git a/docs/setup.md b/docs/setup.md index 393f74bf8..70c282117 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/joerick/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/master/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/joerick/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/master/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-apple-silicon.yml b/examples/github-apple-silicon.yml index a1a2b462e..9ee33d0de 100644 --- a/examples/github-apple-silicon.yml +++ b/examples/github-apple-silicon.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: joerick/cibuildwheel@v1.11.0 + uses: pypa/cibuildwheel@v1.11.0 env: CIBW_ARCHS_MACOS: x86_64 universal2 diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 8081b147e..c732160e9 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -27,7 +27,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: joerick/cibuildwheel@v1.11.0 + uses: pypa/cibuildwheel@v1.11.0 - uses: actions/upload-artifact@v2 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 0711d1c9a..dc3e762d4 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: joerick/cibuildwheel@v1.11.0 + uses: pypa/cibuildwheel@v1.11.0 # to supply options, put them in 'env', like: # env: # CIBW_SOME_OPTION: value diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 8e16db3e5..17b512a60 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -25,7 +25,7 @@ jobs: platforms: all - name: Build wheels - uses: joerick/cibuildwheel@v1.11.0 + uses: pypa/cibuildwheel@v1.11.0 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 56572e559..9bdcaa039 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -34,9 +34,9 @@ stages: # Only execute deployment stage on tagged commits, and from your repository # (e.g. not PRs). Replace with your repo name. - name: deploy - if: tag IS PRESENT AND repo = joerick/cibuildwheel + if: tag IS PRESENT AND repo = pypa/cibuildwheel # To only build tags that look like vX.Y.Z: - # if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = joerick/cibuildwheel + # if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = pypa/cibuildwheel jobs: include: diff --git a/mkdocs.yml b/mkdocs.yml index b6d512445..9853a94f8 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,7 +5,7 @@ theme: highlightjs: true hljs_languages: - yaml -repo_url: https://github.com/joerick/cibuildwheel +repo_url: https://github.com/pypa/cibuildwheel extra_css: - extra.css diff --git a/setup.cfg b/setup.cfg index 722bb2bfb..afc13fbad 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ version = 1.11.0 description = Build Python wheels on CI with minimal configuration. long_description = file: README.md long_description_content_type = text/markdown -url = https://github.com/joerick/cibuildwheel +url = https://github.com/pypa/cibuildwheel author = Joe Rickerby author_email = joerick@mac.com license = BSD @@ -24,7 +24,7 @@ classifiers = Topic :: Software Development :: Build Tools keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows project_urls = - Changelog=https://github.com/joerick/cibuildwheel#changelog + Changelog=https://github.com/pypa/cibuildwheel#changelog Documentation=https://cibuildwheel.readthedocs.io/ [options] diff --git a/test/test_pep518.py b/test/test_pep518.py index f3f0a023f..921024f55 100644 --- a/test/test_pep518.py +++ b/test/test_pep518.py @@ -46,7 +46,7 @@ def test_pep518(tmp_path): assert set(actual_wheels) == set(expected_wheels) # These checks ensure an extra file is not created when using custom - # workaround; see https://github.com/joerick/cibuildwheel/issues/421 + # workaround; see https://github.com/pypa/cibuildwheel/issues/421 assert not (project_dir / "42").exists() assert not (project_dir / "4.1.2").exists() diff --git a/test/test_ssl.py b/test/test_ssl.py index 253584a4f..32864cf26 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/joerick/cibuildwheel/master/CI.md", context=context) - data = urlopen("https://raw.githubusercontent.com/joerick/cibuildwheel/master/CI.md") + data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/master/CI.md", context=context) + data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/master/CI.md") """ ) ) diff --git a/unit_test/download_test.py b/unit_test/download_test.py index 41c4341cc..0aac14309 100644 --- a/unit_test/download_test.py +++ b/unit_test/download_test.py @@ -5,7 +5,7 @@ from cibuildwheel.util import download -DOWNLOAD_URL = "https://raw.githubusercontent.com/joerick/cibuildwheel/v1.6.3/requirements-dev.txt" +DOWNLOAD_URL = "https://raw.githubusercontent.com/pypa/cibuildwheel/v1.6.3/requirements-dev.txt" def test_download(monkeypatch, tmp_path): From 00aa455a48dd895b635cf48baf74f8d80fb63667 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 19 May 2021 22:11:59 +0100 Subject: [PATCH 2/5] Update Appveyor status badge markup Note that it still has joerick/cibuildwheel - confusingly it's still within my appveyor account, but this is the new project that points to the pypa github repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfd515960..29e36eaf7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.org/pypa/cibuildwheel) -[![AppVeyor status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/pypa/cibuildwheel/branch/master) +[![Appveyor status](https://ci.appveyor.com/api/projects/status/wdyl0scqy6pj2mkw?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel) [![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/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master) From 64dd03e1d98d562504f686ecb9c04a2afe4be3bb Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 24 May 2021 08:52:17 +0100 Subject: [PATCH 3/5] Update Appveyor badge markup again I went through a few passes to enable that project, here's the latest. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29e36eaf7..2b82bf795 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.org/pypa/cibuildwheel) -[![Appveyor status](https://ci.appveyor.com/api/projects/status/wdyl0scqy6pj2mkw?svg=true)](https://ci.appveyor.com/project/joerick/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/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master) From 3ce8aa8aeafeea73a24c98cfa725c60c4b6bd6c6 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 24 May 2021 08:55:35 +0100 Subject: [PATCH 4/5] Update Azure badge, also --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b82bf795..0310c3e25 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ cibuildwheel [![Travis Status](https://img.shields.io/travis/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.org/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/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master) +[![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) [Documentation](https://cibuildwheel.readthedocs.org) From 3c39c43550a41e6e9ee9e8bd31f3dc121067619a Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 24 May 2021 08:58:16 +0100 Subject: [PATCH 5/5] Update Travis badge to reference the .com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0310c3e25..09b047081 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 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/pypa/cibuildwheel/master?logo=travis)](https://travis-ci.org/pypa/cibuildwheel) +[![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)