Skip to content
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

improve for testings log_file_level = DEBUG #2277

Merged
merged 17 commits into from
May 22, 2024
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
5 changes: 5 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import importlib.util
import os
import sys
import logging
import matplotlib
# Disable pyc files
sys.dont_write_bytecode = True

Expand All @@ -37,6 +39,9 @@
import keyring
from mslib.mswms.demodata import DataFiles
import tests.constants as constants
from mslib.utils.loggerdef import configure_mpl_logger

matplotlib_logger = configure_mpl_logger()

# This import must come after importing tests.constants due to MSUI_CONFIG_PATH being set there
from mslib.utils.config import read_config_file
Expand Down
2 changes: 2 additions & 0 deletions mslib/msui/mpl_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@

from mslib.msui import mpl_pathinteractor as mpl_pi
from mslib.utils.airdata import get_airports, get_airspaces
from mslib.utils.loggerdef import configure_mpl_logger


OPENAIP_NOTICE = "Airspace data used comes from openAIP.\n" \
"Visit openAIP.net and contribute to better aviation data, free for everyone to use and share."
OURAIRPORTS_NOTICE = "Airports provided by OurAirports."
mpl_logger = configure_mpl_logger()


class MapCanvas(basemap.Basemap):
Expand Down
4 changes: 4 additions & 0 deletions mslib/msui/mpl_pathinteractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
from mslib.utils.units import units
from mslib.utils.thermolib import pressure2flightlevel
from mslib.msui import flighttrack as ft
from mslib.utils.loggerdef import configure_mpl_logger


mpl_logger = configure_mpl_logger()


def distance_point_linesegment(p, l1, l2):
Expand Down
3 changes: 3 additions & 0 deletions mslib/msui/mpl_qtwidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
from mslib.msui import mpl_pathinteractor as mpl_pi
from mslib.msui import mpl_map
from mslib.msui.icons import icons
from mslib.utils.loggerdef import configure_mpl_logger

PIL_IMAGE_ORIGIN = "upper"
LAST_SAVE_DIRECTORY = config_loader(dataset="data_dir")
Expand Down Expand Up @@ -94,6 +95,8 @@
"plot_title_size": "default",
"axes_label_size": "default"}

mpl_logger = configure_mpl_logger()


class ViewPlotter:
def __init__(self, fig=None, ax=None, settings_tag=None, settings=None):
Expand Down
3 changes: 3 additions & 0 deletions mslib/mswms/generics.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import matplotlib

from mslib.utils.units import convert_to
from mslib.utils.loggerdef import configure_mpl_logger

"""
Number of levels in discrete colourmaps
Expand Down Expand Up @@ -212,6 +213,8 @@
elif standard_name not in _TITLES:
_TITLES[standard_name] = standard_name.replace("_", " ")

mpl_logger = configure_mpl_logger()


def get_standard_names():
return _TARGETS
Expand Down
2 changes: 2 additions & 0 deletions mslib/mswms/mpl_hsec.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@
from mslib.utils.coordinate import get_projection_params
from mslib.utils.units import convert_to
from mslib.mswms.utils import make_cbar_labels_readable
from mslib.utils.loggerdef import configure_mpl_logger


BASEMAP_CACHE = {}
BASEMAP_REQUESTS = []
mpl_logger = configure_mpl_logger()


class AbstractHorizontalSectionStyle(mss_2D_sections.Abstract2DSectionStyle):
Expand Down
2 changes: 2 additions & 0 deletions mslib/mswms/mpl_lsec.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@

from mslib.mswms import mss_2D_sections
from mslib.utils.units import convert_to
from mslib.utils.loggerdef import configure_mpl_logger

mpl.rcParams['xtick.direction'] = 'out'
mpl.rcParams['ytick.direction'] = 'out'
mpl_logger = configure_mpl_logger()


class AbstractLinearSectionStyle(mss_2D_sections.Abstract2DSectionStyle):
Expand Down
2 changes: 2 additions & 0 deletions mslib/mswms/mpl_vsec.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@
from mslib.mswms import mss_2D_sections
from mslib.utils.units import convert_to, units
from mslib.mswms.utils import make_cbar_labels_readable
from mslib.utils.loggerdef import configure_mpl_logger


mpl.rcParams['xtick.direction'] = 'out'
mpl.rcParams['ytick.direction'] = 'out'
mpl_logger = configure_mpl_logger()


class AbstractVerticalSectionStyle(mss_2D_sections.Abstract2DSectionStyle):
Expand Down
4 changes: 2 additions & 2 deletions mslib/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def setup_logging(args):
ch.setLevel(logging.DEBUG)
ch.setFormatter(debug_formatter)
else:
logger.setLevel(logging.INFO)
ch.setLevel(logging.INFO)
logger.setLevel(logging.DEBUG)
ch.setLevel(logging.DEBUG)
ch.setFormatter(default_formatter)
logger.addHandler(ch)
# File handler (always on DEBUG level)
Expand Down
34 changes: 34 additions & 0 deletions mslib/utils/loggerdef.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# -*- coding: utf-8 -*-
"""

mslib.utils.loggerdef
~~~~~~~~~~~~~~~~

This module sets the logging level and prevent code repetition.

This file is part of MSS.

:copyright: Copyright 2024 Preetam Sundar Das
:copyright: Copyright 2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""

import logging


def configure_mpl_logger():
mpl_logger = logging.getLogger('matplotlib')
mpl_logger.setLevel(logging.INFO)
return mpl_logger
3 changes: 3 additions & 0 deletions mslib/utils/mssautoplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,15 @@
from mslib.msui import flighttrack as ft
from mslib.utils import config as conf
from mslib.utils.auth import get_auth_from_url_and_name
from mslib.utils.loggerdef import configure_mpl_logger


TEXT_CONFIG = {
"bbox": dict(boxstyle="round", facecolor="white", alpha=0.5, edgecolor="none"), "fontweight": "bold",
"zorder": 4, "fontsize": 6, "clip_on": True}

mpl_logger = configure_mpl_logger()


def load_from_ftml(filename):
"""Load a flight track from an XML file at <filename>.
Expand Down