Skip to content

Commit 72d32bc

Browse files
committed
fix #148
1 parent b7c93c5 commit 72d32bc

8 files changed

Lines changed: 17 additions & 130 deletions

File tree

licensecheck/license_matrix/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
import csv
4343
from pathlib import Path
44-
from typing import Any
4544

4645
from loguru import logger
4746

licensecheck/models/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from dataclasses import field
44
from typing import Any, Literal
55

6+
from depgather.models.defaultonnone import DefaultOnNoneModel
67
from pydantic import field_validator
78

89
from licensecheck.io.fmt import FMT
9-
from licensecheck.models.defaultonnone import DefaultOnNoneModel
1010

1111

1212
class LC_Config(DefaultOnNoneModel):

licensecheck/models/defaultonnone.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

licensecheck/models/pypijson.py

Lines changed: 0 additions & 93 deletions
This file was deleted.

licensecheck/packageinforesolver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import requests
1717
import tomli
1818
from boolean.boolean import Expression
19+
from depgather.models.pypijson import ProjectResponse
1920
from depgather.parse import gather
2021
from license_expression import Licensing
2122
from packaging.requirements import Requirement
2223
from packaging.utils import canonicalize_name
2324

2425
from licensecheck.models.constants import JOINS, UNKNOWN
2526
from licensecheck.models.packageinfo import PackageInfo
26-
from licensecheck.models.pypijson import ProjectResponse
2727
from licensecheck.session import session
2828

2929
RAW_JOINS = " AND "

licensecheck/session.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import appdirs
21
import requests_cache
2+
from platformdirs import PlatformDirs
33

4-
session = requests_cache.CachedSession(appdirs.user_cache_dir("licensecheck", "fredhappyface"))
4+
dirs = PlatformDirs("licensecheck", "fredhappyface")
5+
6+
7+
session = requests_cache.CachedSession(dirs.user_cache_dir)

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "licensecheck"
3-
version = "2026.0.5"
3+
version = "2026.0.6"
44
description = "Output the licenses used by dependencies and check if these are compatible with the project license"
55
authors = [{ name = "FredHappyface" }]
66
requires-python = ">=3.12"
@@ -21,12 +21,12 @@ classifiers = [
2121
"Topic :: Utilities",
2222
]
2323
dependencies = [
24-
"appdirs>=1.4.4",
2524
"configurator>=3.2.0",
26-
"depgather>=0.4.0",
25+
"depgather>=0.5.0",
2726
"license-expression>=30.4.4",
2827
"loguru>=0.7.3",
2928
"markdown>=3.10.2",
29+
"platformdirs>=4.10.0",
3030
"pydantic>=2.13.4",
3131
"requests>=2.32.5",
3232
"requests-cache>=1.3.2",

tests/io/test_cli_main.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def config_invalid_fmt() -> LC_Config:
5353

5454
def test_main_success(
5555
config: LC_Config,
56-
monkeypatch,
56+
monkeypatch: pytest.MonkeyPatch,
5757
) -> None:
5858
monkeypatch.setattr(
5959
"licensecheck.io.cli.checker.check",
@@ -75,7 +75,7 @@ def test_main_success(
7575

7676
def test_main_invalid_format(
7777
config_invalid_fmt: LC_Config,
78-
monkeypatch,
78+
monkeypatch: pytest.MonkeyPatch,
7979
) -> None:
8080

8181
monkeypatch.setattr(
@@ -102,7 +102,7 @@ def test_main_invalid_format(
102102
)
103103
def test_main_exit_code_zero_mode(
104104
config: LC_Config,
105-
monkeypatch,
105+
monkeypatch: pytest.MonkeyPatch,
106106
*,
107107
zero: bool,
108108
incompatible: bool,
@@ -130,7 +130,7 @@ def test_main_exit_code_zero_mode(
130130

131131
def test_main_invalid_hidden_parameter(
132132
config: LC_Config,
133-
monkeypatch,
133+
monkeypatch: pytest.MonkeyPatch,
134134
) -> None:
135135
config.hide_output_parameters = {"NOT_A_FIELD"}
136136

@@ -156,7 +156,7 @@ def test_main_invalid_hidden_parameter(
156156
)
157157
def test_main_valid_hidden_parameters(
158158
config: LC_Config,
159-
monkeypatch,
159+
monkeypatch: pytest.MonkeyPatch,
160160
hidden: list[str],
161161
) -> None:
162162
config.hide_output_parameters = hidden
@@ -181,7 +181,7 @@ def test_main_valid_hidden_parameters(
181181

182182
def test_main_passes_args_to_checker(
183183
config: LC_Config,
184-
monkeypatch,
184+
monkeypatch: pytest.MonkeyPatch,
185185
) -> None:
186186
called = {}
187187

@@ -213,7 +213,7 @@ def fake_check(**kwargs: dict[str, Any]) -> tuple[Literal[False], list[Any]]:
213213

214214
def test_main_closes_output_file(
215215
config: LC_Config,
216-
monkeypatch,
216+
monkeypatch: pytest.MonkeyPatch,
217217
tmp_path: Path,
218218
) -> None:
219219
output = tmp_path / "out.txt"

0 commit comments

Comments
 (0)