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

[patch] replace logger with snippets version #1465

Merged
merged 10 commits into from
Jun 3, 2024
8 changes: 0 additions & 8 deletions pyiron_base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@

from pyiron_base.jobs.job.toolkit import Toolkit, BaseTools

# Expose snippets references in base API for backwards compatibility
from pyiron_snippets.import_alarm import ImportAlarm
from pyiron_snippets.deprecate import Deprecator, deprecate, deprecate_soon

# Internal init
from ._version import get_versions
from pyiron_base.utils.jedi import fix_ipython_autocomplete
Expand Down Expand Up @@ -76,10 +72,6 @@
HasStoredTraits,
InputList,
GenericParameters,
Deprecator,
deprecate,
deprecate_soon,
ImportAlarm,
Executable,
Notebook,
load,
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/database/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
DatabaseAccess class deals with accessing the database
"""

from pyiron_base.state.logger import logger
import numpy as np
import re
import os
from datetime import datetime
import pandas
from pyiron_snippets.deprecate import deprecate
from pyiron_snippets.logger import logger
from sqlalchemy import (
create_engine,
MetaData,
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/database/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
DatabaseAccess class deals with accessing the database
"""

from pyiron_base.state.logger import logger
from abc import ABC, abstractmethod
from collections.abc import Iterable
import warnings
import numpy as np
import re
import pandas
from pyiron_snippets.deprecate import deprecate
from pyiron_snippets.logger import logger
import typing
import fnmatch

Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/database/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""

from urllib.parse import quote_plus
from pyiron_base.state.logger import logger
from pyiron_snippets.logger import logger
from pyiron_snippets.singleton import Singleton
from pyiron_base.state.settings import settings as s
import os
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/state/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
compatibility.
"""

from pyiron_base.state.logger import logger as _logger
from pyiron_base.database.manager import database as _database
from pyiron_base.state.publications import publications as _publications
from pyiron_base.state.queue_adapter import queue_adapters as _queue_adapters
from pyiron_base.state.settings import settings as _settings
from pyiron_snippets.logger import logger as _logger
from pyiron_snippets.singleton import Singleton
from typing import Dict, Union

Expand Down
73 changes: 0 additions & 73 deletions pyiron_base/state/logger.py

This file was deleted.

2 changes: 1 addition & 1 deletion pyiron_base/state/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
import os
import warnings
from configparser import ConfigParser
from pyiron_base.state.logger import logger
from pyiron_base.state.publications import publications
from pyiron_base.utils.strtobool import strtobool
from pathlib import Path
from pyiron_snippets.logger import logger
from pyiron_snippets.singleton import Singleton
from typing import Union, Dict, List
from copy import deepcopy
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/utils/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import time
from typing import Callable, TypeVar, Type, Tuple, Optional, Union

from pyiron_base.state.logger import logger
from pyiron_snippets.logger import logger

__author__ = "Joerg Neugebauer, Jan Janssen"
__copyright__ = (
Expand Down
51 changes: 0 additions & 51 deletions tests/state/test_logger.py

This file was deleted.

Loading