From 95b1741d447c7283363475a63f1ceceaec2981c9 Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Thu, 7 Jul 2022 18:19:56 -0400 Subject: [PATCH] Setup: Fix issue with Windows toolchain install (#2225) --- .github/workflows/build-and-test.yml | 2 +- python/setup.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c500546..f71b9ab 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up R - uses: r-lib/actions/setup-r@v1 + uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} - name: Install remotes diff --git a/python/setup.py b/python/setup.py index e5a795f..9588cab 100644 --- a/python/setup.py +++ b/python/setup.py @@ -59,12 +59,16 @@ def repackage_cmdstan(): def maybe_install_cmdstan_toolchain(): """Install C++ compilers required to build stan models on Windows machines.""" import cmdstanpy - from cmdstanpy.install_cxx_toolchain import main as _install_cxx_toolchain - try: cmdstanpy.utils.cxx_toolchain_path() except Exception: - _install_cxx_toolchain({"version": None, "dir": None, "verbose": True}) + try: + from cmdstanpy.install_cxx_toolchain import run_rtools_install + except ImportError: + # older versions + from cmdstanpy.install_cxx_toolchain import main as run_rtools_install + + run_rtools_install({"version": None, "dir": None, "verbose": True}) cmdstanpy.utils.cxx_toolchain_path()