Skip to content

Commit

Permalink
feat: loosed dependency versions to make this library more consumable
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
madpah authored Dec 9, 2021
1 parent 07ebedc commit 55f10fb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions cyclonedx/parser/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
from importlib.metadata import metadata
from email.message import Message as _MetadataReturn
else:
from importlib_metadata import metadata
from importlib_metadata._meta import PackageMetadata as _MetadataReturn
from importlib_metadata import metadata, PackageMetadata as _MetadataReturn

from . import BaseParser
from ..model.component import Component
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ keywords = [
[tool.poetry.dependencies]
# keep `requirements.lowest.txt` file in sync
python = "^3.6"
packageurl-python = "^0.9.4"
packageurl-python = ">= 0.3.0, < 0.10"
requirements_parser = "^0.2.0"
setuptools = "^50.3.2"
importlib-metadata = { version = "^4.8.1", python = "~3.6 | ~3.7" }
toml = "^0.10.2"
setuptools = ">=47.0.0, < 59.3"
importlib-metadata = { version = ">= 3.4.0 < 4.9", python = "~3.6 | ~3.7" }
toml = "^0.10.0"
typing-extensions = { version = "^3.10.0", python = "~3.6 | ~3.7" }
types-setuptools = "^57.4.2"
types-toml = "^0.10.1"
types-setuptools = ">= 57.0.0, < 57.5"
types-toml = "^0.10.0"

[tool.poetry.dev-dependencies]
tox = "^3.24.3"
Expand Down
12 changes: 6 additions & 6 deletions requirements.lowest.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# exactly pinned dependencies to the lowest version regardless of python_version
# see pyptoject file for ranges

packageurl-python == 0.9.4
packageurl-python == 0.3.0
requirements_parser == 0.2.0
setuptools == 50.3.2
importlib-metadata == 4.8.1 # ; python_version < '3.8'
toml == 0.10.2
setuptools == 47.0.0
importlib-metadata == 3.4.0 # ; python_version < '3.8'
toml == 0.10.0
typing-extensions == 3.10.0 # ; python_version < '3.8'
types-setuptools == 57.4.2
types-toml == 0.10.1
types-setuptools == 57.0.0
types-toml == 0.10.0

0 comments on commit 55f10fb

Please sign in to comment.