From 18a10ce0f9b141c5797590d699f4bab5bf1ef17b Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Wed, 27 Apr 2022 19:16:21 -0500 Subject: [PATCH] remove unmaintained macOS support and add loopy ci --- .github/workflows/ci.yml | 16 ++++++++++++++++ codepy/toolchain.py | 17 +++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eca8c47..1d4621f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,4 +59,20 @@ jobs: build_py_project_in_venv build_docs + downstream_tests: + strategy: + matrix: + downstream_project: [loopy] + name: Tests for downstream project ${{ matrix.downstream_project }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: "Main Script" + env: + DOWNSTREAM_PROJECT: ${{ matrix.downstream_project }} + run: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + test_downstream "$DOWNSTREAM_PROJECT" + # vim: sw=4 diff --git a/codepy/toolchain.py b/codepy/toolchain.py index 7f8ccb9..35e1ec3 100644 --- a/codepy/toolchain.py +++ b/codepy/toolchain.py @@ -457,22 +457,11 @@ def guess_toolchain(): if sys.maxsize == 0x7fffffff: kwargs["cflags"].extend(["-arch", "i386"]) - return GCCToolchain(**kwargs) - elif "Apple LLVM" in version and "clang" in version: - if "-Wstrict-prototypes" in kwargs["cflags"]: - kwargs["cflags"].remove("-Wstrict-prototypes") - if "darwin" in version: - # Are we running in 32-bit mode? - # The python interpreter may have been compiled as a Fat binary - # So we need to check explicitly how we're running - # And update the cflags accordingly - import sys - if sys.maxsize == 0x7fffffff: - kwargs["cflags"].extend(["-arch", "i386"]) - return GCCToolchain(**kwargs) else: - raise ToolchainGuessError("unknown compiler") + raise ToolchainGuessError( + "Unable to determine compiler. Tried running " + f"'{kwargs['cc']} --version' and failed.") def guess_nvcc_toolchain():