add the ability to import ipy files (#110)

* add the ability to import ipy files * add an assertion to the test
deathbeds · Oct 14, 2020 · e3b5c32 · e3b5c32
1 parent 0cd0dda
commit e3b5c32
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/src/importnb/loader.py b/src/importnb/loader.py
@@ -142,7 +142,10 @@ class NotebookBaseLoader(ImportLibMixin, FinderContextManager):
     """The simplest implementation of a Notebook Source File Loader.
     """
 
-    extensions = (".ipynb",)
+    extensions = (
+        ".ipy",
+        ".ipynb",
+    )
     __slots__ = "_lazy", "_fuzzy", "_markdown_docstring", "_position"
 
     def __init__(
@@ -184,7 +187,7 @@ def get_data(self, path):
             return LineCacheNotebookDecoder(
                 code=self.code, raw=self.raw, markdown=self.markdown
             ).decode(self.decode(), self.path)
-        return super().get_data(path)
+        return self.code(super().get_data(path))
 
 
 class FileModuleSpec(ModuleSpec):

diff --git a/tests/ascript.ipy b/tests/ascript.ipy
@@ -0,0 +1 @@
+msg = !echo "hello word"
diff --git a/tests/test_importnb.ipynb b/tests/test_importnb.ipynb
@@ -121,7 +121,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -133,7 +133,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -147,7 +147,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -158,7 +158,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -174,7 +174,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -186,7 +186,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -195,7 +195,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -210,7 +210,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -220,7 +220,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -234,7 +234,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -248,7 +248,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -261,7 +261,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -280,7 +280,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -290,6 +290,21 @@
     "        del __bar"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 21,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "    @ipy    \n",
+    "    def test_import_ipy():\n",
+    "        \"\"\"import ipy scripts, this won't really work without ipython.\"\"\"\n",
+    "        with Notebook():\n",
+    "            import ascript\n",
+    "            \n",
+    "        assert ascript.msg"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -316,9 +331,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.7"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}