Merge branch 'upgrade'

Author: u8sand

.github/workflows/deploy-doc-to-ghpages.yml

@@ -15,8 +15,7 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -r docs/requirements.txt
+        pip install -e .[docs]
     - name: Building docs
       run: cd docs && make build-html
     - name: Deploy

MANIFEST.in

@@ -2,5 +2,6 @@
 '''
 import os
 from appyter.magic import init
+from importlib.metadata import version
 
-__version__ = open(os.path.join(os.path.dirname(__file__), 'VERSION'), 'r').read().strip()
+__version__ = version(__package__)

appyter/VERSION

@@ -94,6 +94,6 @@ def _open(self, path, mode="rb", **kwargs):
     path_info = self.info(path)
     kwargs = dict(loop=get_event_loop())
     if path_info['_url'].startswith('https://'):
-      kwargs.update(client_kwargs=dict(connector=aiohttp.TCPConnector(ssl=self.ssl_verify)))
+      kwargs.update(client_kwargs=dict(connector=aiohttp.TCPConnector(ssl=self.ssl_verify, loop=kwargs['loop'])))
     fs, fo = url_to_fs_ex(path_info['_url'], **kwargs)
     return fs.open(fo, mode)

appyter/__init__.py

@@ -4,7 +4,7 @@
 async def ensure_storage(storage_uri):
   import fsspec
   from appyter.ext.fsspec.core import url_to_fs_ex
-  if 'storage' not in fsspec.registry.target:
+  if 'storage' not in fsspec.registry:
     from appyter.ext.fsspec.singleton import SingletonFileSystem
     from appyter.ext.asyncio.helpers import ensure_async_contextmanager
     fs, fo = url_to_fs_ex(storage_uri)

appyter/ext/fsspec/drs.py

@@ -35,6 +35,12 @@ def test_fuse_mount():
         (mnt_dir/'hi').mkdir(exist_ok=True)
         (mnt_dir/'hi/world').open('w').write('test')
         assert_eq((mnt_dir/'hi/world').open('r').read(), 'test')
+        # seek works
+        with (mnt_dir/'bye').open('w+') as fw:
+          fw.write('hi!')
+          fw.seek(0)
+          fw.write('H')
+        assert_eq((mnt_dir/'bye').open('r').read(), 'Hi!')
     finally:
       fs.rm('', recursive=True)
 

appyter/ext/fsspec/storage.py

@@ -1,15 +1,15 @@
-''' ```eval_rst
+'''
 This module contains :class:`appyter.fields.Field`, the base class for all fields
 defined in :mod:`appyter.profiles.default.fields`.
-``` '''
+'''
 
-from flask import Markup
+from markupsafe import Markup
 from appyter.ext.flask import request_get
 
 class PartialField:
   ''' Partial instantiation of a field
   Replaces a decorator so that we can still identify it as
-   a callable which will produce a field.
+  a callable which will produce a field.
   '''
   def __init__(self, field, **kwargs):
     self._field = field
@@ -47,10 +47,9 @@ def as_dict(self):
 
 class Field(dict):
   ''' Base field for which all fields derive
-  ```eval_rst
   Base class for all Field objects representing a value that will later be provided via a front-end form.
   See :mod:`appyter.profiles.default.fields` for the actual fields.
-  ``` '''
+  '''
   def __init__(self,
       name=None,
       label=None,
@@ -62,7 +61,7 @@ def __init__(self,
       section=None,
       _env=None,
       **kwargs):
-    '''
+    r'''
     :param name: (str) A name that will be used to refer to the object as a variable and in the HTML form.
     :param label: (str) A human readable label for the field for the HTML form
     :param description: (Optional[str]) A long human readable description for the field for the HTML form
@@ -113,7 +112,7 @@ def constraint(self):
     return (self.raw_value is None and not self.args.get('required')) or (self.raw_value in self.choices)
 
   def render(self, **kwargs):
-    ''' Return a rendered version of the field (form)
+    r''' Return a rendered version of the field (form)
 
     :param \**kwargs: The instance values of the form e.g. `Field.render(**field.args)`
     '''

appyter/ext/fsspec/test_fuseless_mount.py

@@ -1,4 +1,5 @@
-''' IPython magic for making templating easy~. This basically
+r'''
+IPython magic for making templating easy~. This basically
 just allows our jinja-type language to be executed in place
 injecting the defaults into the environment so we can easily
 debug the notebook at the same time as building the appyter.
@@ -10,25 +11,24 @@
 
 Usage (put the following in the first cell):
 
-```python
-#%%appyter init
-from appyter import magic
-magic.init(lambda _=globals: _())
-```
+.. code-block:: python
+
+  #%%appyter init
+  from appyter import magic
+  magic.init(lambda _=globals: _())
 '''
 
 '''
 Setup given globals
 '''
 def init(_globals, verbose=False, ipynb='app.ipynb', mode='magic', safe_mode=False, **kwargs):
-  ''' Initialize appyter magic.
+  r''' Initialize appyter magic.
 
   Sets up a jinj2 environment and injects %%appyter magic into your environment.
   
-  :param _globals: (Dict[str, Any]) A callable with your globals for the purpose of injection, basically just: `lambda _=globals: _()`
+  :param _globals: (Dict[str, Any]) A callable with your globals for the purpose of injection, basically just: ``lambda _=globals: _()``
   :param verbose: (Optional[bool]) Expand exception reporting to be more verbose
   '''
-  import os
   import jinja2
   import jinja2.meta
   import traceback
@@ -37,23 +37,29 @@ def init(_globals, verbose=False, ipynb='app.ipynb', mode='magic', safe_mode=Fal
   from IPython.core.magic import register_cell_magic
   from IPython.display import display, Markdown, HTML
 
-  '''
+  r'''
   register_cell_magic allows function to execute an entire cell with the following call structure:
-  ```python
-  %%my_magic whatever
-  all
-  my
-  data
-  ```
-  Results in a call:
-  ```python
-  my_magic(
-    "whatever",
-    """all
+
+  .. code-block:: python
+
+    %%my_magic whatever
+    all
     my
-    data"""
-  )
-  ```
+    data
+
+  Results in a call:
+
+  .. code-block:: python
+
+    my_magic(
+      "whatever",
+      """
+      all
+      my
+      data
+      """
+    )
+
   '''
 
   @register_cell_magic