Skip to content

Commit

Permalink
fedora37
Browse files Browse the repository at this point in the history
A small fix was required to enable installation of mdtraj on python 3.11
  • Loading branch information
GiovanniBussi committed Feb 14, 2023
1 parent b2f3d57 commit 876968b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,14 @@ jobs:
run: |
make -C docker centos7
# We test on fedora36 to make sure we have compatibility with newer compilers (gcc 12)
fedora36:
# We test on fedora37 to make sure we have compatibility with newer compilers (gcc 12)
fedora37:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Build and run tests
run: |
make -C docker fedora36
make -C docker fedora37
# We test on rockylinux8 as well
rocky8:
Expand Down
6 changes: 3 additions & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

.PHONY: ubuntu plumed2.tgz clean centos7 fedora36 rocky8
.PHONY: ubuntu plumed2.tgz clean centos7 fedora37 rocky8

ubuntu: plumed2.tgz
docker build -t plumed .

centos7: plumed2.tgz
docker build -t plumed -f centos7 .

fedora36: plumed2.tgz
docker build -t plumed -f fedora36 .
fedora37: plumed2.tgz
docker build -t plumed -f fedora37 .

rocky8: plumed2.tgz
docker build -t plumed -f rocky8 .
Expand Down
9 changes: 6 additions & 3 deletions docker/fedora36 → docker/fedora37
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
FROM fedora:36
FROM fedora:37

# note: at variance with centos7, here we have to explicitly install gcc
# mdtraj 1.9.7 does not compile with python 3.11 unless installed from source
# see https://github.com/mdtraj/mdtraj/issues/1761
RUN yum -y update \
&& yum -y group install "Development Tools" \
&& yum -y install gcc-c++ \
&& yum -y install environment-modules gawk vim wget \
lapack-devel blas-devel zlib-devel gsl-devel fftw-devel openmpi-devel boost-devel \
python3 python3-devel python3-pip \
&& pip3 install numpy \
&& pip3 install cython numpy pandas mdtraj \
&& pip3 install MDAnalysis
&& pip3 install cython numpy pandas \
&& pip3 install MDAnalysis \
&& pip3 install git+https://github.com/mdtraj/[email protected]

RUN useradd -ms /bin/bash plumed
USER plumed
Expand Down

1 comment on commit 876968b

@PlumedBot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found broken examples in automatic/a-masterclass-22-09.txt
Found broken examples in automatic/a-masterclass-22-11.txt
Found broken examples in automatic/a-masterclass-22-12.txt
Found broken examples in automatic/performance-optimization.txt
Found broken examples in automatic/a-trieste-6.txt
Found broken examples in automatic/munster.txt
Found broken examples in automatic/ANN.tmp
Found broken examples in automatic/EDS.tmp
Found broken examples in automatic/EMMI.tmp
Found broken examples in automatic/ENVIRONMENTSIMILARITY.tmp
Found broken examples in automatic/FOURIER_TRANSFORM.tmp
Found broken examples in automatic/FUNCPATHGENERAL.tmp
Found broken examples in automatic/FUNCPATHMSD.tmp
Found broken examples in automatic/FUNNEL.tmp
Found broken examples in automatic/FUNNEL_PS.tmp
Found broken examples in automatic/GHBFIX.tmp
Found broken examples in automatic/INCLUDE.tmp
Found broken examples in automatic/MAZE_MEMETIC_SAMPLING.tmp
Found broken examples in automatic/MAZE_OPTIMIZER_BIAS.tmp
Found broken examples in automatic/MAZE_RANDOM_ACCELERATION_MD.tmp
Found broken examples in automatic/MAZE_RANDOM_WALK.tmp
Found broken examples in automatic/MAZE_SIMULATED_ANNEALING.tmp
Found broken examples in automatic/MAZE_STEERED_MD.tmp
Found broken examples in automatic/PIV.tmp
Found broken examples in automatic/PLUMED.tmp
Found broken examples in MiscelaneousPP.md

Please sign in to comment.