Skip to content

Commit 141ede4

Browse files
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)
2 parents d4d0076 + 9dfc692 commit 141ede4

6 files changed

Lines changed: 1037 additions & 87 deletions

File tree

.github/workflows/CD-PyPi.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
permissions: {}
1212

1313
env:
14-
# Define Python versions at the top level -- Expected format: X.Y (e.g., 3.13)
15-
PYTHON_DEFAULT: "${{ vars.PYTHON_DEFAULT || '3.13' }}"
14+
# Define Python versions at the top level -- Expected format: X.Y (e.g., 3.14)
15+
PYTHON_DEFAULT: "${{ vars.PYTHON_DEFAULT || '3.14' }}"
1616

1717
jobs:
1818
pypi-publish:
@@ -40,13 +40,13 @@ jobs:
4040
build_status: ${{ steps.build.outcome }}
4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4444
with:
4545
persist-credentials: false
4646
- id: build-python
4747
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4848
with:
49-
python-version: "${{ env.PYTHON_DEFAULT || 3.13 }}"
49+
python-version: "${{ env.PYTHON_DEFAULT || 3.14 }}"
5050
- id: output_python
5151
name: "bootstrap Python"
5252
shell: bash
@@ -60,7 +60,7 @@ jobs:
6060
- name: Setup build tools
6161
id: build_deps
6262
shell: bash
63-
run: pip install --no-input --user "pip>=26.0" "setuptools>=82.0" "wheel>=0.45" "build>=1.2.1"
63+
run: pip install --no-input --user "pip>=26.0.1" "setuptools>=83.0" "wheel>=0.47" "build>=1.2.1"
6464
- name: Pre-Clean
6565
id: clean
6666
shell: bash
@@ -77,9 +77,9 @@ jobs:
7777
run: |
7878
shasum -a 512 dist/* > build.checksums.txt
7979
- name: "Attest Build with Checksums"
80-
id: multicast-build-chksum-attest
80+
id: piplicenses-build-chksum-attest
8181
if: ${{ !cancelled() && (github.repository == 'raimon49/pip-licenses') && startsWith(github.ref, 'refs/tags/') }}
82-
uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
82+
uses: actions/attest@a1948c3f048ba23858d222213b7c278aabede763 # v4.1.1
8383
with:
8484
subject-checksums: build.checksums.txt
8585
github-token: ${{ github.token }}

.github/workflows/python-package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818
with:
1919
persist-credentials: false
2020
- name: Set up Python
@@ -41,7 +41,7 @@ jobs:
4141
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
44+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4545
with:
4646
persist-credentials: false
4747
- name: Set up Python ${{ matrix.python-version }}
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
pytest -v --cov --cov-report=xml
5858
- name: Update coverage artifact
59-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
59+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6060
with:
6161
name: coverage-${{ matrix.python-version }}
6262
path: coverage.xml
@@ -70,7 +70,7 @@ jobs:
7070
if: ${{ github.actor != 'dependabot[bot]' && github.event.sender.login != 'dependabot[bot]' }}
7171
steps:
7272
- name: Checkout repository
73-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7474
with:
7575
persist-credentials: false
7676
- name: Download all coverage artifacts

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ endif
135135
# file path to extra developer requirements generated by pip-compile
136136
DEV_DEPENDS:='dev-requirements'
137137

138+
.SUFFIXES: .py .pyc .pyi
139+
138140
.DEFAULT_GOAL:= help
139141
.PHONY: help, setup, local-install, local-uninstall, update-depends, lint, test, deploy, test-deploy, build, clean, full-clean, un-setup
140142

0 commit comments

Comments
 (0)