Skip to content

Commit 55f10fb

Browse files
authored
feat: loosed dependency versions to make this library more consumable
* feat: lowering minimum dependency versions Signed-off-by: Paul Horton <[email protected]> * feat: lowering minimum dependency versions Signed-off-by: Paul Horton <[email protected]> * feat: lowering minimum dependency versions - importlib-metadata raising minimum to ensure we get a typed library Signed-off-by: Paul Horton <[email protected]> * feat: lowering minimum dependency versions - importlib-metadata raising minimum to ensure we get a typed library Signed-off-by: Paul Horton <[email protected]> * feat: lowering minimum version for importlib-metadata to 3.4.0 with modified import statement Signed-off-by: Paul Horton <[email protected]>
1 parent 07ebedc commit 55f10fb

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

cyclonedx/parser/environment.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
from importlib.metadata import metadata
3636
from email.message import Message as _MetadataReturn
3737
else:
38-
from importlib_metadata import metadata
39-
from importlib_metadata._meta import PackageMetadata as _MetadataReturn
38+
from importlib_metadata import metadata, PackageMetadata as _MetadataReturn
4039

4140
from . import BaseParser
4241
from ..model.component import Component

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ keywords = [
4343
[tool.poetry.dependencies]
4444
# keep `requirements.lowest.txt` file in sync
4545
python = "^3.6"
46-
packageurl-python = "^0.9.4"
46+
packageurl-python = ">= 0.3.0, < 0.10"
4747
requirements_parser = "^0.2.0"
48-
setuptools = "^50.3.2"
49-
importlib-metadata = { version = "^4.8.1", python = "~3.6 | ~3.7" }
50-
toml = "^0.10.2"
48+
setuptools = ">=47.0.0, < 59.3"
49+
importlib-metadata = { version = ">= 3.4.0 < 4.9", python = "~3.6 | ~3.7" }
50+
toml = "^0.10.0"
5151
typing-extensions = { version = "^3.10.0", python = "~3.6 | ~3.7" }
52-
types-setuptools = "^57.4.2"
53-
types-toml = "^0.10.1"
52+
types-setuptools = ">= 57.0.0, < 57.5"
53+
types-toml = "^0.10.0"
5454

5555
[tool.poetry.dev-dependencies]
5656
tox = "^3.24.3"

requirements.lowest.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# exactly pinned dependencies to the lowest version regardless of python_version
22
# see pyptoject file for ranges
33

4-
packageurl-python == 0.9.4
4+
packageurl-python == 0.3.0
55
requirements_parser == 0.2.0
6-
setuptools == 50.3.2
7-
importlib-metadata == 4.8.1 # ; python_version < '3.8'
8-
toml == 0.10.2
6+
setuptools == 47.0.0
7+
importlib-metadata == 3.4.0 # ; python_version < '3.8'
8+
toml == 0.10.0
99
typing-extensions == 3.10.0 # ; python_version < '3.8'
10-
types-setuptools == 57.4.2
11-
types-toml == 0.10.1
10+
types-setuptools == 57.0.0
11+
types-toml == 0.10.0

0 commit comments

Comments
 (0)