sbdl 1.18.18__tar.gz → 1.18.20__tar.gz

{sbdl-1.18.18 → sbdl-1.18.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbdl
-Version: 1.18.18
+Version: 1.18.20
 Summary: System Behaviour Description Language (Compiler)
 Home-page: https://sbdl.dev
 Author: Michael A. Hicks

sbdl-1.18.20/pyproject.toml

@@ -0,0 +1,4 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+

{sbdl-1.18.18 → sbdl-1.18.20}/sbdl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbdl
-Version: 1.18.18
+Version: 1.18.20
 Summary: System Behaviour Description Language (Compiler)
 Home-page: https://sbdl.dev
 Author: Michael A. Hicks

{sbdl-1.18.18 → sbdl-1.18.20}/sbdl.egg-info/SOURCES.txt

@@ -1,10 +1,11 @@
 csv-to-sbdl.py
-sbdl
+pyproject.toml
 sbdl.py
 sbdl_server.py
 setup.py
 sbdl.egg-info/PKG-INFO
 sbdl.egg-info/SOURCES.txt
 sbdl.egg-info/dependency_links.txt
+sbdl.egg-info/entry_points.txt
 sbdl.egg-info/requires.txt
 sbdl.egg-info/top_level.txt

sbdl-1.18.20/sbdl.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+sbdl = sbdl:run_main

{sbdl-1.18.18 → sbdl-1.18.20}/sbdl.egg-info/requires.txt

@@ -4,4 +4,3 @@ jinja2
 matplotlib
 networkx
 openpyxl
-pandas

{sbdl-1.18.18 → sbdl-1.18.20}/sbdl.py

@@ -221,8 +221,8 @@ _A=True
 import argparse,base64,datetime,csv,functools,getpass,hashlib,importlib,io,json,os,pathlib,pickle,platform,re,shlex,string,subprocess,sys,tarfile,tempfile,textwrap,time,traceback,types,unittest,urllib.request,urllib.parse,warnings,zlib,zipfile
 warnings.filterwarnings(_A1,category=DeprecationWarning)
 __NAME=_j
-__VERSION='1.18.18'
-__VERSION_DEV='2a6b4c8'
+__VERSION='1.18.20'
+__VERSION_DEV='4102984'
 __VERSION_DSL='25.6'
 __VERSION_REST_API='1.1.0'
 __AUTHOR='contact@sbdl.dev'
@@ -585,7 +585,7 @@ class SBDL_Parser:
 		def git_commit_hash(macros,*inp):
 			param_path=''.join(inp);config_path=os.path.join(macros[SBDL_Parser.Macros.path].replace(macros[SBDL_Parser.Macros.file_name],''),param_path)
 			try:repo_root=pathlib.Path(config_path).resolve();hash_value=subprocess.check_output(['git','-C',str(repo_root),'rev-parse','--short','HEAD'],text=_A).strip()
-			except Exception as e:raise self.MacroReplaceException(f"ERROR retrieving Git commit hash: {e}",first_pass_can_ignore=_C)
+			except Exception as e:hash_value='GIT_HASH_UNAVAILABLE';f_print(f"{macros[SBDL_Parser.Macros.file_name]}:{macros[SBDL_Parser.Macros.line]}:: WARNING cannot retrieve Git commit hash: {e}",warning=_A)
 			return hash_value
 		def identifier_from_property(macros,*inp):
 			A='SBDL_PROPERTY_VALUE_CACHE_MEMO'
@@ -1879,14 +1879,14 @@ def msword_input_handler(file_reference):
 	return result,handler
 def msexcel_input_handler(file_reference):
 	result=_C;handler=_B;_,extension=os.path.splitext(file_reference)
-	if extension=='.xls'or extension=='.xlsx'or extension=='.ods':
+	if extension=='.xls'or extension=='.xlsx':
 		try:
-			import pandas;pdframe=pandas.read_excel(file_reference);content=[]
-			for col in pdframe:
-				content.append(str(col))
-				for cell in pdframe[col]:content.append(ms_character_fix(str(cell)))
+			import openpyxl;wb=openpyxl.load_workbook(file_reference,data_only=_A);ws=wb.active;content=[]
+			for col_cells in ws.iter_cols():
+				header=col_cells[0].value;content.append(str(header))
+				for cell in col_cells[1:]:content.append(ms_character_fix(str(cell.value)))
 			handler=list_file_object(content);result=_A
-		except Exception as e:f_print('Trying to parse what looks like an MS Excel file but pandas package cannot be imported correctly:\n  {}'.format(str(e)),do_warning=_A,warning=_A)
+		except Exception as e:f_print('Trying to parse what looks like an MS Excel file but openpyxl package cannot be imported correctly:\n  {}'.format(str(e)),do_warning=_A,warning=_A)
 	return result,handler
 def make_remote_file_local(file_reference):
 	local_file_reference=file_reference;parsed_file_reference=urllib.parse.urlparse(local_file_reference);error_string=_B
@@ -2311,7 +2311,7 @@ def write_process_graph_output(sbdl_ast,output_file,file_opener,_,print_l):
 		if SBDL_Parser.Attributes.condition in event_elem.properties():condition=event_elem.get_property(SBDL_Parser.Attributes.condition)
 		def emit_note():
 			nonlocal event_cont,note_stagger
-			if show_descriptions and event_elem.description():event_cont+=f"{indent_str}note {_AA if note_stagger else _AB}\n{indent_str}{event_elem.description()}\n{indent_str}end note\n";note_stagger=not note_stagger
+			if show_descriptions and event_elem.description():event_cont+=f"{indent_str}note "+(_AA if note_stagger else _AB)+'\n{indent_str}{event_elem.description()}\n{indent_str}end note\n';note_stagger=not note_stagger
 		if ev_aspect!=current_aspect and get_config_value(_q,number=_A):
 			event_cont+=f"{indent_str}"
 			if ev_aspect in elements:
@@ -2321,12 +2321,12 @@ def write_process_graph_output(sbdl_ast,output_file,file_opener,_,print_l):
 		if first_event:
 			event_cont+=f"{indent_str}start\n";first_event=_C
 			if get_config_value(_q,number=_A):event_cont+=f"{indent_str}{elem_colour_prefix(g_process_elem)}:{g_process_elem.identifier()}; <<procedure>>\n";emit_note()
-		if is_loop:event_cont+=f"{indent_str}repeat{_D if control_only else""}"
-		if not control_only:event_cont+=f"{indent_str}{elem_colour_prefix(event_elem)if not is_loop else""}:{event_elem.identifier()}; <<task>>\n";emit_note()
+		if is_loop:suffix=_D if control_only else'';event_cont+=f"{indent_str}repeat{suffix}"
+		if not control_only:prefix=elem_colour_prefix(event_elem)if not is_loop else'';event_cont+=f"{indent_str}{prefix}:{event_elem.identifier()}; <<task>>\n";emit_note()
 		if ev_links and condition and not is_loop:event_cont+=f"{indent_str}if ({condition}) then (condition met)\n"
 		child_count=0
 		for event_id in ev_links:
-			if is_parallel:event_cont+=f"{indent_str}fork{" again"if child_count else""}\n"
+			if is_parallel:suffix=' again'if child_count else'';event_cont+=f"{indent_str}fork{suffix}\n"
 			event_cont+=recurse_event_contents(elements[event_id],ev_aspect,indent=indent+2);child_count+=1
 		if is_parallel:event_cont+=f"{indent_str}endfork\n"
 		if ev_links and SBDL_Parser.Attributes.condition_alternative in event_elem.properties():
@@ -2338,7 +2338,7 @@ def write_process_graph_output(sbdl_ast,output_file,file_opener,_,print_l):
 	def handle_process_element(process_elem):
 		nonlocal g_process_elem,first_event;first_event=_A;g_process_elem=process_elem;process_cont=''
 		if not get_config_value(_q,number=_A):
-			process_cont+=f'group {elem_colour_prefix(process_elem)}"**{f"{process_elem.type()}::{process_elem.stereotype()}"if process_elem.stereotype()else process_elem.type()}** {process_elem.identifier()}" {{\n';description=process_elem.description()
+			process_cont+=f'group {elem_colour_prefix(process_elem)}"**'+(f"{process_elem.type()}::{process_elem.stereotype()}"if process_elem.stereotype()else process_elem.type())+'** {process_elem.identifier()}" {{\n';description=process_elem.description()
 			if show_descriptions and description:process_cont+=f"note\n{description}\nend note\n"
 		process_links=SBDL_AST.get_all_links_for_element(process_elem,elements)
 		for event_id in[x.identifier()for x in process_links if x.is_a(SBDL_Event)and x.identifier()in elements]:process_cont+=recurse_event_contents(elements[event_id])
@@ -2611,6 +2611,11 @@ class OpenFMEA:
 				if not raw:content=result[1:-1];result=SBDL_Parser.Tokens.replacement_string_default.join(content.split());result=SBDL_Parser.sanitize_identifier(result)
 		return result
 	@classmethod
+	def remove_id_from_description(self,description):
+		result=description;id_string=self.get_id_from_string(description,_A)
+		if id_string!=_B:result=result.replace(id_string,'')
+		return result
+	@classmethod
 	def add_id_to_string(self,identifier,string_content):return'[{}] {}'.format(identifier,string_content)
 	@classmethod
 	def sbdl_elements_from_table(self,sbdl_table,_):return self.elements_from_table(sbdl_table,_)
@@ -2626,10 +2631,6 @@ class OpenFMEA:
 				if not attr_type in id_lookup:id_lookup[attr_type]={};id_lookup[attr_type][A]=1
 				result=id_lookup[attr_type][attr]=replace_str.join((elems_to_consider[attr_type]+replace_str+str(id_lookup[attr_type][A]).zfill(3)).split());id_lookup[attr_type][A]+=1
 			return result
-		def remove_id_from_description(description):
-			result=description;id_string=self.get_id_from_string(description,_A)
-			if id_string!=_B:result=result.replace(id_string,'')
-			return result
 		def split_multi_field(multi_data):return[x.strip()for x in str(multi_data).split(multi_field_separator)]
 		def present_on_relevant_rows(source_content,source_column,target_content,target_column):
 			result=_A
@@ -2656,7 +2657,7 @@ class OpenFMEA:
 		def handle_elem(row_data,attr):
 			attr_data_full=split_multi_field(row_data[attr])
 			for attr_data in attr_data_full:
-				attr_data_no_id=remove_id_from_description(attr_data).strip()
+				attr_data_no_id=self.remove_id_from_description(attr_data).strip()
 				if len(attr_data)>0:
 					if attr in elems_to_consider:
 						id_ref=get_id_from_attr(attr,attr_data);elem=_B
@@ -2685,7 +2686,7 @@ class OpenFMEA:
 			if'id'in gen_elem_obj and _P in gen_elem_obj and _K in gen_elem_obj:
 				if gen_elem_obj[_K]in supported_general_types:
 					if supported_general_types[gen_elem_obj[_K]][B]==0:supported_general_types[gen_elem_obj[_K]][B]+=1;new_customtype_statement=SBDL_Parser.parse_customtype(SBDL_Parser.Parser_Element(supported_general_types[gen_elem_obj[_K]][C],_AC,0));new_customtype_def=SBDL_CustomType(new_customtype_statement);general_elements.append(new_customtype_def)
-					new_gen_elem=SBDL_Element_Synthetic(entry_identifier(gen_elem_obj),gen_elem_obj[_P],supported_general_types[gen_elem_obj[_K]][A],_B)
+					new_gen_elem=SBDL_Element_Synthetic(entry_identifier(gen_elem_obj),self.remove_id_from_description(gen_elem_obj[_P]),supported_general_types[gen_elem_obj[_K]][A],_B)
 					if D in gen_elem_obj:
 						for edge in gen_elem_obj[D]:
 							explicit_identifier=self.get_id_from_string(edge);matching_identifier=_B;matching_type=_B

{sbdl-1.18.18 → sbdl-1.18.20}/setup.py

@@ -2,14 +2,18 @@ from setuptools import setup
 
 setup(
   name='sbdl',
-  version='1.18.18',
+  version='1.18.20',
   description = "System Behaviour Description Language (Compiler)",
   author = "Michael A. Hicks",
   author_email = "michael@mahicks.org",
   url = "https://sbdl.dev",
-  scripts=['sbdl'],
   py_modules=['sbdl','csv-to-sbdl','sbdl_server'],
   license = "Proprietary",
   python_requires='>=3.6',
-  install_requires=['networkx','matplotlib','docx2txt','pandas','openpyxl','docxtpl','jinja2']
+  install_requires=['networkx','matplotlib','docx2txt','openpyxl','docxtpl','jinja2'],
+  entry_points={
+    'console_scripts': [
+      'sbdl = sbdl:run_main',
+    ],
+  }
 )

sbdl-1.18.18/sbdl

@@ -1,5 +0,0 @@
-#!/usr/bin/python3
-import sys
-import subprocess
-
-subprocess.call([sys.executable, '-m', 'sbdl'] + sys.argv[1:])