Merge pull request #70 from raimon49/release-2.2.1

Release 2.2.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### 2.2.1
+
+* Fixed the file that is selected when multiple matches are made with `LICENSE*` with run `--with-license-file`
+
 ### 2.2.0
 
 * Implement new option `--with-notice-file`

dev-requirements.txt

@@ -5,38 +5,39 @@
 #    pip-compile dev-requirements.in
 #
 attrs==19.3.0             # via pytest
-autopep8==1.5.2           # via -r dev-requirements.in
+autopep8==1.5.3           # via -r dev-requirements.in
 bleach==3.1.5             # via readme-renderer
-certifi==2020.4.5.1       # via requests
+certifi==2020.6.20        # via requests
 chardet==3.0.4            # via requests
 click==7.1.2              # via pip-tools
-codecov==2.0.22           # via -r dev-requirements.in
+codecov==2.1.7            # via -r dev-requirements.in
 coverage==5.1             # via codecov, pytest-cov
 docutils==0.16            # via -r dev-requirements.in, readme-renderer
 idna==2.9                 # via requests
-more-itertools==8.2.0     # via pytest
-packaging==20.3           # via bleach, pytest
-pip-tools==5.1.0          # via -r dev-requirements.in
+more-itertools==8.4.0     # via pytest
+packaging==20.4           # via bleach, pytest
+pip-tools==5.2.1          # via -r dev-requirements.in
 pkginfo==1.5.0.1          # via twine
 pluggy==0.13.1            # via pytest
 ptable==0.9.2             # via -r requirements.in
-py==1.8.1                 # via pytest
-pycodestyle==2.5.0        # via autopep8, pytest-pycodestyle
+py==1.8.2                 # via pytest
+pycodestyle==2.6.0        # via autopep8, pytest-pycodestyle
 pygments==2.6.1           # via readme-renderer
 pypandoc==1.5             # via -r dev-requirements.in
 pyparsing==2.4.7          # via packaging
-pytest-cov==2.8.1         # via -r dev-requirements.in
+pytest-cov==2.10.0        # via -r dev-requirements.in
 pytest-pycodestyle==2.0.0  # via -r dev-requirements.in
 pytest-runner==5.2        # via -r dev-requirements.in
-pytest==5.4.1             # via pytest-cov, pytest-pycodestyle
+pytest==5.4.3             # via pytest-cov, pytest-pycodestyle
 readme-renderer==26.0     # via twine
 requests-toolbelt==0.9.1  # via twine
-requests==2.23.0          # via codecov, requests-toolbelt, twine
-six==1.14.0               # via bleach, packaging, pip-tools, readme-renderer
-tqdm==4.45.0              # via twine
+requests==2.24.0          # via codecov, requests-toolbelt, twine
+six==1.15.0               # via bleach, packaging, pip-tools, readme-renderer
+toml==0.10.1              # via autopep8
+tqdm==4.46.1              # via twine
 twine==1.15.0             # via -r dev-requirements.in
 urllib3==1.25.9           # via requests
-wcwidth==0.1.9            # via pytest
+wcwidth==0.2.5            # via pytest
 webencodings==0.5.1       # via bleach
 wheel==0.34.2             # via -r dev-requirements.in, pypandoc
 

piplicenses.py

@@ -60,7 +60,7 @@
 open = open  # allow monkey patching
 
 __pkgname__ = 'pip-licenses'
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 __author__ = 'raimon'
 __license__ = 'MIT License'
 __summary__ = ('Dump the software license list of '
@@ -138,9 +138,10 @@ def get_pkg_included_file(pkg, file_names):
         pkg_dirname = "{}-{}.dist-info".format(
             pkg.project_name.replace("-", "_"), pkg.version)
         patterns = []
-        [patterns.extend(glob.glob(os.path.join(pkg.location,
-                                                pkg_dirname,
-                                                f))) for f in file_names]
+        [patterns.extend(sorted(glob.glob(os.path.join(pkg.location,
+                                                       pkg_dirname,
+                                                       f))))
+         for f in file_names]
         for test_file in patterns:
             if os.path.exists(test_file):
                 included_file = test_file