Merge pull request #252 from blink1073/include-tests

jupyter · Mar 9, 2022 · 7c4543f · 7c4543f
2 parents c15bcc9 + a7502cf
commit 7c4543f
Show file tree

Hide file tree

Showing 53 changed files with 57 additions and 55 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
     - name: List dependencies
       run: pip list
     - name: Run tests
-      run: py.test nbformat/tests -v --cov=nbformat
+      run: pytest -v --cov=nbformat
     - name: Check manfest
       run: check-manifest -v
     - name: Coverage

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,7 +7,7 @@ include RELEASING.md
 include MANIFEST.in
 recursive-include nbformat *.txt
 recursive-include nbformat *.json
-recursive-exclude nbformat/tests *.*
+recursive-include tests *.*
 exclude scripts/jupyter-trust
 
 # Javascript

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ To enable fast validation with `fastjsonschema`, set the environment variable `N
 
 ## Python Version Support
 
-This library supported python 2.7 and python 3.5+ for `4.x.x` releases. With python 2's end-of-life nbformat `5.x.x` is now python 3.5+ only. Support for 3.5 will be dropped when it's officially sunset by the python organization.
+This library supported Python 2.7 and Python 3.5+ for `4.x.x` releases. With Python 2's end-of-life nbformat `5.x.x` supported Python 3 only. Support for Python 3.x versions will be dropped when they are officially sunset by the python organization.
 
 ## Contributing
 

diff --git a/setup.py b/setup.py
@@ -34,9 +34,6 @@
         packages.append(d[len(here)+1:].replace(os.path.sep, '.'))
 
 package_data = {
-    'nbformat.tests' : [
-        '*.ipynb',
-    ],
     'nbformat.v3' : [
         'nbformat.v3*.schema.json',
     ],

diff --git a/nbformat/tests/__init__.py → tests/__init__.py b/nbformat/tests/__init__.py → tests/__init__.py
diff --git a/nbformat/tests/base.py → tests/base.py b/nbformat/tests/base.py → tests/base.py
diff --git a/nbformat/tests/invalid.ipynb → tests/invalid.ipynb b/nbformat/tests/invalid.ipynb → tests/invalid.ipynb
diff --git a/nbformat/tests/invalid_cell_id.ipynb → tests/invalid_cell_id.ipynb b/nbformat/tests/invalid_cell_id.ipynb → tests/invalid_cell_id.ipynb
diff --git a/nbformat/tests/invalid_unique_cell_id.ipynb → tests/invalid_unique_cell_id.ipynb b/nbformat/tests/invalid_unique_cell_id.ipynb → tests/invalid_unique_cell_id.ipynb
diff --git a/nbformat/tests/many_tracebacks.ipynb → tests/many_tracebacks.ipynb b/nbformat/tests/many_tracebacks.ipynb → tests/many_tracebacks.ipynb
diff --git a/nbformat/tests/no_min_version.ipynb → tests/no_min_version.ipynb b/nbformat/tests/no_min_version.ipynb → tests/no_min_version.ipynb
diff --git a/nbformat/tests/test2.ipynb → tests/test2.ipynb b/nbformat/tests/test2.ipynb → tests/test2.ipynb
diff --git a/nbformat/tests/test3.ipynb → tests/test3.ipynb b/nbformat/tests/test3.ipynb → tests/test3.ipynb
diff --git a/nbformat/tests/test3_no_metadata.ipynb → tests/test3_no_metadata.ipynb b/nbformat/tests/test3_no_metadata.ipynb → tests/test3_no_metadata.ipynb
diff --git a/nbformat/tests/test3_no_worksheets.ipynb → tests/test3_no_worksheets.ipynb b/nbformat/tests/test3_no_worksheets.ipynb → tests/test3_no_worksheets.ipynb
diff --git a/...tests/test3_worksheet_with_no_cells.ipynb → tests/test3_worksheet_with_no_cells.ipynb b/...tests/test3_worksheet_with_no_cells.ipynb → tests/test3_worksheet_with_no_cells.ipynb
diff --git a/nbformat/tests/test4.ipynb → tests/test4.ipynb b/nbformat/tests/test4.ipynb → tests/test4.ipynb
diff --git a/nbformat/tests/test4custom.ipynb → tests/test4custom.ipynb b/nbformat/tests/test4custom.ipynb → tests/test4custom.ipynb
diff --git a/nbformat/tests/test4docinfo.ipynb → tests/test4docinfo.ipynb b/nbformat/tests/test4docinfo.ipynb → tests/test4docinfo.ipynb
diff --git a/nbformat/tests/test4jupyter_metadata.ipynb → tests/test4jupyter_metadata.ipynb b/nbformat/tests/test4jupyter_metadata.ipynb → tests/test4jupyter_metadata.ipynb
diff --git a/...tests/test4jupyter_metadata_timings.ipynb → tests/test4jupyter_metadata_timings.ipynb b/...tests/test4jupyter_metadata_timings.ipynb → tests/test4jupyter_metadata_timings.ipynb
diff --git a/nbformat/tests/test4plus.ipynb → tests/test4plus.ipynb b/nbformat/tests/test4plus.ipynb → tests/test4plus.ipynb
diff --git a/nbformat/tests/test_api.py → tests/test_api.py b/nbformat/tests/test_api.py → tests/test_api.py
@@ -13,8 +13,8 @@
 from jsonschema import ValidationError
 
 from tempfile import TemporaryDirectory
-from ..reader import get_version
-from ..validator import isvalid
+from nbformat.reader import get_version
+from nbformat.validator import isvalid
 from nbformat import read, current_nbformat, writes, write
 
 

diff --git a/nbformat/tests/test_convert.py → tests/test_convert.py b/nbformat/tests/test_convert.py → tests/test_convert.py
@@ -5,10 +5,10 @@
 
 from .base import TestsBase
 
-from ..converter import convert
-from ..reader import read, get_version
-from ..validator import isvalid, validate, ValidationError
-from .. import current_nbformat
+from nbformat.converter import convert
+from nbformat.reader import read, get_version
+from nbformat.validator import isvalid, validate, ValidationError
+from nbformat import current_nbformat
 
 
 class TestConvert(TestsBase):

diff --git a/nbformat/tests/test_nbformat.py → tests/test_nbformat.py b/nbformat/tests/test_nbformat.py → tests/test_nbformat.py
@@ -1,7 +1,7 @@
 import pytest
 
 from nbformat import read
-from ..validator import ValidationError
+from nbformat.validator import ValidationError
 
 
 def test_read_invalid_iowrapper(tmpdir):

diff --git a/nbformat/tests/test_reader.py → tests/test_reader.py b/nbformat/tests/test_reader.py → tests/test_reader.py
@@ -14,8 +14,8 @@
 
 from .base import TestsBase
 
-from ..reader import read, get_version
-from ..validator import ValidationError
+from nbformat.reader import read, get_version
+from nbformat.validator import ValidationError
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -47,4 +47,4 @@ def test_read_fails_on_missing_worksheet_cells(self):
         with self.fopen(u'test3_worksheet_with_no_cells.ipynb', u'r') as f:
             with self.assertRaisesRegex(ValidationError, r'cells'):
                 nb = read(f)
-
+
diff --git a/nbformat/tests/test_sign.py → tests/test_sign.py b/nbformat/tests/test_sign.py → tests/test_sign.py
diff --git a/nbformat/tests/test_validator.py → tests/test_validator.py b/nbformat/tests/test_validator.py → tests/test_validator.py
@@ -12,8 +12,8 @@
 from .base import TestsBase
 from jsonschema import ValidationError
 from nbformat import read
-from ..validator import isvalid, validate, iter_validate
-from ..json_compat import VALIDATORS
+from nbformat.validator import isvalid, validate, iter_validate
+from nbformat.json_compat import VALIDATORS
 
 import pytest
 

diff --git a/nbformat/v1/tests/__init__.py → tests/v1/__init__.py b/nbformat/v1/tests/__init__.py → tests/v1/__init__.py
diff --git a/nbformat/v1/tests/nbexamples.py → tests/v1/nbexamples.py b/nbformat/v1/tests/nbexamples.py → tests/v1/nbexamples.py
@@ -1,4 +1,4 @@
-from ..nbbase import (
+from nbformat.v1.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_notebook
 )

diff --git a/nbformat/v1/tests/test_json.py → tests/v1/test_json.py b/nbformat/v1/tests/test_json.py → tests/v1/test_json.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from ..nbjson import reads, writes
+from nbformat.v1.nbjson import reads, writes
 from .nbexamples import nb0
 
 

diff --git a/nbformat/v1/tests/test_nbbase.py → tests/v1/test_nbbase.py b/nbformat/v1/tests/test_nbbase.py → tests/v1/test_nbbase.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from ..nbbase import (
+from nbformat.v1.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_notebook
 )

diff --git a/nbformat/v2/tests/__init__.py → tests/v2/__init__.py b/nbformat/v2/tests/__init__.py → tests/v2/__init__.py
diff --git a/nbformat/v2/tests/nbexamples.py → tests/v2/nbexamples.py b/nbformat/v2/tests/nbexamples.py → tests/v2/nbexamples.py
@@ -1,7 +1,7 @@
 import os
 
-from ..._compat import encodebytes
-from ..nbbase import (
+from nbformat._compat import encodebytes
+from nbformat.v2.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,
     new_metadata, new_author

diff --git a/nbformat/v2/tests/test_json.py → tests/v2/test_json.py b/nbformat/v2/tests/test_json.py → tests/v2/test_json.py
@@ -1,7 +1,7 @@
 import pprint
 from unittest import TestCase
 
-from ..nbjson import reads, writes
+from nbformat.v2.nbjson import reads, writes
 from .nbexamples import nb0
 
 

diff --git a/nbformat/v2/tests/test_nbbase.py → tests/v2/test_nbbase.py b/nbformat/v2/tests/test_nbbase.py → tests/v2/test_nbbase.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from ..nbbase import (
+from nbformat.v2.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,
     new_author, new_metadata

diff --git a/nbformat/v2/tests/test_nbpy.py → tests/v2/test_nbpy.py b/nbformat/v2/tests/test_nbpy.py → tests/v2/test_nbpy.py
@@ -1,11 +1,11 @@
 from unittest import TestCase
 
-from ..nbbase import (
+from nbformat.v2.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook
 )
 
-from ..nbpy import reads, writes
+from nbformat.v2.nbpy import reads, writes
 from .nbexamples import nb0, nb0_py
 
 

diff --git a/nbformat/v3/tests/__init__.py → tests/v3/__init__.py b/nbformat/v3/tests/__init__.py → tests/v3/__init__.py
diff --git a/nbformat/v3/tests/formattest.py → tests/v3/formattest.py b/nbformat/v3/tests/formattest.py → tests/v3/formattest.py
@@ -6,12 +6,12 @@
 
 pjoin = os.path.join
 
-from ..nbbase import (
+from nbformat.v3.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook
 )
 
-from ..nbpy import reads, writes, read, write
+from nbformat.v3.nbpy import reads, writes, read, write
 from .nbexamples import nb0, nb0_py
 
 

diff --git a/nbformat/v3/tests/nbexamples.py → tests/v3/nbexamples.py b/nbformat/v3/tests/nbexamples.py → tests/v3/nbexamples.py
@@ -2,8 +2,8 @@
 
 import os
 
-from ..._compat import encodebytes
-from ..nbbase import (
+from nbformat._compat import encodebytes
+from nbformat.v3.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,
     new_metadata, new_author, new_heading_cell, nbformat, nbformat_minor

diff --git a/nbformat/v3/tests/test_json.py → tests/v3/test_json.py b/nbformat/v3/tests/test_json.py → tests/v3/test_json.py
@@ -2,10 +2,10 @@
 import json
 from unittest import TestCase
 
-from ..._compat import decodebytes
-from ..nbjson import reads, writes
-from ..nbbase import from_dict
-from .. import nbjson
+from nbformat._compat import decodebytes
+from nbformat.v3.nbjson import reads, writes
+from nbformat.v3.nbbase import from_dict
+from nbformat.v3 import nbjson
 from .nbexamples import nb0
 
 from . import formattest

diff --git a/nbformat/v3/tests/test_misc.py → tests/v3/test_misc.py b/nbformat/v3/tests/test_misc.py → tests/v3/test_misc.py
@@ -1,7 +1,7 @@
 import os
 from unittest import TestCase
 
-from .. import parse_filename
+from nbformat.v3 import parse_filename
 
 
 class MiscTests(TestCase):

diff --git a/nbformat/v3/tests/test_nbbase.py → tests/v3/test_nbbase.py b/nbformat/v3/tests/test_nbbase.py → tests/v3/test_nbbase.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from ..nbbase import (
+from nbformat.v3.nbbase import (
     NotebookNode,
     new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,
     new_author, new_metadata, new_heading_cell, nbformat

diff --git a/nbformat/v3/tests/test_nbpy.py → tests/v3/test_nbpy.py b/nbformat/v3/tests/test_nbpy.py → tests/v3/test_nbpy.py
@@ -4,7 +4,7 @@
 
 from . import formattest
 
-from .. import nbpy
+from nbformat.v3 import nbpy
 from .nbexamples import nb0, nb0_py
 
 

diff --git a/nbformat/v4/tests/__init__.py → tests/v4/__init__.py b/nbformat/v4/tests/__init__.py → tests/v4/__init__.py
diff --git a/nbformat/v4/tests/formattest.py → tests/v4/formattest.py b/nbformat/v4/tests/formattest.py → tests/v4/formattest.py
diff --git a/nbformat/v4/tests/nbexamples.py → tests/v4/nbexamples.py b/nbformat/v4/tests/nbexamples.py → tests/v4/nbexamples.py
@@ -2,8 +2,8 @@
 
 import os
 
-from ..._compat import encodebytes
-from ..nbbase import (
+from nbformat._compat import encodebytes
+from nbformat.v4.nbbase import (
     new_code_cell, new_markdown_cell, new_notebook,
     new_output, new_raw_cell
 )

diff --git a/nbformat/v4/tests/test_convert.py → tests/v4/test_convert.py b/nbformat/v4/tests/test_convert.py → tests/v4/test_convert.py
@@ -5,13 +5,13 @@
 
 from unittest import mock
 from nbformat import validate
-from .. import convert
-from ..nbjson import reads
+from nbformat.v4 import convert
+from nbformat.v4.nbjson import reads
 import pytest
 from nbformat import ValidationError
 
 from . import nbexamples
-from nbformat.v3.tests import nbexamples as v3examples
+from ..v3 import nbexamples as v3examples
 from nbformat import v3, v4
 
 def test_upgrade_notebook():
@@ -81,8 +81,9 @@ def test_downgrade_heading():
 
 def test_upgrade_v4_to_4_dot_5():
     here = os.path.dirname(__file__)
-    with io.open(os.path.join(here, os.pardir, os.pardir, 'tests', "test4.ipynb"), encoding='utf-8') as f:
+    with io.open(os.path.join(here, os.pardir, "test4.ipynb"), encoding='utf-8') as f:
         nb = reads(f.read())
+
     assert nb['nbformat_minor'] == 0
     validate(nb)
     assert nb.cells[0].get('id') is None
@@ -94,8 +95,8 @@ def test_upgrade_v4_to_4_dot_5():
 
 def test_upgrade_without_nbminor_version():
     here = os.path.dirname(__file__)
-    with io.open(os.path.join(here, os.pardir, os.pardir, 'tests', "no_min_version.ipynb"), encoding='utf-8') as f:
+    with io.open(os.path.join(here, os.pardir, "no_min_version.ipynb"), encoding='utf-8') as f:
         nb = reads(f.read())
 
     with pytest.raises(ValidationError):
-        convert.upgrade(nb) 
+        convert.upgrade(nb) 
diff --git a/nbformat/v4/tests/test_json.py → tests/v4/test_json.py b/nbformat/v4/tests/test_json.py → tests/v4/test_json.py
@@ -1,15 +1,19 @@
 import os
 import json
+import sys
 from unittest import TestCase
 
-from ..._compat import decodebytes
-from ..nbjson import reads, writes
-from .. import nbjson, nbformat, nbformat_minor
+from nbformat._compat import decodebytes
+from nbformat.v4.nbjson import reads, writes
+from nbformat.v4 import nbjson, nbformat, nbformat_minor
 from .nbexamples import nb0
 
 from . import formattest
 
 
+BASE_PATH = os.path.join(sys.modules['nbformat'].__path__[0], 'v4')
+
+
 class TestJSON(formattest.NBFormatTest, TestCase):
 
     nb0_ref = None
@@ -106,16 +110,16 @@ def test_latest_schema_matches(self):
 
     def test_base_version_matches_latest(self):
         """Test to ensure latest version file matches latest verison"""
-        with open(os.path.join(os.path.dirname(__file__), '..', 'nbformat.v4.schema.json'), 'r') as schema_file:
+        with open(os.path.join(BASE_PATH, 'nbformat.v4.schema.json'), 'r') as schema_file:
             latest_schema = json.load(schema_file)
-            with open(os.path.join(os.path.dirname(__file__), '..', 'nbformat.v{major}.{minor}.schema.json'.format(
+            with open(os.path.join(BASE_PATH, 'nbformat.v{major}.{minor}.schema.json'.format(
                     major=nbformat, minor=nbformat_minor)), 'r') as schema_file:
                 ver_schema = json.load(schema_file)
             assert latest_schema == ver_schema
 
     def test_latest_matches_nbformat(self):
         """Test to ensure that the nbformat version matches the description of the latest schema"""
-        with open(os.path.join(os.path.dirname(__file__), '..', 'nbformat.v4.schema.json'), 'r') as schema_file:
+        with open(os.path.join(BASE_PATH, 'nbformat.v4.schema.json'), 'r') as schema_file:
             schema = json.load(schema_file)
         assert schema['description'] == 'Jupyter Notebook v{major}.{minor} JSON schema.'.format(
             major=nbformat, minor=nbformat_minor

diff --git a/nbformat/v4/tests/test_nbbase.py → tests/v4/test_nbbase.py b/nbformat/v4/tests/test_nbbase.py → tests/v4/test_nbbase.py
@@ -2,7 +2,7 @@
 """Tests for the Python API for composing notebook elements"""
 
 from nbformat.validator import isvalid, validate, ValidationError
-from ..nbbase import (
+from nbformat.v4.nbbase import (
     NotebookNode, nbformat,
     new_code_cell, new_markdown_cell, new_notebook,
     new_output, new_raw_cell,

diff --git a/nbformat/v4/tests/test_validate.py → tests/v4/test_validate.py b/nbformat/v4/tests/test_validate.py → tests/v4/test_validate.py
@@ -9,8 +9,8 @@
 import pytest
 
 from nbformat.validator import validate, ValidationError
-from ..nbjson import reads
-from ..nbbase import (
+from nbformat.v4.nbjson import reads
+from nbformat.v4.nbbase import (
     nbformat,
     new_code_cell, new_markdown_cell, new_notebook,
     new_output, new_raw_cell,

diff --git a/nbformat/tests/v4_5_invalid_metadata.ipynb → tests/v4_5_invalid_metadata.ipynb b/nbformat/tests/v4_5_invalid_metadata.ipynb → tests/v4_5_invalid_metadata.ipynb
diff --git a/nbformat/tests/v4_5_no_cell_id.ipynb → tests/v4_5_no_cell_id.ipynb b/nbformat/tests/v4_5_no_cell_id.ipynb → tests/v4_5_no_cell_id.ipynb