From a39d05164646e0922c5a0e12221ea60cc607d8c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:08:46 +0000 Subject: [PATCH 1/8] fix(deps): update module golang.org/x/mod to v0.21.0 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 09827f6..e81f044 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/MikeMoore63/pybuildInfo go 1.21 -require golang.org/x/mod v0.20.0 +require golang.org/x/mod v0.21.0 From dc4fb26750091ad7a1be80e49b7f32ee16d29088 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:02:19 +0000 Subject: [PATCH 2/8] fix: drop back to older build to see if root cause of build failure --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 01c6e72..2fbd5ac 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -28,7 +28,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.20.0 + uses: pypa/cibuildwheel@v2.19.2 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones From 3e78deca3b961ecb6bbec055f7ad77ac9719b5a6 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:06:38 +0000 Subject: [PATCH 3/8] feat: not issue so switch back --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 2fbd5ac..01c6e72 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -28,7 +28,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 + uses: pypa/cibuildwheel@v2.20.0 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones From c9f6a6f026660b975c844272a328081e6fb1b657 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:11:08 +0000 Subject: [PATCH 4/8] feat: new go mod needs go lang update --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e81f044..d36ace1 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/MikeMoore63/pybuildInfo -go 1.21 +go 1.22 require golang.org/x/mod v0.21.0 From 7085452990b820b9ba68997c658b18b770a2c757 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:19:07 +0000 Subject: [PATCH 5/8] feat: bump to go 1.22.7 --- installGo.ps1 | 2 +- pyproject.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installGo.ps1 b/installGo.ps1 index e32b384..f13a272 100644 --- a/installGo.ps1 +++ b/installGo.ps1 @@ -1,7 +1,7 @@ # Install the current Go release param( [string]$w='c:\go', - [string]$v='1.21.1' + [string]$v='1.22.7' ) Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope CurrentUser $OutputVariable = (go version) | Out-String diff --git a/pyproject.toml b/pyproject.toml index 2472ecb..4ef789d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ fi if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" == "aarch64" ] then mkdir -p /usr/local - curl https://dl.google.com/go/go1.21.12.linux-arm64.tar.gz | tar -C /usr/local -xzf - + curl https://dl.google.com/go/go1.22.7.linux-arm64.tar.gz | tar -C /usr/local -xzf - fi ''' environment = """ @@ -43,7 +43,7 @@ PATH=$PATH:/usr/local/go/bin [tool.cibuildwheel.macos] before-all = ''' -brew install go@1.21 +brew install go@1.22 ''' environment = "PATH=/usr/local/opt/go@1.21/bin:/opt/homebrew/opt/go@1.21/bin:$PATH" @@ -52,11 +52,11 @@ select = "*-musllinux*" before-all = ''' if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] then - wget https://golang.org/dl/go1.21.12.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-amd64.tar.gz + wget https://golang.org/dl/go1.22.7.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-amd64.tar.gz fi if [ "${AUDITWHEEL_ARCH}" == "aarch64" ] then - wget https://golang.org/dl/go1.21.12.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-arm64.tar.gz + wget https://golang.org/dl/go1.22.7.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-arm64.tar.gz fi ''' From 9ec41fd85f28d68b0ddada5abe6738998da3a253 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:24:36 +0000 Subject: [PATCH 6/8] feat: move to curl to install golang on linux to get to 1.22.7 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4ef789d..e0635b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,8 @@ switch_eol_centos_repos() switch_eol_centos_repos if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" == "x86_64" ] then - yum install -y golang + mkdir -p /usr/local + curl https://dl.google.com/go/go1.22.7.linux-amd64.tar.gz | tar -C /usr/local -xzf - fi if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" == "aarch64" ] then From 0f210dba4b7e9d68fa69b4c2b616178e75ea72a7 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:28:53 +0000 Subject: [PATCH 7/8] feat: fix path for go 1.22 on mac --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e0635b7..fd84332 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ PATH=$PATH:/usr/local/go/bin before-all = ''' brew install go@1.22 ''' -environment = "PATH=/usr/local/opt/go@1.21/bin:/opt/homebrew/opt/go@1.21/bin:$PATH" +environment = "PATH=/usr/local/opt/go@1.22/bin:/opt/homebrew/opt/go@1.22/bin:$PATH" [[tool.cibuildwheel.overrides]] select = "*-musllinux*" From 3acdf59e4591e7f1222267daeefdb8bab28f2b60 Mon Sep 17 00:00:00 2001 From: MikeM Date: Sat, 7 Sep 2024 05:58:45 +0000 Subject: [PATCH 8/8] feat: fix issue with libmusl based build not picking up correct go version --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fd84332..731531b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,11 +53,11 @@ select = "*-musllinux*" before-all = ''' if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] then - wget https://golang.org/dl/go1.22.7.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-amd64.tar.gz + wget https://golang.org/dl/go1.22.7.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.22.7.linux-amd64.tar.gz fi if [ "${AUDITWHEEL_ARCH}" == "aarch64" ] then - wget https://golang.org/dl/go1.22.7.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-arm64.tar.gz + wget https://golang.org/dl/go1.22.7.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.22.7.linux-arm64.tar.gz fi '''