Skip to content

Commit

Permalink
Merge pull request #127 from raimon49/release-3.5.5
Browse files Browse the repository at this point in the history
Release 3.5.5
  • Loading branch information
raimon49 authored Oct 20, 2022
2 parents 1ea5ded + 8609c66 commit 12d5d5f
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9', '3.10']
pip-version: ['', '==21.2.4']

steps:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## CHANGELOG

### 3.5.5

* Search for path defined in [PEP 639](https://peps.python.org/pep-0639/)
* Dropped support Python 3.6

### 3.5.4

* Skip directories when detecting license files
Expand Down
120 changes: 65 additions & 55 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,126 +4,136 @@
#
# pip-compile dev-requirements.in
#
attrs==21.2.0
attrs==22.1.0
# via pytest
autopep8==1.5.7
autopep8==1.7.0
# via -r dev-requirements.in
bleach==4.1.0
bleach==5.0.1
# via readme-renderer
certifi==2021.5.30
build==0.8.0
# via pip-tools
certifi==2022.9.24
# via requests
cffi==1.14.6
cffi==1.15.1
# via cryptography
charset-normalizer==2.0.4
charset-normalizer==2.1.1
# via requests
click==8.0.1
click==8.1.3
# via pip-tools
codecov==2.1.12
# via -r dev-requirements.in
colorama==0.4.4
# via twine
coverage==5.5
commonmark==0.9.1
# via rich
coverage[toml]==6.5.0
# via
# codecov
# pytest-cov
cryptography==3.4.8
cryptography==38.0.1
# via secretstorage
docutils==0.17.1
docutils==0.19
# via
# -r dev-requirements.in
# readme-renderer
idna==3.2
idna==3.4
# via requests
importlib-metadata==4.7.1
importlib-metadata==5.0.0
# via
# keyring
# twine
iniconfig==1.1.1
# via pytest
isort==5.9.3
isort==5.10.1
# via -r dev-requirements.in
jeepney==0.7.1
jaraco.classes==3.2.3
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==23.1.0
keyring==23.9.3
# via twine
packaging==21.0
more-itertools==9.0.0
# via jaraco.classes
packaging==21.3
# via
# bleach
# build
# pytest
pep517==0.11.0
# via pip-tools
pip-tools==6.2.0
pep517==0.13.0
# via build
pip-tools==6.9.0
# via -r dev-requirements.in
pkginfo==1.7.1
pkginfo==1.8.3
# via twine
pluggy==0.13.1
pluggy==1.0.0
# via pytest
ptable==0.9.2
# via -r requirements.in
py==1.10.0
py==1.11.0
# via pytest
pycodestyle==2.7.0
pycodestyle==2.9.1
# via
# autopep8
# pytest-pycodestyle
pycparser==2.20
pycparser==2.21
# via cffi
pygments==2.10.0
# via readme-renderer
pypandoc==1.6.3
pygments==2.13.0
# via
# readme-renderer
# rich
pypandoc==1.9
# via -r dev-requirements.in
pyparsing==2.4.7
pyparsing==3.0.9
# via packaging
pytest==6.2.4
pytest==7.1.3
# via
# pytest-cov
# pytest-pycodestyle
pytest-cov==2.12.1
pytest-cov==4.0.0
# via -r dev-requirements.in
pytest-pycodestyle==2.2.0
pytest-pycodestyle==2.3.0
# via -r dev-requirements.in
pytest-runner==5.3.1
pytest-runner==6.0.0
# via -r dev-requirements.in
readme-renderer==29.0
readme-renderer==37.2
# via twine
requests==2.26.0
requests==2.28.1
# via
# codecov
# requests-toolbelt
# twine
requests-toolbelt==0.9.1
requests-toolbelt==0.10.0
# via twine
rfc3986==1.5.0
rfc3986==2.0.0
# via twine
secretstorage==3.3.1
rich==12.6.0
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# bleach
# readme-renderer
# via bleach
toml==0.10.2
# via autopep8
tomli==2.0.1
# via
# autopep8
# build
# coverage
# pep517
# pytest
# pytest-cov
tomli==1.2.1
# via pep517
tqdm==4.62.2
# via twine
twine==3.4.2
twine==4.0.1
# via -r dev-requirements.in
urllib3==1.26.6
# via requests
typing-extensions==4.4.0
# via rich
urllib3==1.26.12
# via
# requests
# twine
webencodings==0.5.1
# via bleach
wheel==0.37.0
wheel==0.37.1
# via
# -r dev-requirements.in
# pip-tools
# pypandoc
zipp==3.5.0
zipp==3.9.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
8 changes: 7 additions & 1 deletion piplicenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def get_installed_distributions():
open = open # allow monkey patching

__pkgname__ = 'pip-licenses'
__version__ = '3.5.4'
__version__ = '3.5.5'
__author__ = 'raimon'
__license__ = 'MIT'
__summary__ = ('Dump the software license list of '
Expand Down Expand Up @@ -165,6 +165,12 @@ def get_pkg_included_file(pkg, file_names):
pkg_dirname,
f))))
for f in file_names]
# Search for path defined in PEP 639 https://peps.python.org/pep-0639/
[patterns.extend(sorted(glob.glob(os.path.join(pkg.location,
pkg_dirname,
"licenses",
f))))
for f in file_names]
for test_file in patterns:
if os.path.exists(test_file) and \
os.path.isdir(test_file) is not True:
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ classifiers =
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Topic :: System :: Systems Administration
Topic :: System :: System Shells

[options]
packages = find:
include_package_data = True
python_requires = ~=3.6
python_requires = ~=3.7
py_modules =
piplicenses
setup_requires =
Expand Down

0 comments on commit 12d5d5f

Please sign in to comment.