From 99115ef50fd65213996105d8ec4408748b1d6335 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sat, 10 Jun 2023 10:17:29 -0700 Subject: [PATCH] Tracking ci.yml changes from master. --- .github/workflows/ci_sh_def.yml | 6 +++--- .github/workflows/ci_sh_def.yml.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml index 4e31adba0..18ab42a61 100644 --- a/.github/workflows/ci_sh_def.yml +++ b/.github/workflows/ci_sh_def.yml @@ -196,7 +196,9 @@ jobs: # This makes sure the setup_helpers module can build packages using # setuptools - name: Setuptools helpers test - run: pytest tests/extra_setuptools + run: | + pip install setuptools + pytest tests/extra_setuptools if: "!(matrix.runs-on == 'windows-2022')" @@ -258,8 +260,6 @@ jobs: python -m pip install -r tests/requirements.txt - name: Configure - env: - SETUPTOOLS_USE_DISTUTILS: stdlib run: > cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch index 58f60f41e..9fbf9a547 100644 --- a/.github/workflows/ci_sh_def.yml.patch +++ b/.github/workflows/ci_sh_def.yml.patch @@ -1,5 +1,5 @@ ---- ci.yml 2023-06-07 13:50:35.616653643 -0700 -+++ ci_sh_def.yml 2023-06-07 13:51:11.544607985 -0700 +--- ci.yml 2023-06-10 10:16:11.979371205 -0700 ++++ ci_sh_def.yml 2023-06-10 10:17:19.667308150 -0700 @@ -1,4 +1,16 @@ -name: CI +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: