guidepost 0.2.5__tar.gz → 0.2.7__tar.gz

{guidepost-0.2.5 → guidepost-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: guidepost
-Version: 0.2.5
+Version: 0.2.7
 Summary: Guidepost. An overview visualization for understanding supercomputer queue data.
 Home-page: https://github.com/cscully-allison/guidepost
 Author: Connor Scully-Allison

{guidepost-0.2.5 → guidepost-0.2.7}/guidepost/guidepost.js

@@ -1883,6 +1883,13 @@ class Validator{
         return !isNaN(date.getTime());
     }
 
+    validate_data_loaded(){
+        if(Object.keys(this.data).length == 0){
+            return [{key:'data', value:'data', message:"No data detected. Please load data into <objectname>.vis_data"}];
+        }
+        return [];
+    }
+
 
     render_errors(errors){
         this.svg.selectAll("*").remove();
@@ -1912,10 +1919,13 @@ class Validator{
 
     validate(){
         let errors = [];
-
-        errors = this.validate_config_fields();
+         
+        errors = this.validate_data_loaded();
+        errors = errors.concat(this.validate_config_fields());
         errors = errors.concat(this.validate_var_specs());
 
+        //CONDITION WHERE ALL OTHER PARTS OF DATA ARE VALID
+        // SO THERE WILL NOT BE OBJECT/KEY ACCESS ERRORS
         if(errors.length <= 0){
             errors = this.validate_variable_semantics();
         }
@@ -2065,13 +2075,9 @@ function render({model, el}){
     let validator = new Validator(svg, data, var_specs);
     let is_valid = validator.validate();
 
-    if(Object.keys(data).length == 0){
-        first_text = svg.append('text').text('No data detected. Please load data into <objectname>.vis_data').attr('x', 15).attr('y', 15);
-    } else{
-        if(is_valid){
-            let jsmodel = new JSModel(data, var_specs, model);
-            create_views(jsmodel, svg);
-        }
+    if(is_valid){
+        let jsmodel = new JSModel(data, var_specs, model);
+        create_views(jsmodel, svg);
     }
 
     model.on("change:vis_configs", ()=>{

guidepost-0.2.7/guidepost/version.py

@@ -0,0 +1,2 @@
+__version_info__ = ("0", "2", "7")
+__version__ = ".".join(__version_info__)

{guidepost-0.2.5 → guidepost-0.2.7}/guidepost.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: guidepost
-Version: 0.2.5
+Version: 0.2.7
 Summary: Guidepost. An overview visualization for understanding supercomputer queue data.
 Home-page: https://github.com/cscully-allison/guidepost
 Author: Connor Scully-Allison

{guidepost-0.2.5 → guidepost-0.2.7}/setup.py

@@ -36,7 +36,8 @@ setup(
         'Operating System :: OS Independent',
     ],
     python_requires='>=3.6',
-    data_files=[
-        ('output_dir',['guidepost/guidepost.js']),
-    ]
+    include_package_data=True,
+    package_data={
+        'guidepost': ['guidepost.js'],
+    },
 )

guidepost-0.2.5/guidepost/version.py

@@ -1,2 +0,0 @@
-__version_info__ = ("0", "2", "5")
-__version__ = ".".join(__version_info__)