diff --git a/.vscode/settings.json b/.vscode/settings.json
index 98f8039..b052764 100644
--- a/.vscode/settings.json
+++ b/.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,
diff --git a/ipypublish/scripts/nb_setup.py b/ipypublish/scripts/nb_setup.py
index 1f1446f..80d659c 100644
--- a/ipypublish/scripts/nb_setup.py
+++ b/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
diff --git a/ipypublish/sphinx/gls/cache.py b/ipypublish/sphinx/gls/cache.py
index 98b084b..cf23180 100644
--- a/ipypublish/sphinx/gls/cache.py
+++ b/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):
diff --git a/requirements-lock.txt b/requirements-lock.txt
index 8f83f4b..01ef5fd 100644
--- a/requirements-lock.txt
+++ b/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
diff --git a/requirements.txt b/requirements.txt
index e54e580..08b2909 100644
--- a/requirements.txt
+++ b/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
\ No newline at end of file