From 387a1104137abfc82a579deeaef0b92625f63225 Mon Sep 17 00:00:00 2001 From: Tyler Reddy Date: Sun, 8 May 2022 08:32:08 -0600 Subject: [PATCH] MAINT: wheels 1.8.1 prep (#167) * MAINT: wheels 1.8.1 prep * restore Pythran for Windows builds to see if we are good to go there (if so, we can close gh-162 as well) * bump `BUILD_COMMIT` to point to the latest relevant maintenance branch--this should also tell me if anything strange is happening with things that may be pinned since the `1.8.0` rel * MAINT: PR 167 revisions * try pinning setuptools for Linux jobs; the wheel versions seem wrong with bleeding edge setuptools * MAINT: PR 167 revisions * try pinning `DOCKER_TEST_IMAGE` to avoid the issues related to: https://github.blog/2022-04-12-git-security-vulnerability-announced/ * Revert "MAINT: PR 167 revisions" This reverts commit a0901514b31b3c7b3d29c8bc9826b59025a3a651. * MAINT: PR 167 revisions * try using this command: https://github.com/pypa/manylinux/issues/1309#issuecomment-1105731342 * to deal with this in newer manylinux images: https://github.blog/2022-04-12-git-security-vulnerability-announced/ * MAINT: PR 167 revisions * try to address some of the issues with `git config` commands showing up in CI * MAINT: PR 167 revisions * revert some `config.sh` changes that were not helping * MAINT: PR 167 revisions * try shimming the `git` commands in `clean_code()` based on feedback from Matti related to the new `git` vulnerability fix * DEBUG: narrow CI * disable most of the CI while I debug * MAINT: PR 167 revisions * try adding the safe directory command inside of `repo_dir`, which presumably will include running this command in each of the submodules * Try workaround in https://github.com/scipy/scipy/pull/16139 * MAINT: simplify after git fix. --- .travis.yml | 2 +- appveyor.yml | 5 +---- azure-pipelines.yml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b96ee8d..279444c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: global: - REPO_DIR=scipy # Also see DAILY_COMMIT below - - BUILD_COMMIT=b5d8bab8 + - BUILD_COMMIT=096d759 - PLAT=x86_64 - CYTHON_BUILD_DEP="Cython==0.29.24" - PYTHRAN_BUILD_DEP="pythran" diff --git a/appveyor.yml b/appveyor.yml index 798a903..7815fce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ environment: WHEELHOUSE_UPLOADER_SECRET: secure: jIyaD+VWmTlDGXThsKAkiLq8iljgYHiriq+kEUuW9tHj67R5BapLxLjbfco2nt8Y - BUILD_COMMIT: b5d8bab8 + BUILD_COMMIT: 096d759 DAILY_COMMIT: master matrix: @@ -181,9 +181,6 @@ build_script: $env:Path += ";$MINGW" $env:NPY_NUM_BUILD_JOBS = "4" - git submodule update --init - # temporarily disable pythran - # see: https://github.com/MacPython/scipy-wheels/issues/162 - - ps: $env:SCIPY_USE_PYTHRAN = 0 - python setup.py bdist_wheel - ps: | # Upload artifact to Appveyor immediately after build diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f3cef7..4a85415 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ pr: - v1.8.x variables: - BUILD_COMMIT: "b5d8bab8" + BUILD_COMMIT: "096d759" jobs: - template: azure-posix.yml