Skip to content

Commit a6fc63a

Browse files
committed
Merge branch 'develop' into 541_validate_uniqueness_before_transform
2 parents 549b5b3 + 1c8b2fd commit a6fc63a

39 files changed

Lines changed: 3211 additions & 3015 deletions

.github/workflows/docs-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: [3.12]
12+
python-version: [3.13]
1313

1414
steps:
1515
- name: Checkout code

.github/workflows/pypi-release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
python-version: 3.12
3333

3434
- name: Install pypa/build and twine
35-
run: python -m pip install --user build twine
35+
run: python -m pip install --user --upgrade build twine pkginfo
3636

3737
- name: Build a binary wheel and a source tarball
38-
run: python -m build --sdist --wheel --outdir dist/
38+
run: python -m build --wheel --sdist --outdir dist/
3939

4040
- name: Validate wheel and sdis for Pypi
4141
run: python -m twine check dist/*
@@ -72,6 +72,9 @@ jobs:
7272
needs:
7373
- create-gh-release
7474
runs-on: ubuntu-24.04
75+
environment: pypi-publish
76+
permissions:
77+
id-token: write
7578

7679
steps:
7780
- name: Download built archives
@@ -82,6 +85,4 @@ jobs:
8285

8386
- name: Publish to PyPI
8487
if: startsWith(github.ref, 'refs/tags')
85-
uses: pypa/gh-action-pypi-publish@release/v1
86-
with:
87-
password: ${{ secrets.PYPI_API_TOKEN }}
88+
uses: pypa/gh-action-pypi-publish@release/v1

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-22.04
1111
tools:
12-
python: "3.11"
12+
python: "3.13"
1313

1414
# Build PDF & ePub
1515
formats:

README.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ identify redistributable source code used in your project to help you comply
2222
with open source licenses conditions.
2323

2424
This version of the AboutCode Toolkit follows the ABOUT specification version 3.3.2 at:
25-
https://aboutcode-toolkit.readthedocs.io/en/latest/specification.html
25+
https://aboutcode.readthedocs.io/projects/aboutcode-toolkit/en/latest/specification.html
2626

2727

2828
Build and tests status
@@ -97,9 +97,12 @@ i.e. MAJOR.MINOR.PATCH format
9797

9898
REFERENCE
9999
---------
100-
See https://aboutcode-toolkit.readthedocs.io/en/latest/ for documentation.
100+
See https://aboutcode.readthedocs.io/projects/aboutcode-toolkit/en/latest/
101+
for documentation.
101102

102-
See https://aboutcode-toolkit.readthedocs.io/en/latest/reference.html for reference.
103+
See
104+
https://aboutcode.readthedocs.io/projects/aboutcode-toolkit/en/latest/reference.html
105+
for reference.
103106

104107
TESTS and DEVELOPMENT
105108
---------------------

azure-pipelines.yml

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,58 @@ jobs:
1313
test_suites:
1414
all: venv/bin/pytest -n 2 -vvs
1515

16-
- template: etc/ci/azure-posix.yml
17-
parameters:
18-
job_name: macos13_cpython
19-
image_name: macOS-13
20-
python_versions: ["3.9", "3.10", "3.11"]
21-
test_suites:
22-
all: venv/bin/pytest -n 2 -vvs
16+
- template: etc/ci/azure-posix.yml
17+
parameters:
18+
job_name: run_code_checks
19+
image_name: ubuntu-24.04
20+
python_versions: ['3.13']
21+
test_suites:
22+
all: make check
2323

24-
- template: etc/ci/azure-win.yml
25-
parameters:
26-
job_name: win2019_cpython
27-
image_name: windows-2019
28-
python_versions: ["3.9", "3.10", "3.11"]
29-
test_suites:
30-
all: venv\Scripts\pytest -n 2 -vvs
24+
- template: etc/ci/azure-posix.yml
25+
parameters:
26+
job_name: ubuntu22_cpython
27+
image_name: ubuntu-22.04
28+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
29+
test_suites:
30+
all: venv/bin/pytest -n 2 -vvs
3131

32-
- template: etc/ci/azure-win.yml
33-
parameters:
34-
job_name: win2022_cpython
35-
image_name: windows-2022
36-
python_versions: ["3.9", "3.10", "3.11"]
37-
test_suites:
38-
all: venv\Scripts\pytest -n 2 -vvs
32+
- template: etc/ci/azure-posix.yml
33+
parameters:
34+
job_name: ubuntu24_cpython
35+
image_name: ubuntu-24.04
36+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
37+
test_suites:
38+
all: venv/bin/pytest -n 2 -vvs
39+
40+
- template: etc/ci/azure-posix.yml
41+
parameters:
42+
job_name: macos14_cpython
43+
image_name: macOS-14
44+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
45+
test_suites:
46+
all: venv/bin/pytest -n 2 -vvs
47+
48+
- template: etc/ci/azure-posix.yml
49+
parameters:
50+
job_name: macos15_cpython
51+
image_name: macOS-15
52+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
53+
test_suites:
54+
all: venv/bin/pytest -n 2 -vvs
55+
56+
- template: etc/ci/azure-win.yml
57+
parameters:
58+
job_name: win2022_cpython
59+
image_name: windows-2022
60+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
61+
test_suites:
62+
all: venv\Scripts\pytest -n 2 -vvs
63+
64+
- template: etc/ci/azure-win.yml
65+
parameters:
66+
job_name: win2025_cpython
67+
image_name: windows-2025
68+
python_versions: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
69+
test_suites:
70+
all: venv\Scripts\pytest -n 2 -vvs

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ create_virtualenv() {
110110
fi
111111

112112
$PYTHON_EXECUTABLE "$VIRTUALENV_PYZ" \
113-
--wheel embed --pip embed --setuptools embed \
113+
--pip embed --setuptools embed \
114114
--seeder pip \
115115
--never-download \
116116
--no-periodic-update \

configure.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if not exist "%CFG_BIN_DIR%\python.exe" (
110110

111111
if exist "%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz" (
112112
%PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz" ^
113-
--wheel embed --pip embed --setuptools embed ^
113+
--pip embed --setuptools embed ^
114114
--seeder pip ^
115115
--never-download ^
116116
--no-periodic-update ^
@@ -126,7 +126,7 @@ if not exist "%CFG_BIN_DIR%\python.exe" (
126126
)
127127
)
128128
%PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz" ^
129-
--wheel embed --pip embed --setuptools embed ^
129+
--pip embed --setuptools embed ^
130130
--seeder pip ^
131131
--never-download ^
132132
--no-periodic-update ^

0 commit comments

Comments
 (0)