From 9b9ac442498eee5cae960918d276309e500b3b60 Mon Sep 17 00:00:00 2001 From: Giovanni Bussi Date: Thu, 3 Aug 2023 14:37:15 +0200 Subject: [PATCH] Equivalent to #969 @iximiel I removed unrelated changes --- .github/workflows/linuxWF.yml | 2 +- docker/centos7 | 2 +- docker/fedora38 | 2 +- docker/rocky8 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linuxWF.yml b/.github/workflows/linuxWF.yml index 56917c64a4..66615bb770 100644 --- a/.github/workflows/linuxWF.yml +++ b/.github/workflows/linuxWF.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.9 - name: Set paths run: | echo "$HOME/opt/bin" >> $GITHUB_PATH diff --git a/docker/centos7 b/docker/centos7 index 5f7258bf9d..0f63443eb6 100644 --- a/docker/centos7 +++ b/docker/centos7 @@ -10,7 +10,7 @@ RUN yum -y update \ python3 python3-devel python3-pip \ && pip3 install pillow==8.3.2 \ && pip3 install numpy==1.19 \ - && pip3 install cython numpy pandas mdtraj \ + && pip3 install "cython<3" numpy pandas mdtraj \ && pip3 install "gsd<3" \ && pip3 install MDAnalysis==1.0.0 diff --git a/docker/fedora38 b/docker/fedora38 index 9b59b82285..08b164d7f6 100644 --- a/docker/fedora38 +++ b/docker/fedora38 @@ -12,7 +12,7 @@ RUN yum -y update \ && pip3 install numpy \ && pip3 install cython numpy pandas \ && pip3 install MDAnalysis \ - && pip3 install git+https://github.com/mdtraj/mdtraj@1.9.7 + && pip3 install mdtraj RUN useradd -ms /bin/bash plumed USER plumed diff --git a/docker/rocky8 b/docker/rocky8 index 38d93b9de1..ff0b6bd1f0 100644 --- a/docker/rocky8 +++ b/docker/rocky8 @@ -11,7 +11,7 @@ RUN yum -y update \ python3 python3-devel python3-pip \ && pip3 install pillow==8.3.2 \ && pip3 install numpy==1.19 \ - && pip3 install cython numpy pandas mdtraj \ + && pip3 install "cython<3" numpy pandas mdtraj \ && pip3 install MDAnalysis==1.0.0 RUN useradd -ms /bin/bash plumed