Update to IMP 2.22.0, drop Python 2

salilab · Dec 12, 2024 · e8ca9bb · e8ca9bb
1 parent 1f2d738
commit e8ca9bb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
+8 −5		.github/workflows/build.yml
+2 −3		README.md
+6 −5		doxygen/make-docs.py
+0 −4		github-develop.yml
+0 −4		github-main.yml
+11 −6		notebook/process_notebook.py
+5 −12		setup_ci.sh
+6 −10		test/test_make_docs.py
+6 −3		www/showall.py