From d0316eed621e41b6989e2b5ab33ecbbda8b018a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Mart=C3=ADnez=20Lema?= Date: Fri, 24 Jul 2026 09:16:05 +0000 Subject: [PATCH 1/2] Refactor manage.sh `activate` (formerly known as `work_in_python_version`) used to mean "do whatever you need to do to set up IC now". This has lead to multiple cases of confusion because it installs conda if the user forgets to activate it, and other more intricate issues. This commit wants to split functionalities and make them more clear, at the expense of forcing the user to know what they want to do. Moreover, the new procedure to compile cython stuff is painfully slow, so it will only be done by default in the installation step. --- manage.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/manage.sh b/manage.sh index a85015396..e94bac388 100644 --- a/manage.sh +++ b/manage.sh @@ -143,16 +143,23 @@ function export_city_command_completion { function activate { if ! command -v conda 2&>1 > /dev/null then - install_conda + echo "ERROR: Conda not found." + echo "Set it up before running this command or run" + echo "\nbash manage.sh install_and_check\n" + echo "for an automatic conda and IC installation" + return fi if ! (conda env list | grep ${CONDA_ENV_NAME}) >> /dev/null then - make_environment + echo "ERROR:IC environment not found" + echo "Run" + echo "\nbash manage.sh install_and_check\n" + echo "to install IC" + return fi python_version_env - compile_cython_components export_city_command_completion } From 1187fc546374cb724def9f1889adbdf80234d63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Mart=C3=ADnez=20Lema?= Date: Fri, 24 Jul 2026 09:30:19 +0000 Subject: [PATCH 2/2] Adapt GHA workflows --- .github/workflows/test_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml index 6908f7074..10b8005e0 100644 --- a/.github/workflows/test_suite.yml +++ b/.github/workflows/test_suite.yml @@ -35,7 +35,7 @@ jobs: - name: Install IC run: | - source manage.sh activate + bash manage.sh install - name: Run tests run: | @@ -100,7 +100,7 @@ jobs: - name: Pyflakes run: | source scripts/setup_conda_gha.sh - source manage.sh work_in_python_version_no_tests ${{ matrix.python-version }} + source manage.sh activate # tee is used to ignore the exit status of pyflakes # we don't want the GHA check to fail because of this