Fix logging level being set when importing PySide6

Move the global variables and initialization into main in
generate_pyi.py and set is_ci on the options object. Do the same for
consistency in pyi_generator.py.

Fixes: PYSIDE-1614
Change-Id: I5cb69b58816e5253b3842f135f51fbcbded7b348
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 9daa6fd5497226733d74490c03990e8d5a88d8d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 16 insertions, 13 deletions

diff --git a/sources/pyside6/PySide6/support/generate_pyi.py b/sources/pyside6/PySide6/support/generate_pyi.py
index 7e1c52ddd..ecc04019b 100644
--- a/sources/pyside6/PySide6/support/generate_pyi.py
+++ b/sources/pyside6/PySide6/support/generate_pyi.py
@@ -56,12 +56,6 @@ from pathlib import Path
 # Can we use forward references?
 USE_PEP563 = sys.version_info[:2] >= (3, 7)
 
-is_ci = os.environ.get("QTEST_ENVIRONMENT", "") == "ci"
-is_debug = is_ci or os.environ.get("QTEST_ENVIRONMENT")
-
-logging.basicConfig(level=logging.DEBUG if is_debug else logging.INFO)
-logger = logging.getLogger("generate_pyi")
-
 
 def generate_all_pyi(outpath, options):
     ps = os.pathsep
@@ -118,13 +112,20 @@ if __name__ == "__main__":
     parser.add_argument("--feature", nargs="+", choices=["snake_case", "true_property"], default=[],
         help="""a list of feature names. Example: `--feature snake_case true_property`""")
     options = parser.parse_args()
+
+    qtest_env = os.environ.get("QTEST_ENVIRONMENT", "")
+    log_level = logging.DEBUG if qtest_env else logging.INFO
     if options.quiet:
-        logger.setLevel(logging.WARNING)
+        log_level = logging.WARNING
+    logging.basicConfig(level=log_level)
+    logger = logging.getLogger("generate_pyi")
+
     outpath = options.outpath
     if outpath and not Path(outpath).exists():
         os.makedirs(outpath)
         logger.info(f"+++ Created path {outpath}")
     options._pyside_call = True
     options.logger = logger
+    options.is_ci = qtest_env == "ci"
     generate_all_pyi(outpath, options=options)
 # eof
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py
index 6e35727b3..ecc815bb2 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py
@@ -67,11 +67,6 @@ sourcepath = Path(__file__).resolve()
 USE_PEP563 = sys.version_info[:2] >= (3, 7)
 
 indent = " " * 4
-is_ci = os.environ.get("QTEST_ENVIRONMENT", "") == "ci"
-is_debug = is_ci or os.environ.get("QTEST_ENVIRONMENT")
-
-logging.basicConfig(level=logging.DEBUG if is_debug else logging.INFO)
-logger = logging.getLogger("pyi_generator")
 
 
 class Writer(object):
@@ -318,7 +313,7 @@ def generate_pyi(import_name, outpath, options):
                 wr.print(line)
     if not options.quiet:
         options.logger.info(f"Generated: {outfilepath}")
-    if options and options.check or is_ci:
+    if options and (options.check or options.is_ci):
         # Python 3.7 and up: We can check the file directly if the syntax is ok.
         if USE_PEP563:
             subprocess.check_output([sys.executable, os.fspath(outfilepath)])
@@ -344,10 +339,17 @@ if __name__ == "__main__":
     options = parser.parse_args()
     module = options.module
     outpath = options.outpath
+
+    qtest_env = os.environ.get("QTEST_ENVIRONMENT", "")
+    logging.basicConfig(level=logging.DEBUG if qtest_env else logging.INFO)
+    logger = logging.getLogger("pyi_generator")
+
     if outpath and not Path(outpath).exists():
         os.makedirs(outpath)
         logger.info(f"+++ Created path {outpath}")
     options._pyside_call = False
+    options.is_ci = qtest_env == "ci"
+
     options.logger = logger
     generate_pyi(module, outpath, options=options)