Merge pull request #186 from bsipocz/ci_fix_and_update_versions

CI: Various minor improvements to fix CI

includes contribution from @bnavigator in #183

Author: fangohr

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, '3.10']
 
     steps:
     - name: Checkout
@@ -24,8 +24,9 @@ jobs:
     - name: Install dependencies
       run: |
         python3 -m pip install --upgrade pip doit
-        python3 -m pip install .
         doit install_test_deps
+        python3 -m pip install .
+        python3 -m pip freeze  # do make debugging easier for failures due to version changes
 
     - name: Test with pytest
       run: |

dodo.py

@@ -27,7 +27,9 @@ def task_test():
     }
 
 def task_install_test_deps():
-    test_deps = ['matplotlib', 'sympy', 'pytest-cov', 'pytest-mock', 'nbdime']
+    # ipython_genutils is an indirect dependency of nbdime, but can be removed from this list
+    # once https://github.com/jupyter/nbdime/pull/618 ends up in a release
+    test_deps = ['matplotlib', 'sympy', 'pytest-cov', 'pytest-mock', 'nbdime', 'ipython_genutils']
     return {
         'actions': [_make_cmd(['pip', 'install'] + test_deps)],
     }

nbval/_version.py

@@ -1,2 +1,2 @@
-version_info = (0, 9, 6)
+version_info = (0, 9, '7.dev')
 __version__ = '.'.join(map(str, version_info[:3])) + ''.join(version_info[3:])

tests/sanitize_defaults.cfg

@@ -13,4 +13,8 @@ replace: TIMESTAMP
 
 [Memory addresses]
 regex: (<[a-zA-Z_][0-9a-zA-Z_.]* at )(0x[0-9a-fA-F]+)(>)
-replace: \1MEMORY_ADDRESS\3
+replace: \1MEMORY_ADDRESS\3
+
+[Matplotlib figure size]
+regex: (Figure size )\d+x\d+( with \d+ Axes)
+replace: \1WIDTHxHEIGHT\2