Skip to content

Commit

Permalink
Merge pull request #103 from raimon49/release-3.5.0
Browse files Browse the repository at this point in the history
Release 3.5.0
  • Loading branch information
raimon49 authored Jul 3, 2021
2 parents e7f7c9f + 026b423 commit c298903
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,4 @@ docker/*

# IDE
.idea
*.iml
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
29 changes: 15 additions & 14 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion piplicenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down

0 comments on commit c298903

Please sign in to comment.