Skip to content

Commit b7e8b0b

Browse files
committed
Fix 'check_manifest()' import; Enable logging.
1 parent 5d10ed3 commit b7e8b0b

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

run_tests.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -625,28 +625,27 @@ def main(module_filter, test_filter, libdir):
625625
# Hmm...
626626
logini = os.path.abspath("log.ini")
627627

628-
from setup import check_manifest
628+
from roundup.dist.command.build import check_manifest
629629
check_manifest()
630630

631631
# Initialize the path and cwd
632632
global pathinit
633633
pathinit = PathInit(build, build_inplace, libdir)
634634

635-
# No logging module in py 2.1
636-
# # Initialize the logging module.
635+
# Initialize the logging module.
637636

638-
# import logging.config
639-
# logging.basicConfig()
637+
import logging.config
638+
logging.basicConfig()
640639

641-
# level = os.getenv("LOGGING")
642-
# if level:
643-
# level = int(level)
644-
# else:
645-
# level = logging.CRITICAL
646-
# logging.root.setLevel(level)
640+
level = os.getenv("LOGGING")
641+
if level:
642+
level = int(level)
643+
else:
644+
level = logging.CRITICAL
645+
logging.root.setLevel(level)
647646

648-
# if os.path.exists(logini):
649-
# logging.config.fileConfig(logini)
647+
if os.path.exists(logini):
648+
logging.config.fileConfig(logini)
650649

651650
files = find_tests(module_filter)
652651
files.sort()

0 commit comments

Comments
 (0)