Merge branch 'master' into move_timeblock_nb

devitocodes · Sep 2, 2020 · 7b9cad1 · 7b9cad1
2 parents 895d89a + 323bce6
commit 7b9cad1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml
@@ -86,7 +86,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -e .
-        pip install matplotlib
+        pip install matplotlib blosc
 
     - name: Seismic notebooks
       run: |

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@ pip>=9.0.1
 numpy>1.16
 sympy<1.6
 scipy
-pytest>=3.6,<6.0
+pytest>=3.6,<7.0
 pytest-runner
 flake8>=2.1.0
 nbval