diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7d9f97..c8a5461 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,6 @@ jobs: os: [ubuntu-latest] python-version: ["3.12"] imp-branch: [main, develop] - include: - - os: [ubuntu-latest] - python-version: "2.7" - imp-branch: main runs-on: ${{ matrix.os }} steps: diff --git a/support/setup_ci.sh b/support/setup_ci.sh index 81c4278..c2d1af2 100755 --- a/support/setup_ci.sh +++ b/support/setup_ci.sh @@ -14,19 +14,13 @@ python_version=$2 conda config --remove channels defaults || : conda config --add channels conda-forge -if [ ${python_version} = "2.7" ]; then - pip="pip<=19.3.1" -else - pip="pip" -fi - if [ ${imp_branch} = "develop" ]; then IMP_CONDA="imp-nightly" else IMP_CONDA="imp" fi -conda create --yes -q -n python${python_version} -c salilab python=${python_version} modeller ${pip} ${IMP_CONDA} +conda create --yes -q -n python${python_version} -c salilab python=${python_version} modeller pip ${IMP_CONDA} eval "$(conda shell.bash hook)" conda activate python${python_version} diff --git a/support/tutorial_tools b/support/tutorial_tools index a9d3f4c..ced187b 160000 --- a/support/tutorial_tools +++ b/support/tutorial_tools @@ -1 +1 @@ -Subproject commit a9d3f4cee4c863cda4dfab97bd086be5cb928b58 +Subproject commit ced187b5723aacc0fb97a5a5a12174e531438743