From 2511fe8ca43c69ef46f5615538cabf5b0fb90771 Mon Sep 17 00:00:00 2001 From: Mike Gerber Date: Fri, 13 Jun 2025 19:20:48 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Sort=20and=20remove=20unused=20i?= =?UTF-8?q?mports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 3 ++- src/mods4pandas/alto4pandas.py | 23 +++++------------------ src/mods4pandas/lib.py | 8 ++++---- src/mods4pandas/mods4pandas.py | 21 ++++----------------- 4 files changed, 15 insertions(+), 40 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 400bc90..9bb642d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,8 +46,9 @@ optional-dependencies.dev = {file = ["requirements-dev.txt"]} where = ["src"] -[tool.ruff.lint] +[tool.ruff] select = ["E", "F", "I"] +line-length = 120 [tool.liccheck] diff --git a/src/mods4pandas/alto4pandas.py b/src/mods4pandas/alto4pandas.py index 27166c9..2e9f6cb 100755 --- a/src/mods4pandas/alto4pandas.py +++ b/src/mods4pandas/alto4pandas.py @@ -1,39 +1,26 @@ #!/usr/bin/env python3 +import contextlib import csv import logging import os -import re -import warnings -import sys -import contextlib import sqlite3 -from xml.dom.expatbuilder import Namespaces -from lxml import etree as ET -from itertools import groupby +import warnings from operator import attrgetter from typing import List -from collections.abc import MutableMapping, Sequence import click -import numpy as np +from lxml import etree as ET from tqdm import tqdm from .lib import ( TagGroup, convert_db_to_parquet, - sorted_groupby, flatten, - ns, insert_into_db, + ns, + sorted_groupby, ) -with warnings.catch_warnings(): - # Filter warnings on WSL - if "Microsoft" in os.uname().release: - warnings.simplefilter("ignore") - import pandas as pd - - logger = logging.getLogger("alto4pandas") diff --git a/src/mods4pandas/lib.py b/src/mods4pandas/lib.py index 803c3cd..00192a0 100644 --- a/src/mods4pandas/lib.py +++ b/src/mods4pandas/lib.py @@ -1,12 +1,12 @@ from __future__ import annotations import ast -from itertools import groupby +import os import re import warnings -import os -from typing import Any, List, Sequence, MutableMapping, Dict from collections import defaultdict +from itertools import groupby +from typing import Any, Dict, List, MutableMapping, Sequence import numpy as np from lxml import etree as ET @@ -281,8 +281,8 @@ def sorted_groupby(iterable, key=None): def _to_dict(root, raise_errors): - from .mods4pandas import mods_to_dict, mets_to_dict from .alto4pandas import alto_to_dict + from .mods4pandas import mets_to_dict, mods_to_dict root_name = ET.QName(root.tag) if root_name.namespace == "http://www.loc.gov/mods/v3": diff --git a/src/mods4pandas/mods4pandas.py b/src/mods4pandas/mods4pandas.py index 017f6e9..78a967b 100755 --- a/src/mods4pandas/mods4pandas.py +++ b/src/mods4pandas/mods4pandas.py @@ -3,38 +3,25 @@ import contextlib import csv import logging import os -import re import sqlite3 import warnings -import sys -from lxml import etree as ET -from itertools import groupby from operator import attrgetter from typing import Dict, List -from collections import defaultdict -from collections.abc import MutableMapping, Sequence import click +from lxml import etree as ET from tqdm import tqdm from .lib import ( - convert_db_to_parquet, - sorted_groupby, TagGroup, - ns, + convert_db_to_parquet, flatten, insert_into_db, insert_into_db_multiple, - current_columns_types, + ns, + sorted_groupby, ) -with warnings.catch_warnings(): - # Filter warnings on WSL - if "Microsoft" in os.uname().release: - warnings.simplefilter("ignore") - import pandas as pd - - logger = logging.getLogger("mods4pandas")