Commit 14918ab0 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Downstream CI: Uninstall upstream project if installed by conda

parent 2eedd09f

ci-support.sh

+14 −7
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ build_py_project_in_venv() 


# {{{ miniconda build



build_py_project_in_conda_env()

install_conda_deps()

{

  print_status_message

  clean_up_repo_and_working_env
@@ -249,11 +249,11 @@ CL_LIB_DIR = ["$CONDA_PREFIX/lib"] 
CL_LIBNAME = ["OpenCL"]

EOF

  fi

}



  # Using pip instead of conda to install pytest (see test_py_project) avoids

  # ridiculous uninstall chains like these:

  # https://gitlab.tiker.net/inducer/pyopencl/-/jobs/61543



build_py_project_in_conda_env()

{

  install_conda_deps

  pip_install_project

}
@@ -770,7 +770,14 @@ function test_downstream() 
  fi



  prepare_downstream_build "$proj_url"

  build_py_project_in_conda_env

  install_conda_deps



  # Downstream CI for pytools must override pytools that's installed via conda

  # (because it comes in as a dependency of, e.g., pyopencl). Try harder to

  # get rid of it.

  pip uninstall -y "$(get_proj_name)"



  pip_install_project



  if [[ "$test_examples" == "0" ]]; then

    test_py_project