Skip to content

Cleanup dependencies #226

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.

Sign up for GitHub

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

Open
gernot-h wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −294
Open

Cleanup dependencies #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bc8b1c
cleanup old code to support Python<=3.7
gernot-h Jun 12, 2026
fd4b505
cleanup old code to support Python <=3.8
gernot-h Jun 12, 2026
cc70a75
fix(pyproject): remove unneeded and indirect dependencies
gernot-h Jun 12, 2026
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
13 changes: 3 additions & 10 deletions capycli/bom/check_granularity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
# SPDX-License-Identifier: MIT
# -------------------------------------------------------------------------------

try:
import importlib.resources as pkg_resources
except ImportError:
# Try backported to PY<37 `importlib_resources`.
import importlib_resources as pkg_resources # type: ignore
import importlib.resources as pkg_resources
import os
import sys
from typing import Any, List, Optional
Expand Down Expand Up @@ -78,11 +74,8 @@ def read_granularity_list(self, download_url: str = "", local_read_granularity:
except Exception as e:
print(f"An unexpected error occurred: {e}")
if not text_list:
if sys.version_info >= (3, 9):
resources = pkg_resources.files("capycli.data")
text_list = (resources / "granularity_list.csv").read_text()
else:
text_list = pkg_resources.read_text("capycli.data", "granularity_list.csv")
resources = pkg_resources.files("capycli.data")
text_list = (resources / "granularity_list.csv").read_text()

for line in text_list.splitlines():
# ignore header (first) line
Expand Down
18 changes: 4 additions & 14 deletions capycli/bom/component_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@
# SPDX-License-Identifier: MIT
# -------------------------------------------------------------------------------

import logging

try:
import importlib.resources as pkg_resources
except ImportError:
# Try backported to PY<37 `importlib_resources`.
import importlib_resources as pkg_resources # type: ignore

import importlib.resources as pkg_resources
import json
import logging
import os
import sys
from typing import Any, Dict, List
Expand Down Expand Up @@ -75,12 +69,8 @@ def read_component_check_list(self, download_url: str = "", local_check_list_fil
except Exception as e:
print_red(f"An unexpected error occurred: {e}")
if not self.component_check_list:
text_list = ""
if sys.version_info >= (3, 9):
resources = pkg_resources.files("capycli.data")
text_list = (resources / "component_checks.json").read_text()
else:
text_list = pkg_resources.read_text("capycli.data", "component_checks.json")
resources = pkg_resources.files("capycli.data")
text_list = (resources / "component_checks.json").read_text()

self.component_check_list = json.loads(text_list)

Expand Down
Loading
Loading