Merge pull request #49 from astrofrog/use-released-js

Use released Javascript file when exporting bundles
aperiosoftware · Feb 5, 2020 · 3afb4b3 · 3afb4b3
2 parents 6d2f561 + 320d782
commit 3afb4b3
Show file tree

Hide file tree

Showing 22 changed files with 378 additions and 136 deletions.
diff --git a/aas_timeseries/conftest.py b/aas_timeseries/conftest.py
@@ -93,8 +93,8 @@ def pytest_configure(config):
 
 @pytest.fixture(scope='function')
 def deterministic_uuid():
+    Faker.seed(12345)
     faker = Faker()
-    faker.seed(12345)
     uuid.uuid4 = faker.uuid4
     yield
     uuid.uuid4 = UUID4_ORIGINAL

diff --git a/aas_timeseries/layers.py b/aas_timeseries/layers.py
@@ -425,7 +425,7 @@ def to_vega(self, yunit=None):
                 'clip': True,
                 'encode': {'enter': {'x': {'value': 0},
                                      'x2': {'field': {'group': 'width'}},
-                                     'y': {'scale': 'yscale', 'value': value},
+                                     'y': {'scale': 'yscale', 'value': float(value)},
                                      'strokeWidth': {'value': self.width},
                                      'stroke': {'value': self.color or DEFAULT_COLOR},
                                      'strokeOpacity': {'value': self.opacity}}}}
@@ -471,8 +471,8 @@ def to_vega(self, yunit=None):
                 'clip': True,
                 'encode': {'enter': {'x': {'value': 0},
                                      'x2': {'field': {'group': 'width'}},
-                                     'y': {'scale': 'yscale', 'value': value_lower},
-                                     'y2': {'scale': 'yscale', 'value': value_upper},
+                                     'y': {'scale': 'yscale', 'value': float(value_lower)},
+                                     'y2': {'scale': 'yscale', 'value': float(value_upper)},
                                      'fill': {'value': self.color or DEFAULT_COLOR},
                                      'fillOpacity': {'value': self.opacity},
                                      'stroke': {'value': self.edge_color or DEFAULT_COLOR},
@@ -521,7 +521,7 @@ def to_vega(self, yunit=None):
                 'description': self.label,
                 'clip': True,
                 'encode': {'enter': {'x': {'scale': 'xscale', 'signal': time_to_vega(self.time)},
-                                     'y': {'scale': 'yscale', 'value': value},
+                                     'y': {'scale': 'yscale', 'value': float(value)},
                                      'text': {'value': self.text},
                                      'fill': {'value': self.color or DEFAULT_COLOR},
                                      'fillOpacity': {'value': self.opacity},

diff --git a/aas_timeseries/screenshot/qt_web_widget.py b/aas_timeseries/screenshot/qt_web_widget.py
@@ -14,6 +14,7 @@ class TimeSeriesWebEnginePage(QWebEnginePage):
 
     def __init__(self, parent=None):
         super(TimeSeriesWebEnginePage, self).__init__(parent=parent)
+        self.profile().clearHttpCache()
         if not WEBENGINE:
             self._frame = self.mainFrame()
 

diff --git a/aas_timeseries/screenshot/template.html b/aas_timeseries/screenshot/template.html
@@ -7,13 +7,7 @@
   <meta http-equiv="X-UA-Compatible" content="chrome=1" />
   <title>Interactive time series</title>
 
-  <link rel="stylesheet" href="https://aperiosoftware.github.io/timeseries.js/resources/aas.css">
-  <link rel="stylesheet" href="https://aperiosoftware.github.io/timeseries.js/resources/style.css">
-  <link rel="stylesheet" href="https://aperiosoftware.github.io/timeseries.js/resources/timeseries.css">
-  <script language="javascript" type="text/javascript" src="https://aperiosoftware.github.io/timeseries.js/resources/big.min.js"></script>
-  <script language="javascript" type="text/javascript" src="https://aperiosoftware.github.io/timeseries.js/resources/stuquery.js"></script>
-  <script language="javascript" type="text/javascript" src="https://aperiosoftware.github.io/timeseries.js/resources/graph.js"></script>
-  <script language="javascript" type="text/javascript" src="https://aperiosoftware.github.io/timeseries.js/resources/timeseries.js"></script>
+  <script language="javascript" type="text/javascript" src="https://aperiosoftware.github.io/timeseries.js/releases/timeseries-0.1.0.js"></script>
 
   <style type="text/css">
   body {

diff --git a/aas_timeseries/tests/coveragerc b/aas_timeseries/tests/coveragerc
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,22 +16,38 @@ trigger:
 
 jobs:
 
-- template: azure-template.yml
+- template: run-tox-env.yml@OpenAstronomy
   parameters:
-    name: Linux
-    os: linux
-    tox_pre: DISPLAY=:99.0
-    tox_test_env: imagetest-azure
 
-- template: azure-template.yml
-  parameters:
-    name: MacOSX
-    os: macosx
+    xvfb: true
+    coverage: codecov
+    libraries:
+      apt:
+        - libxkbcommon-x11-0
+        - pandoc
+      brew:
+        - pandoc
+      choco:
+        - pandoc
 
-- template: azure-template.yml
-  parameters:
-    name: Windows
-    os: windows
+    envs:
+
+    - linux: py37-imagetest
+    - linux: py38-imagetest
+    - linux: py38-notebook
+    - linux: py38-docs
+
+    - macos: py36-test
+    - macos: py37-test
+    - macos: py38-test
+    - macos: py38-notebook
+    - macos: py38-docs
+
+    - windows: py36-test
+    - windows: py37-test
+    - windows: py38-test
+    - windows: py38-notebook
+    - windows: py38-docs
 
 - template: publish.yml@OpenAstronomy
   parameters:
@@ -40,7 +56,3 @@ jobs:
     targets:
     - sdist
     - wheels_universal
-    dependsOn:
-    - Linux
-    - MacOSX
-    - Windows
diff --git a/azure-template.yml b/azure-template.yml
diff --git a/.validate-notebooks.py → docs/.validate-notebooks.py b/.validate-notebooks.py → docs/.validate-notebooks.py
@@ -4,7 +4,7 @@
 import nbformat
 from nbconvert.preprocessors import ExecutePreprocessor
 
-for notebook in glob.glob('docs/**/*.ipynb', recursive=True):
+for notebook in glob.glob('**/*.ipynb', recursive=True):
 
     print("Running {0}".format(notebook))
 

diff --git a/docs/data_008f61cc-91c7-46f8-96f7-f25f854e53b9.csv b/docs/data_008f61cc-91c7-46f8-96f7-f25f854e53b9.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_18eb43c0-98ec-4ae7-b778-8eb9b3052028.csv b/docs/data_18eb43c0-98ec-4ae7-b778-8eb9b3052028.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_1bc18574-bf53-4b63-9cd0-dece6a60abd8.csv b/docs/data_1bc18574-bf53-4b63-9cd0-dece6a60abd8.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_54aa6027-4910-4de2-8da2-af019e992507.csv b/docs/data_54aa6027-4910-4de2-8da2-af019e992507.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_85a72ac9-d612-41fc-b1b9-e2ae632be913.csv b/docs/data_85a72ac9-d612-41fc-b1b9-e2ae632be913.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_a78a803a-1106-4ef9-954b-0e62bc5214a1.csv b/docs/data_a78a803a-1106-4ef9-954b-0e62bc5214a1.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_a809454c-6519-4e38-b811-97f8a8be02c9.csv b/docs/data_a809454c-6519-4e38-b811-97f8a8be02c9.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_b99cf269-e448-4fa0-88e3-e7038b71ecf7.csv b/docs/data_b99cf269-e448-4fa0-88e3-e7038b71ecf7.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_e9a2a44c-88cc-4518-9350-8248e7174003.csv b/docs/data_e9a2a44c-88cc-4518-9350-8248e7174003.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_eac1b303-72d7-458c-b9f8-b22c75195688.csv b/docs/data_eac1b303-72d7-458c-b9f8-b22c75195688.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5
diff --git a/docs/data_eac5ad17-b291-424d-9c4a-3687f4d1883d.csv b/docs/data_eac5ad17-b291-424d-9c4a-3687f4d1883d.csv
@@ -0,0 +1,11 @@
+time,flux,error
+2016-03-22T12:30:31.000Z,10.0,2.0
+2016-03-22T12:30:34.000Z,11.0,2.5
+2016-03-22T12:30:37.000Z,9.0,2.0
+2016-03-22T12:30:40.000Z,10.0,1.5
+2016-03-22T12:30:43.000Z,2.0,2.0
+2016-03-22T12:30:46.000Z,3.0,2.0
+2016-03-22T12:30:49.000Z,5.0,1.5
+2016-03-22T12:30:52.000Z,12.0,1.5
+2016-03-22T12:30:55.000Z,11.0,2.0
+2016-03-22T12:30:58.000Z,10.0,2.5