Commit 141ede4
committed
Release Candidate for development build (v-6.0.0a0)
Merge branch 'patch-multi-license-242' into dev-v6.0 for further development
* patch-multi-license-242:
[PATCH] Apply changes discussed in review of PR #346
[TESTING] Possible fix for regression due to fine-grain controls
[TESTING] slight improved coverage
[TESTING] Imporved test coverage slightly.
[UPDATE] Supperceeds PR #341
[UPDATE] superceeds PR #325
[UPDATE] Supperceeds PR #343
[TESTING] Minor tweaks to improve code coverage slightly (- WIP #309 -)
[TESTING] Updated various tests for GHI #242 and #71 (WIP)
[PATCH] Minor improvement to Makefile
* alternate-history-ghi-71-with-clear-credit
[DOCUMENATION] Show `git rerere` how to resolve conflicts.
[DOCUMENATION] Show `git rerere` how to resolve conflicts.
[DOCUMENATION] Show `git rerere` how to resolve conflicts.
[DOCUMENTATION] Extra commit to show `git rerere` how to resolve conflicts and renamed new test code to test_piplicenses.py (where it will influence re-re-re when false-merging with unrelated history of c0bf7b7) and Re-license derivitive as [MITNFA](https://spdx.org/licenses/MITNFA.html)
[FILTER] Best effort staging commit to credit all those involved including stefan6419846 for this fix to GHI stefan6419846/pip-licenses-cli#8 and related GHI #70 (both GHI found by johnthagen)
[FILTER] Pin relevant files with fixes from 0b1c2ae ( From stefan6419846/pip-licenses-cli#132 ) for ensuring proper credit is given to Stefan for their code Copyright 2025 Stefan (under MIT License)6 files changed
Lines changed: 1037 additions & 87 deletions
File tree
- .github/workflows
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
| 14 | + | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
| 138 | + | |
| 139 | + | |
138 | 140 | | |
139 | 141 | | |
140 | 142 | | |
| |||
0 commit comments