Fixed circular dependency in the tests
This commit is contained in:
parent
e5ed4b6652
commit
081786cf5e
|
|
@ -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,
|
||||
print_filters_help)
|
||||
from .kiplot import (generate_outputs, load_actions, config_output, generate_makefile)
|
||||
GS.kibot_version = __version__
|
||||
|
||||
|
||||
def list_pre_and_outs(logger, outputs):
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ class GS(object):
|
|||
sch = None
|
||||
debug_enabled = False
|
||||
debug_level = 0
|
||||
kibot_version = None
|
||||
n = datetime.now()
|
||||
kicad_version = ''
|
||||
kicad_conf_path = None
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ from datetime import datetime
|
|||
from copy import deepcopy
|
||||
from collections import OrderedDict
|
||||
from .config import KiConf, un_quote
|
||||
from ..__main__ import __version__
|
||||
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,
|
||||
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')
|
||||
SubElement(design, 'source').text = self.fname
|
||||
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.set('number', str(self.sheet))
|
||||
sheet.set('name', str(self.sheet_path_h))
|
||||
|
|
|
|||
Loading…
Reference in New Issue