Merge pull request #173 from jngrad/sphinx_downgrade

Sphinx downgrade and Travis removal
espressomd · Apr 9, 2020 · 01cf234 · 01cf234
2 parents e24415d + 8d4d7cb
commit 01cf234
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
         image: ['centos', 'clang', 'debian', 'fedora', 'opensuse', 'rocm',
                 'ubuntu-18.04', 'ubuntu-20.04',
                 'ubuntu-cuda-10.1', 'ubuntu-cuda-9.0',
-                'ubuntu-travis', 'ubuntu-wo-dependencies']
+                'ubuntu-wo-dependencies']
     steps:
     - uses: actions/checkout@master
     - name: Build and deploy

diff --git a/docker/Dockerfile-ubuntu-cuda-10.1 b/docker/Dockerfile-ubuntu-cuda-10.1
@@ -18,7 +18,7 @@ RUN useradd -m espresso
 USER espresso
 
 # install Python3 packages locally
-RUN pip3 install --user --upgrade 'sphinx>=2.0,!=2.1.0' sphinxcontrib-bibtex 'MDAnalysis==0.16' 'pint>=0.9'
+RUN pip3 install --user --upgrade 'sphinx>=2.0,!=2.1.0,!=3.0.0' sphinxcontrib-bibtex 'MDAnalysis==0.16' 'pint>=0.9'
 ENV PATH="/home/espresso/.local/bin:${PATH}"
 
 WORKDIR /home/espresso
diff --git a/docker/Dockerfile-ubuntu-travis b/docker/Dockerfile-ubuntu-travis