templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed circular dependency in the tests

This commit is contained in:
Salvador E. Tropea 2021-12-30 19:02:04 -03:00
parent e5ed4b6652
commit 081786cf5e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kibot/__main__.py
View File

@ -78,6 +78,7 @@ from .pre_base import (BasePreFlight)
from .config_reader import (CfgYamlReader, print_outputs_help, print_output_help, print_preflights_help, create_example, from .config_reader import (CfgYamlReader, print_outputs_help, print_output_help, print_preflights_help, create_example,
print_filters_help) print_filters_help)
from .kiplot import (generate_outputs, load_actions, config_output, generate_makefile) from .kiplot import (generate_outputs, load_actions, config_output, generate_makefile)
GS.kibot_version = __version__
def list_pre_and_outs(logger, outputs): def list_pre_and_outs(logger, outputs):

1
kibot/gs.py
View File

@ -35,6 +35,7 @@ class GS(object):
sch = None sch = None
debug_enabled = False debug_enabled = False
debug_level = 0 debug_level = 0
kibot_version = None
n = datetime.now() n = datetime.now()
kicad_version = '' kicad_version = ''
kicad_conf_path = None kicad_conf_path = None

3
kibot/kicad/v5_sch.py
View File

@ -17,7 +17,6 @@ from datetime import datetime
from copy import deepcopy from copy import deepcopy
from collections import OrderedDict from collections import OrderedDict
from .config import KiConf, un_quote from .config import KiConf, un_quote
from ..__main__ import __version__
from ..gs import GS from ..gs import GS
from ..misc import (W_BADPOLI, W_POLICOORDS, W_BADSQUARE, W_BADCIRCLE, W_BADARC, W_BADTEXT, W_BADPIN, W_BADCOMP, W_BADDRAW, from ..misc import (W_BADPOLI, W_POLICOORDS, W_BADSQUARE, W_BADCIRCLE, W_BADARC, W_BADTEXT, W_BADPIN, W_BADCOMP, W_BADDRAW,
W_UNKDCM, W_UNKAR, W_ARNOPATH, W_ARNOREF, W_MISCFLD, W_EXTRASPC, W_NOLIB, W_INCPOS, W_NOANNO, W_MISSLIB, W_UNKDCM, W_UNKAR, W_ARNOPATH, W_ARNOREF, W_MISCFLD, W_EXTRASPC, W_NOLIB, W_INCPOS, W_NOANNO, W_MISSLIB,
@ -1770,7 +1769,7 @@ class Schematic(object):
design = SubElement(root, 'design') design = SubElement(root, 'design')
SubElement(design, 'source').text = self.fname SubElement(design, 'source').text = self.fname
SubElement(design, 'date').text = datetime.now().strftime("%a %b %e %H:%M:%S %Y") SubElement(design, 'date').text = datetime.now().strftime("%a %b %e %H:%M:%S %Y")
SubElement(design, 'tool').text = 'KiBot v'+__version__ SubElement(design, 'tool').text = 'KiBot v'+GS.kibot_version
sheet = SubElement(design, 'sheet') sheet = SubElement(design, 'sheet')
sheet.set('number', str(self.sheet)) sheet.set('number', str(self.sheet))
sheet.set('name', str(self.sheet_path_h)) sheet.set('name', str(self.sheet_path_h))