pylint

mwouts · Sep 11, 2018 · e861670 · e861670
1 parent 5079626
commit e861670
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/jupytext/file_format_version.py b/jupytext/file_format_version.py
@@ -58,7 +58,7 @@ def check_file_version(notebook, source_path, outputs_path):
         return
 
     # Version larger than minimum readable version
-    if version <= current and version >= min_file_format_version(ext):
+    if min_file_format_version(ext) <= version <= current:
         return
 
         # Not merging? OK

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -175,5 +175,5 @@ def test_combine_lower_version_raises(tmpdir):
                         {'.py': '1.0'}):
             with mock.patch(
                     'jupytext.file_format_version.MIN_FILE_FORMAT_VERSION',
-                            {'.py': '1.0'}):
+                    {'.py': '1.0'}):
                 jupytext(args=[tmp_nbpy, '--to', 'ipynb', '--update'])
diff --git a/tests/test_load_multiple.py b/tests/test_load_multiple.py
@@ -62,5 +62,5 @@ def test_combine_lower_version_raises(tmpdir):
                         {'.py': '1.0'}):
             with mock.patch(
                     'jupytext.file_format_version.MIN_FILE_FORMAT_VERSION',
-                            {'.py': '1.0'}):
+                    {'.py': '1.0'}):
                 cm.get(tmp_ipynb)
diff --git a/tests/test_unicode.py b/tests/test_unicode.py
@@ -1,13 +1,12 @@
 # coding: utf-8
-import sys
 import pytest
 import jupytext
 from .utils import list_all_notebooks
 
 try:
-  unicode        # Python 2
+    unicode  # Python 2
 except NameError:
-  unicode = str  # Python 3
+    unicode = str  # Python 3
 
 
 @pytest.mark.parametrize('nb_file', list_all_notebooks('.ipynb') +