Merge pull request #63 from manahl/bug/notebook-javascript-loading

Preserve insertion ordering on dependency tracker
man-group · Mar 27, 2019 · 38cc0a1 · 38cc0a1
2 parents aa05e28 + 15deb3a
commit 38cc0a1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ defaults: &defaults
          pip install coveralls
          pip install -r docs/source/requirements.txt
          python setup.py install  --highcharts=node_modules/highcharts/,node_modules/highcharts-heatmap/,node_modules/highcharts-funnel,node_modules/highcharts-exporting,node_modules/highcharts-export-csv --wkhtmltopdf=wkhtmltox/bin
-         python setup.py load_highcharts  --highcharts=node_modules/highcharts/js,node_modules/highcharts-heatmap/,node_modules/highcharts-funnel,node_modules/highcharts-exporting,node_modules/highcharts-export-csv
+         python setup.py load_highcharts  --highcharts=node_modules/highcharts/,node_modules/highcharts-heatmap/,node_modules/highcharts-funnel,node_modules/highcharts-exporting,node_modules/highcharts-export-csv
     # Save dependency cache
     - save_cache:
         key: v1-dep-{{ .Branch }}-{{ epoch }}

diff --git a/pybloqs/static/__init__.py b/pybloqs/static/__init__.py
@@ -110,13 +110,13 @@ def write(self, parent=None):
 
 class DependencyTracker(object):
     def __init__(self, *args):
-        self._deps_set = set(args)
+        self._deps = list(args)
 
     def add(self, *resources):
-        self._deps_set = self._deps_set.union(resources)
+        self._deps += [r for r in resources if r not in self._deps]
 
     def __iter__(self):
-        return iter(self._deps_set)
+        return iter(self._deps)
 
 
 # JS deflation script and the reporting core functionality is always registered

diff --git a/tests/integration/generate/test_base.py b/tests/integration/generate/test_base.py
@@ -13,7 +13,7 @@ def _create_dynamic_content():
     d = pd.date_range("2012-01-01", periods=10)
     s = pd.Series(range(len(d)), d)
 
-    return pbp.Plot(s, width="100%", height="100%")
+    return pbp.Plot(s, width="100px", height="100%")
 
 
 @assert_report_generated

diff --git a/tests/unit/static/test_static.py b/tests/unit/static/test_static.py
@@ -93,10 +93,17 @@ def test_dependency_tracker_retrieve_resources():
     assert set(dep) == {'res1', 'res2'}
 
 
-def test_dependency_tracker_add_resources_wit_deduplication():
-    dep = ps.DependencyTracker()
+def test_dependency_tracker_add_resources_with_deduplication():
+    dep = ps.DependencyTracker('res1')
     dep.add('res1', 'res2', 'res1')
-    assert set(dep) == {'res1', 'res2'}
+    assert sorted(dep) == ['res1', 'res2']
+
+
+def test_dependency_tracker_insertion_order():
+    dep = ps.DependencyTracker('A', 'C')
+    dep.add('D')
+    dep.add('B')
+    assert list(dep) == ['A', 'C', 'D', 'B']
 
 
 def test_register_interactive_write_interactive():