Skip to content

fixed wheelhouse.yml #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/wheelhouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,4 @@ jobs:
with:
generate_release_notes: true
files: |
./**/*.tar.gz
${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-wheelhouse-${{ runner.os }}-${{ matrix.python-version }}.zip
13 changes: 13 additions & 0 deletions _unittest/test_14_AedtLogger.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,19 @@ def teardown_class(self):
# logger.clear_messages("", "", 2)
# assert not logger.get_messages().global_level

def test_01_formatter(self):
settings.formatter = logging.Formatter(
fmt="%(asctime)s (%(levelname)s) %(message)s", datefmt="%d.%m.%Y %H:%M:%S"
)
temp_dir = tempfile.gettempdir()
logging_dir = os.path.join(temp_dir, "log_testing")
if not os.path.exists(logging_dir):
os.makedirs(logging_dir)
path = os.path.join(logging_dir, "test01.txt")
logger = AedtLogger(filename=path)
assert logger.formatter == settings.formatter
settings.formatter = None

def test_02_output_file_with_app_filter(self):
content = None
temp_dir = tempfile.gettempdir()
Expand Down
11 changes: 6 additions & 5 deletions pyaedt/aedt_logger.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import logging
import sys

from pyaedt import is_ironpython
from pyaedt import log_handler
from pyaedt import settings

Expand Down Expand Up @@ -124,13 +123,15 @@ def __init__(self, level=logging.DEBUG, filename=None, to_stdout=False):
self.level = level
self.filename = filename or settings.logger_file_path
settings.logger_file_path = self.filename
if is_ironpython:
logging.basicConfig()
# if is_ironpython:
# logging.basicConfig()
self._global = logging.getLogger("Global")
self._file_handler = None
self._std_out_handler = None
self.formatter = logging.Formatter(settings.logger_formatter, datefmt=settings.logger_datefmt)

if settings.formatter:
self.formatter = settings.formatter
else:
self.formatter = logging.Formatter(settings.logger_formatter, datefmt=settings.logger_datefmt)
if not settings.enable_logger:
self._global.addHandler(logging.NullHandler())
return
Expand Down
1 change: 1 addition & 0 deletions pyaedt/generic/general_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@ def __init__(self):
self._use_grpc_api = False
self.machine = ""
self.port = 0
self.formatter = None

@property
def use_grpc_api(self):
Expand Down