Skip to content

Commit 30a5b7c

Browse files
author
Denis Navarro
committed
order package licenses alphabethically to make the report more idempotent
1 parent 517eb73 commit 30a5b7c

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
12+
python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10 ]
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v3
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
- name: install dependencies

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
13+
python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10 ]
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v3
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020
- name: install dependencies
@@ -31,7 +31,7 @@ jobs:
3131
deploy:
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v3
3535
- name: build sdist bdist_wheel
3636
run: |
3737
VERSION=${{ github.event.inputs.release_version }}

README.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Also supports pyproject.toml like:
153153
"uuid",
154154
"sqlbuilder",
155155
"proboscis",
156-
"pyyaml>=3.12",
156+
"pyyaml>=3.12",
157157
]
158158

159159
[project.optional-dependencies]
@@ -164,21 +164,21 @@ Also supports pyproject.toml like:
164164
[tool.liccheck]
165165
authorized_licenses = [
166166
"bsd",
167-
"new bsd",
168-
"bsd license",
169-
"new bsd license",
170-
"simplified bsd",
171-
"apache",
172-
"apache 2.0",
173-
"apache software license",
174-
"gnu lgpl",
175-
"lgpl with exceptions or zpl",
176-
"isc license",
177-
"isc license (iscl)",
178-
"mit",
179-
"mit license",
180-
"python software foundation license",
181-
"zpl 2.1",
167+
"new bsd",
168+
"bsd license",
169+
"new bsd license",
170+
"simplified bsd",
171+
"apache",
172+
"apache 2.0",
173+
"apache software license",
174+
"gnu lgpl",
175+
"lgpl with exceptions or zpl",
176+
"isc license",
177+
"isc license (iscl)",
178+
"mit",
179+
"mit license",
180+
"python software foundation license",
181+
"zpl 2.1",
182182
]
183183
unauthorized_licenses = [
184184
"gpl v3",

liccheck/command_line.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def find_parents(package, all, seen):
219219

220220

221221
def write_package(package, all, no_deps=False):
222-
licenses = package['licenses'] or 'UNKNOWN'
222+
licenses = sorted(package['licenses']) or 'UNKNOWN'
223223
print(' {} ({}): {}'.format(package['name'], package['version'], licenses))
224224
if not no_deps:
225225
write_deps(package, all)

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py35, py36, py37, py38, py39
2+
envlist = py27, py35, py36, py37, py38, py39, py310
33
skip_missing_interpreters = True
44

55
[gh-actions]
@@ -10,6 +10,7 @@ python =
1010
3.7: py37
1111
3.8: py38
1212
3.9: py39
13+
3.10: py310
1314

1415
[testenv]
1516
deps =

0 commit comments

Comments
 (0)