From d70528a29764afd57da0c0cde17ad8aa8b3c395f Mon Sep 17 00:00:00 2001 From: raimon Date: Sat, 3 Jul 2021 16:18:48 +0900 Subject: [PATCH 1/3] Update dependencies via pip-tools 6.2.0 --- dev-requirements.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 7720359..03983d2 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile dev-requirements.in @@ -34,13 +34,13 @@ docutils==0.17.1 # readme-renderer idna==2.10 # via requests -importlib-metadata==4.5.0 +importlib-metadata==4.6.0 # via # keyring # twine iniconfig==1.1.1 # via pytest -isort==5.8.0 +isort==5.9.1 # via -r dev-requirements.in jeepney==0.6.0 # via @@ -54,7 +54,7 @@ packaging==20.9 # pytest pep517==0.10.0 # via pip-tools -pip-tools==6.1.0 +pip-tools==6.2.0 # via -r dev-requirements.in pkginfo==1.7.0 # via twine @@ -72,29 +72,29 @@ pycparser==2.20 # via cffi pygments==2.9.0 # via readme-renderer -pypandoc==1.5 +pypandoc==1.6.3 # via -r dev-requirements.in pyparsing==2.4.7 # via packaging +pytest==6.2.4 + # via + # pytest-cov + # pytest-pycodestyle pytest-cov==2.12.1 # via -r dev-requirements.in pytest-pycodestyle==2.2.0 # via -r dev-requirements.in pytest-runner==5.3.1 # via -r dev-requirements.in -pytest==6.2.4 - # via - # pytest-cov - # pytest-pycodestyle readme-renderer==29.0 # via twine -requests-toolbelt==0.9.1 - # via twine requests==2.25.1 # via # codecov # requests-toolbelt # twine +requests-toolbelt==0.9.1 + # via twine rfc3986==1.5.0 # via twine secretstorage==3.3.1 @@ -109,19 +109,20 @@ toml==0.10.2 # pep517 # pytest # pytest-cov -tqdm==4.61.0 +tqdm==4.61.1 # via twine twine==3.4.1 # via -r dev-requirements.in -urllib3==1.26.5 +urllib3==1.26.6 # via requests webencodings==0.5.1 # via bleach wheel==0.36.2 # via # -r dev-requirements.in + # pip-tools # pypandoc -zipp==3.4.1 +zipp==3.5.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: From bbfe3283ed80a346414de268fcf92af94cfe05ab Mon Sep 17 00:00:00 2001 From: raimon Date: Sat, 3 Jul 2021 16:19:48 +0900 Subject: [PATCH 2/3] Add diffs detected by my IntelliJ IDEA to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3a93b7e..2fffe0d 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ docker/* # IDE .idea +*.iml From 026b4230b18a1b3f2588944530f56efa3d8f5b11 Mon Sep 17 00:00:00 2001 From: raimon Date: Sat, 3 Jul 2021 16:24:46 +0900 Subject: [PATCH 3/3] Bump version to 3.5.0 --- CHANGELOG.md | 7 +++++++ piplicenses.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d6900b..13dfe85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## CHANGELOG +### 3.5.0 + +* Handle multiple licenses better with options `--fail-on` and `--allow-only` +* Small change in output method for multiple licenses, change the separator from comma to semicolon + * Up to 3.4.0: `Python Software Foundation License, MIT License` + * 3.5.0 or later: `Python Software Foundation License; MIT License` + ### 3.4.0 * Implement new option `--packages` diff --git a/piplicenses.py b/piplicenses.py index 1d8708e..d8fc84d 100644 --- a/piplicenses.py +++ b/piplicenses.py @@ -61,7 +61,7 @@ open = open # allow monkey patching __pkgname__ = 'pip-licenses' -__version__ = '3.4.0' +__version__ = '3.5.0' __author__ = 'raimon' __license__ = 'MIT' __summary__ = ('Dump the software license list of '