Merge pull request #86 from chrisjsewell/develop

update requirements

.vscode/settings.json

@@ -19,9 +19,9 @@
     "restructuredtext.preview.scrollPreviewWithEditor": false,
     "restructuredtext.updateOnTextChanged": "false",
     "restructuredtext.updateDelay": 100000,
-    "python.unitTest.unittestEnabled": false,
-    "python.unitTest.nosetestsEnabled": false,
-    "python.unitTest.pyTestEnabled": true,
+    "python.testing.unittestEnabled": false,
+    "python.testing.nosetestsEnabled": false,
+    "python.testing.pyTestEnabled": true,
     "python.linting.pylintEnabled": false,
     "python.linting.pylamaEnabled": false,
     "python.linting.enabled": true,

README.md

@@ -17,7 +17,6 @@ A major API improvement occurred in `v0.7.0`. This has not changed the
 general user interface, but anyone using custom converter plugins will
 be required to update them (see [Plugin Conversion](https://ipypublish.readthedocs.io/en/latest/custom_export_config.html#conversion-of-plugins-from-old-api))
 
-
 ![Conversion Process](/docs/source/_static/main_image.png)
 
 For an example of the potential input/output, see:

docs/source/sphinx_ext_notebook.rst

@@ -118,8 +118,8 @@ setup by adding to the conf.py:
     ipysphinx_overwrite_existing  False                       raise error if nb_name.rst already exists
     ipysphinx_config_folders      ()                          additional folders containing ipypublish configuration files
     ipysphinx_show_prompts        False                       show cell prompts
-    ipysphinx_input_prompt        "[{count}]"                 format of input prompts
-    ipysphinx_output_prompt       "[{count}]"                 format of output prompts
+    ipysphinx_input_prompt        "[{count}]:"                 format of input prompts
+    ipysphinx_output_prompt       "[{count}]:"                 format of output prompts
     ipysphinx_preconverters       {}                          a mapping of additional file extensions to preconversion functions
     ============================= =========================== ==================================================================
 

ipypublish/__init__.py

@@ -1,3 +1,3 @@
 from ipypublish.scripts import nb_setup  # noqa: F401
 
-__version__ = '0.10.1'
+__version__ = '0.10.2'

ipypublish/scripts/nb_setup.py

@@ -200,7 +200,11 @@ def setup_matplotlib(
     from IPython import get_ipython
     from IPython.display import set_matplotlib_formats
     import matplotlib as mpl
-    from shutilwhich import which
+
+    try:
+        from shutil import which
+    except ImportError:
+        from shutilwhich import which
 
     ipython = get_ipython()
     latex_available = which('latex') is not None

ipypublish/sphinx/gls/cache.py

@@ -13,7 +13,7 @@
 import ast
 import collections
 import copy
-from oset import oset
+from ordered_set import OrderedSet
 import re
 
 
@@ -182,7 +182,7 @@ def __init__(self):
 
         self.bibfiles = {}
         self._bibliographies = collections.defaultdict(dict)
-        self._cited = collections.defaultdict(oset)
+        self._cited = collections.defaultdict(OrderedSet)
         self._enum_count = {}
 
     def purge(self, docname):

requirements-lock.txt

@@ -23,20 +23,19 @@ mistune==0.8.4            # via nbconvert
 mock==2.0.0               # via jupytext
 nbconvert==5.4.0
 nbformat==4.4.0
-oset==0.1.3
+ordered-set==3.1.1
 pandocfilters==1.4.2      # via nbconvert
 panflute==1.11.2
-pathlib2==2.3.3
+pathlib2==2.3.3           # via jsonextended
 pbr==5.1.2                # via mock
 pygments==2.3.1           # via nbconvert
 pyparsing==2.3.1          # via bibtexparser
 pyyaml==3.13              # via jupytext, panflute
 ruamel.yaml==0.15.87
-shutilwhich==1.1.0
+shutilwhich==1.1.0        # via panflute
 six==1.12.0
 testfixtures==6.5.0       # via jupytext
 testpath==0.4.2           # via nbconvert
 tornado==5.1.1
 traitlets==4.3.2
-typing==3.6.6
 webencodings==0.5.1       # via bleach

requirements.txt

@@ -6,12 +6,12 @@ jsonschema
 jupytext
 nbconvert
 nbformat
-oset
-pathlib2
+ordered-set
+pathlib2; python_version < '3.4'
 panflute
 ruamel.yaml
-shutilwhich
+shutilwhich; python_version < '3.3'
 six>=1.11.0
 traitlets
-typing
+typing; python_version < '3.5'
 tornado