Merge pull request #86 from ticdenis/master

order package licenses alphabethically to make the report more idempotent

Author: Olivier Chédru

.github/workflows/build.yml

@@ -11,9 +11,9 @@ jobs:
  matrix:
  python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v3
  with:
  python-version: ${{ matrix.python-version }}
  - name: install dependencies

.github/workflows/release.yml

@@ -12,9 +12,9 @@ jobs:
  matrix:
  python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v3
  with:
  python-version: ${{ matrix.python-version }}
  - name: install dependencies
@@ -31,7 +31,7 @@ jobs:
  deploy:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: build sdist bdist_wheel
  run: |
  VERSION=${{ github.event.inputs.release_version }}

README.rst

@@ -153,7 +153,7 @@ Also supports pyproject.toml like:
  "uuid",
  "sqlbuilder",
  "proboscis",
- "pyyaml>=3.12",
+  "pyyaml>=3.12",
  ]
 
  [project.optional-dependencies]
@@ -164,21 +164,21 @@ Also supports pyproject.toml like:
  [tool.liccheck]
  authorized_licenses = [
  "bsd",
-"new bsd",
-"bsd license",
-"new bsd license",
-"simplified bsd",
-"apache",
-"apache 2.0",
-"apache software license",
-"gnu lgpl",
-"lgpl with exceptions or zpl",
-"isc license",
-"isc license (iscl)",
-"mit",
-"mit license",
-"python software foundation license",
-"zpl 2.1",
+ "new bsd",
+ "bsd license",
+ "new bsd license",
+ "simplified bsd",
+ "apache",
+ "apache 2.0",
+ "apache software license",
+ "gnu lgpl",
+ "lgpl with exceptions or zpl",
+ "isc license",
+ "isc license (iscl)",
+ "mit",
+ "mit license",
+ "python software foundation license",
+ "zpl 2.1",
  ]
  unauthorized_licenses = [
  "gpl v3",

liccheck/command_line.py

@@ -219,7 +219,7 @@ def find_parents(package, all, seen):
 
 
 def write_package(package, all, no_deps=False):
- licenses = package['licenses'] or 'UNKNOWN'
+ licenses = sorted(package['licenses']) or 'UNKNOWN'
  print(' {} ({}): {}'.format(package['name'], package['version'], licenses))
  if not no_deps:
  write_deps(package, all)