From b65993d50fdd743ff117a10e7a967acf1614f6b7 Mon Sep 17 00:00:00 2001 From: Benjamin Morgan Date: Fri, 17 May 2024 13:01:11 +0200 Subject: [PATCH] force conan 1.61.0 --- Makefile.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.setup b/Makefile.setup index 626d308d3..1dfd6e881 100644 --- a/Makefile.setup +++ b/Makefile.setup @@ -61,7 +61,7 @@ setup-git: .PHONY: setup-conan setup-conan: # Install Conan if it is not available. - if ! command -v conan >/dev/null 2>&1; then $(PIP) install --user --upgrade "conan<2"; fi + if ! command -v conan >/dev/null 2>&1; then $(PIP) install --user --upgrade "conan==1.61.0"; fi # Initialize Conan configuration if it doesn't already exist. # # Since running any conan command, even conan --help creates $(CONAN_DIR) @@ -143,7 +143,7 @@ install-python-deps:: command -v $(PIP) >/dev/null 2>&1 $(PIP) install $(PIP_INSTALL_ARGS) \ click \ - "conan<2.0.0" \ + "conan==1.61.0" \ libtmux \ toml \ pipx \