Drop the Python / IPython specific compilers (ipython#40)

* Remove IPython Python compilation conditions * Delete unnecessary files
deathbeds · May 22, 2018 · 810eac3 · 810eac3
1 parent f0b85f2
commit 810eac3
Show file tree

Hide file tree

Showing 33 changed files with 243 additions and 1,892 deletions.
diff --git a/.pytest_cache/v/cache/lastfailed b/.pytest_cache/v/cache/lastfailed
diff --git a/.pytest_cache/v/cache/nodeids b/.pytest_cache/v/cache/nodeids
diff --git a/classes_importnb.png b/classes_importnb.png
diff --git a/packages_importnb.png b/packages_importnb.png
diff --git a/readme.ipynb b/readme.ipynb
@@ -409,7 +409,7 @@
      "output_type": "stream",
      "text": [
       "[NbConvertApp] Converting notebook readme.ipynb to markdown\n",
-      "[NbConvertApp] Writing 6469 bytes to readme.md\n"
+      "[NbConvertApp] Writing 7022 bytes to readme.md\n"
      ]
     }
    ],

diff --git a/readme.md b/readme.md
@@ -224,7 +224,18 @@ For example, create a file called `tricks.yaml` containing
 ```
 
     test_import (src.importnb.tests.test_unittests.TestContext) ... ok
-    test_reload_with_context (src.importnb.tests.test_unittests.TestContext) ... 
+    test_reload_with_context (src.importnb.tests.test_unittests.TestContext) ... ok
+    test_failure (src.importnb.tests.test_unittests.TestExtension) ... expected failure
+    test_import (src.importnb.tests.test_unittests.TestExtension) ... ok
+    test_exception (src.importnb.tests.test_unittests.TestPartial) ... ok
+    test_traceback (src.importnb.tests.test_unittests.TestPartial) ... ok
+    test_imports (src.importnb.tests.test_unittests.TestRemote) ... skipped 'requires IP'
+
+    ----------------------------------------------------------------------
+    Ran 7 tests in 2.018s
+
+    OK (skipped=1, expected failures=1)
+
 
 
 ```python

diff --git a/readme_files/readme_33_1.png b/readme_files/readme_33_1.png
diff --git a/readme_files/readme_33_2.png b/readme_files/readme_33_2.png
diff --git a/src/importnb/__init__.py b/src/importnb/__init__.py
@@ -11,8 +11,6 @@
         unload_ipython_extension,
         reload,
         Lazy,
-        export,
-        __IPYTHON__,
     )
     from .parameterize import Parameterize
     from .nbtest import NotebookTest, testmod
@@ -25,8 +23,6 @@
         unload_ipython_extension,
         reload,
         Lazy,
-        export,
-        __IPYTHON__,
     )
     from parameterize import Parameterize
     from nbtest import NotebookTest, testmod
diff --git a/src/importnb/capture.py b/src/importnb/capture.py
@@ -6,15 +6,11 @@
 
 
 try:
-    from .compile import export, __IPYTHON__, export
-except:
-    from compile import export, __IPYTHON__, export
-__all__ = "capture_output",
-
-
-if __IPYTHON__:
     from IPython.utils.capture import capture_output
-else:
+    from IPython import get_ipython
+
+    assert get_ipython(), """There is no interactive shell"""
+except:
     from contextlib import redirect_stdout, ExitStack
     from io import StringIO
 
@@ -73,5 +69,9 @@ def stderr(self):
 
 
 if __name__ == "__main__":
+    try:
+        from .utils.export import export
+    except:
+        from utils.export import export
     export("capture.ipynb", "../capture.py")
     __import__("doctest").testmod()
diff --git a/src/importnb/compile.py b/src/importnb/compile.py
diff --git a/src/importnb/compile_ipython.py b/src/importnb/compile_ipython.py
diff --git a/src/importnb/compile_python.py b/src/importnb/compile_python.py