From 3b755246321f3930c843cb8ef56568c019983478 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 10:04:37 +0100 Subject: [PATCH 1/6] Fix badge URLs --- bin/run_example_ci_configs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/run_example_ci_configs.py b/bin/run_example_ci_configs.py index 9cd28daaf..90fdd3cb2 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/pypa/cibuildwheel/branch/{branch})", + badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/{branch}?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/{branch})", ), CIService( name="azure-pipelines", @@ -59,7 +59,7 @@ def generate_basic_project(path): CIService( name="travis-ci", dst_config_path=".travis.yml", - badge_md="[![Build Status](https://travis-ci.org/pypa/cibuildwheel.svg?branch={branch})](https://travis-ci.org/pypa/cibuildwheel)", + badge_md="[![Build Status](https://app.travis-ci.com/pypa/cibuildwheel.svg?branch={branch})](https://app.travis-ci.com/pypa/cibuildwheel)", ), CIService( name="gitlab", From d4e4886f55fc9524b608d0f8f64b06fd522d1d28 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 10:06:21 +0100 Subject: [PATCH 2/6] Update azure image --- examples/azure-pipelines-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 54c0dd3c4..a2de6ae07 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -1,6 +1,6 @@ jobs: - job: linux - pool: {vmImage: 'Ubuntu-16.04'} + pool: {vmImage: 'Ubuntu-18.04'} steps: - task: UsePythonVersion@0 - bash: | From 7a40973ed499b75fcebabb50dee4187d0bf9a3fe Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 10:06:51 +0100 Subject: [PATCH 3/6] Specify python version Travis still defaults to 3.6, which is EOL! --- examples/travis-ci-deploy.yml | 1 + examples/travis-ci-minimal.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index b2c569643..de57e9dae 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -4,6 +4,7 @@ os: linux dist: focal language: python +python: "3.9" jobs: include: diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 9328b561f..b78fb2e2d 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -1,6 +1,7 @@ os: linux dist: focal language: python +python: "3.9" jobs: include: From c940b2ee0cbcc3ec2b3cafa9e4aa06a710358519 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 09:15:20 +0100 Subject: [PATCH 4/6] Fix Gitlab support for bin/run_example_ci_config.py --- bin/run_example_ci_configs.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/run_example_ci_configs.py b/bin/run_example_ci_configs.py index 90fdd3cb2..fa7b16940 100755 --- a/bin/run_example_ci_configs.py +++ b/bin/run_example_ci_configs.py @@ -64,7 +64,7 @@ def generate_basic_project(path): CIService( name="gitlab", dst_config_path=".gitlab-ci.yml", - badge_md="[![Gitlab](https://gitlab.com/pypa/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/pypa/cibuildwheel/-/commits/{branch})", + badge_md="[![Gitlab](https://gitlab.com/joerick/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/joerick/cibuildwheel/-/commits/{branch})", ), CIService( name="cirrus-ci", @@ -75,14 +75,13 @@ def generate_basic_project(path): def ci_service_for_config_file(config_file): - service_name = Path(config_file).name.rsplit("-", 1)[0] + filename = Path(config_file).name - for service in services: - if service.name == service_name: - return service - - msg = f"unknown ci service for config file {config_file}" - raise ValueError(msg) + try: + return next(s for s in services if filename.startswith(s.name)) + except StopIteration: + msg = f"unknown ci service for config file {config_file}" + raise ValueError(msg) from None @click.command() From ac403a6e886454123009d37117a2993f9f6d3002 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 12:16:50 +0100 Subject: [PATCH 5/6] Update azure image to 20.04 in example and our CI --- azure-pipelines.yml | 2 +- examples/azure-pipelines-minimal.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 70275815a..ee0d47471 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,7 +1,7 @@ jobs: - job: linux_38 timeoutInMinutes: 120 - pool: {vmImage: 'Ubuntu-18.04'} + pool: {vmImage: 'Ubuntu-20.04'} steps: - task: UsePythonVersion@0 inputs: diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index a2de6ae07..303c39e64 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -1,6 +1,6 @@ jobs: - job: linux - pool: {vmImage: 'Ubuntu-18.04'} + pool: {vmImage: 'Ubuntu-20.04'} steps: - task: UsePythonVersion@0 - bash: | From 6086673d337a4f065399d57e3bfd5fce6e82cd7d Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 7 Oct 2022 12:16:57 +0100 Subject: [PATCH 6/6] Fix badge URL --- bin/run_example_ci_configs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run_example_ci_configs.py b/bin/run_example_ci_configs.py index fa7b16940..07f3a6cde 100755 --- a/bin/run_example_ci_configs.py +++ b/bin/run_example_ci_configs.py @@ -44,7 +44,7 @@ def generate_basic_project(path): CIService( name="azure-pipelines", dst_config_path="azure-pipelines.yml", - badge_md="[![Build Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/joerick.cibuildwheel?branchName={branch})](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName={branch})", + badge_md="[![Build Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName={branch})](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName={branch})", ), CIService( name="circleci",