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

fix: ModuleNotFoundError when importing logging due to identical file name (DEV-2708) #530

Merged
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dsp_tools/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
from dsp_tools.fast_xmlupload.upload_files import upload_files
from dsp_tools.fast_xmlupload.upload_xml import fast_xmlupload
from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.excel2json.lists import excel2lists, validate_lists_section_with_schema
from dsp_tools.utils.excel2json.project import excel2json
from dsp_tools.utils.excel2json.properties import excel2properties
from dsp_tools.utils.excel2json.resources import excel2resources
from dsp_tools.utils.generate_templates import generate_template_repo
from dsp_tools.utils.id2iri import id2iri
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.project_create import create_project
from dsp_tools.utils.project_create_lists import create_lists
from dsp_tools.utils.project_get import get_project
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/fast_xmlupload/process_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from lxml import etree

from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.shared import http_call_with_retry, make_chunks

logger = get_logger(__name__, filesize_mb=100, backupcount=36)
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/fast_xmlupload/upload_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from dsp_tools.models.connection import Connection
from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.shared import login

logger = get_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/fast_xmlupload/upload_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from dsp_tools.fast_xmlupload.upload_files import get_pkl_files
from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.xml_upload import xml_upload

logger = get_logger(__name__)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/id2iri.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from lxml import etree

from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.xml_upload import parse_xml_file

logger = get_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/project_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
from dsp_tools.models.propertyclass import PropertyClass
from dsp_tools.models.resourceclass import ResourceClass
from dsp_tools.models.user import User
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.excel2json.lists import expand_lists_from_excel
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.project_create_lists import create_lists_on_server
from dsp_tools.utils.project_validate import validate_project
from dsp_tools.utils.shared import login, parse_json_input, try_network_action
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/project_create_lists.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from dsp_tools.models.exceptions import BaseError, UserError
from dsp_tools.models.listnode import ListNode
from dsp_tools.models.project import Project
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.excel2json.lists import expand_lists_from_excel
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.project_validate import validate_project
from dsp_tools.utils.shared import login, parse_json_input, try_network_action

Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from dsp_tools.models.connection import Connection
from dsp_tools.models.exceptions import BaseError, UserError
from dsp_tools.models.propertyelement import PropertyElement
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger

logger = get_logger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/stack_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import yaml

from dsp_tools.models.exceptions import UserError
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.shared import http_call_with_retry

logger = get_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/dsp_tools/utils/xml_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from dsp_tools.models.xmlpermission import XmlPermission
from dsp_tools.models.xmlproperty import XMLProperty
from dsp_tools.models.xmlresource import XMLResource
from dsp_tools.utils.logging import get_logger
from dsp_tools.utils.create_logger import get_logger
from dsp_tools.utils.shared import login, try_network_action, validate_xml_against_schema

MetricRecord = namedtuple("MetricRecord", ["res_id", "filetype", "filesize_mb", "event", "duration_ms", "mb_per_sec"])
Expand Down