Skip to content

Commit e638d18

Browse files
JonoYangchinyeungliAyanSinhaMahapatrapombredanne
authored
Update python 3.13 (#629)
* Create script to update repo skeleton #80 Signed-off-by: Jono Yang <[email protected]> * Update link references of ownership from nexB to aboutcode-org Signed-off-by: Chin Yeung Li <[email protected]> * Drop deprecated macos-12 runner * Update CI/Actions runners Signed-off-by: Ayan Sinha Mahapatra <[email protected]> * Replace black and isort with ruff * Use ruff config and Make commands from scancode.io Signed-off-by: Jono Yang <[email protected]> * Use org standard 100 line length Signed-off-by: Philippe Ombredanne <[email protected]> * Lint all common code directories Signed-off-by: Philippe Ombredanne <[email protected]> * Remove unused targets Signed-off-by: Philippe Ombredanne <[email protected]> * Improve import sorting Signed-off-by: Philippe Ombredanne <[email protected]> * Apply small code updates Signed-off-by: Philippe Ombredanne <[email protected]> * Format code Signed-off-by: Philippe Ombredanne <[email protected]> * Apply cosmetic refactorings Signed-off-by: Philippe Ombredanne <[email protected]> * Reformat test code Signed-off-by: Philippe Ombredanne <[email protected]> * Format code Signed-off-by: Philippe Ombredanne <[email protected]> * Refine ruff configuration Signed-off-by: Philippe Ombredanne <[email protected]> * Format doc Signed-off-by: Philippe Ombredanne <[email protected]> * Run doc8 on all rst files Signed-off-by: Philippe Ombredanne <[email protected]> * Enable doc style checks Signed-off-by: Philippe Ombredanne <[email protected]> * Add support for new OS versions Signed-off-by: Philippe Ombredanne <[email protected]> * Update scripts aboutcode references Signed-off-by: Philippe Ombredanne <[email protected]> * Do not format more test data Signed-off-by: Philippe Ombredanne <[email protected]> * Do not treat rst as Python Signed-off-by: Philippe Ombredanne <[email protected]> * Combine testing and docs extra for simplicity Signed-off-by: Philippe Ombredanne <[email protected]> * Refine checking of docs with doc8 Signed-off-by: Philippe Ombredanne <[email protected]> * Refine doc handling * remove CI scripts and use Makefile targets instead * ensure doc8 runs quiet * add new docs-check make target to run documentation and links checks * update oudated doc for docs contribution Signed-off-by: Philippe Ombredanne <[email protected]> * Add twine check to release publication Signed-off-by: Philippe Ombredanne <[email protected]> * Refine doc contribution docs Signed-off-by: Philippe Ombredanne <[email protected]> * Replace black and isort with ruff * Use ruff config and Make commands from scancode.io Signed-off-by: Jono Yang <[email protected]> * Use org standard 100 line length Signed-off-by: Philippe Ombredanne <[email protected]> * Lint all common code directories Signed-off-by: Philippe Ombredanne <[email protected]> * Remove unused targets Signed-off-by: Philippe Ombredanne <[email protected]> * Improve import sorting Signed-off-by: Philippe Ombredanne <[email protected]> * Apply small code updates Signed-off-by: Philippe Ombredanne <[email protected]> * Format code Signed-off-by: Philippe Ombredanne <[email protected]> * Apply cosmetic refactorings Signed-off-by: Philippe Ombredanne <[email protected]> * Reformat test code Signed-off-by: Philippe Ombredanne <[email protected]> * Format code Signed-off-by: Philippe Ombredanne <[email protected]> * Refine ruff configuration Signed-off-by: Philippe Ombredanne <[email protected]> * Format doc Signed-off-by: Philippe Ombredanne <[email protected]> * Run doc8 on all rst files Signed-off-by: Philippe Ombredanne <[email protected]> * Enable doc style checks Signed-off-by: Philippe Ombredanne <[email protected]> * Do not format more test data Signed-off-by: Philippe Ombredanne <[email protected]> * Do not treat rst as Python Signed-off-by: Philippe Ombredanne <[email protected]> * Combine testing and docs extra for simplicity Signed-off-by: Philippe Ombredanne <[email protected]> * Refine checking of docs with doc8 Signed-off-by: Philippe Ombredanne <[email protected]> * Refine doc handling * remove CI scripts and use Makefile targets instead * ensure doc8 runs quiet * add new docs-check make target to run documentation and links checks * update oudated doc for docs contribution Signed-off-by: Philippe Ombredanne <[email protected]> * Add twine check to release publication Signed-off-by: Philippe Ombredanne <[email protected]> * Refine doc contribution docs Signed-off-by: Philippe Ombredanne <[email protected]> * Update codestyle command * Remove trailing whitespace Signed-off-by: Jono Yang <[email protected]> * Update README.rst Signed-off-by: Jono Yang <[email protected]> * Update BUILDDIR envvar in docs/Makefile Signed-off-by: Jono Yang <[email protected]> * Fix doc line length Signed-off-by: Philippe Ombredanne <[email protected]> * Format code Signed-off-by: Philippe Ombredanne <[email protected]> * Correct supported runner on Azure See for details: https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml macOS ARM images do not seem to be supported there Signed-off-by: Philippe Ombredanne <[email protected]> * Add code checks to CI Remove running "make check" as a test Signed-off-by: Philippe Ombredanne <[email protected]> * Revert support for Python 3.13 This is not yet supported everywhere Signed-off-by: Philippe Ombredanne <[email protected]> * Ignore local .env file Signed-off-by: Philippe Ombredanne <[email protected]> * Add correct extras for documentation Signed-off-by: Philippe Ombredanne <[email protected]> * Improve MANIFEST Signed-off-by: Philippe Ombredanne <[email protected]> * Improve cleaning on POSIX Signed-off-by: Philippe Ombredanne <[email protected]> * Rename dev extra to "dev" Instead of testing ... and update references accordingly Signed-off-by: Philippe Ombredanne <[email protected]> * Add more excludes from tests Signed-off-by: Philippe Ombredanne <[email protected]> * Do not lint django migrations Signed-off-by: Philippe Ombredanne <[email protected]> * Add README.rst to list of "license files" Signed-off-by: Philippe Ombredanne <[email protected]> * Use Python 3.9 as lowest suupported version Signed-off-by: Philippe Ombredanne <[email protected]> * Drop pycodestyle Not used anymore Signed-off-by: Philippe Ombredanne <[email protected]> * Bump pytest minimal version Signed-off-by: Philippe Ombredanne <[email protected]> * Update CI runners and scripts Signed-off-by: Ayan Sinha Mahapatra <[email protected]> * Add missing wheel builds on release CI Signed-off-by: Ayan Sinha Mahapatra <[email protected]> * Update requirements Signed-off-by: Jono Yang <[email protected]> * Remove repeated command Signed-off-by: Jono Yang <[email protected]> * Update requirements files Signed-off-by: Jono Yang <[email protected]> * Remove requirements not needed exactly for purldb Signed-off-by: Jono Yang <[email protected]> --------- Signed-off-by: Jono Yang <[email protected]> Signed-off-by: Chin Yeung Li <[email protected]> Signed-off-by: Ayan Sinha Mahapatra <[email protected]> Signed-off-by: Philippe Ombredanne <[email protected]> Co-authored-by: Chin Yeung Li <[email protected]> Co-authored-by: Ayan Sinha Mahapatra <[email protected]> Co-authored-by: Philippe Ombredanne <[email protected]>
1 parent 6cfd9d9 commit e638d18

File tree

9 files changed

+163
-145
lines changed

9 files changed

+163
-145
lines changed

‎.github/workflows/pypi-release.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ jobs:
3131
python-version: 3.12
3232

3333
- name: Install pypa/build and twine
34-
run: python -m pip install --user build twine
34+
run: python -m pip install --user --upgrade build twine pkginfo
3535

3636
- name: Build a binary wheel and a source tarball
37-
run: python -m build --sdist --wheel --outdir dist/
37+
run: python -m build --wheel --sdist --outdir dist/
38+
39+
- name: Validate wheel and sdis for Pypi
40+
run: python -m twine check dist/*
3841

3942
- name: Validate wheel and sdis for Pypi
4043
run: python -m twine check dist/*

‎azure-pipelines.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,22 @@ jobs:
2020
parameters:
2121
job_name: ci_code_style
2222
image_name: ubuntu-24.04
23-
python_versions: ['3.12']
23+
python_versions: ['3.13']
2424
test_suites:
2525
all: make check
2626

2727
- template: etc/ci/azure-posix.yml
2828
parameters:
29-
job_name: ubuntu20_cpython
30-
image_name: ubuntu-22.04
31-
python_versions: ['3.10', '3.11', '3.12']
32-
test_suites:
33-
all: make test
34-
35-
- template: etc/ci/azure-posix.yml
36-
parameters:
37-
job_name: ubuntu22_cpython
29+
job_name: ubuntu24_cpython
3830
image_name: ubuntu-24.04
39-
python_versions: ['3.10', '3.11', '3.12']
31+
python_versions: ['3.10', '3.11', '3.12', '3.13']
4032
test_suites:
4133
all: make test
4234

4335
- template: etc/ci/azure-posix.yml
4436
parameters:
4537
job_name: ci_documentation
4638
image_name: ubuntu-24.04
47-
python_versions: ['3.12']
39+
python_versions: ['3.13']
4840
test_suites:
4941
all: make docs-check

‎configure‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ VIRTUALENV_DIR=venv
4040
# Cleanable files and directories to delete with the --clean option
4141
CLEANABLE="build dist venv .cache .eggs *.egg-info docs/_build/ pip-selfcheck.json"
4242

43-
4443
# extra arguments passed to pip
4544
PIP_EXTRA_ARGS=" "
4645

@@ -114,7 +113,7 @@ create_virtualenv() {
114113
fi
115114

116115
$PYTHON_EXECUTABLE "$VIRTUALENV_PYZ" \
117-
--wheel embed --pip embed --setuptools embed \
116+
--pip embed --setuptools embed \
118117
--seeder pip \
119118
--never-download \
120119
--no-periodic-update \

‎etc/ci/azure-container-deb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- job: ${{ parameters.job_name }}
2222

2323
pool:
24-
vmImage: 'ubuntu-16.04'
24+
vmImage: 'ubuntu-22.04'
2525

2626
container:
2727
image: ${{ parameters.container }}

‎etc/ci/azure-container-rpm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
job_name: ''
3-
image_name: 'ubuntu-16.04'
3+
image_name: 'ubuntu-22.04'
44
container: ''
55
python_path: ''
66
python_version: ''

‎etc/scripts/utils_thirdparty.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@
114114
TRACE_ULTRA_DEEP = False
115115

116116
# Supported environments
117-
PYTHON_VERSIONS = "37", "38", "39", "310"
117+
PYTHON_VERSIONS = "39", "310", "311", "312", "313"
118118

119119
PYTHON_DOT_VERSIONS_BY_VER = {
120-
"37": "3.7",
121-
"38": "3.8",
122120
"39": "3.9",
123121
"310": "3.10",
122+
"311": "3.11",
123+
"312": "3.12",
124+
"313": "3.13",
124125
}
125126

126127

@@ -132,10 +133,11 @@ def get_python_dot_version(version):
132133

133134

134135
ABIS_BY_PYTHON_VERSION = {
135-
"37": ["cp37", "cp37m", "abi3"],
136-
"38": ["cp38", "cp38m", "abi3"],
137136
"39": ["cp39", "cp39m", "abi3"],
138137
"310": ["cp310", "cp310m", "abi3"],
138+
"311": ["cp311", "cp311m", "abi3"],
139+
"312": ["cp312", "cp312m", "abi3"],
140+
"313": ["cp313", "cp313m", "abi3"],
139141
}
140142

141143
PLATFORMS_BY_OS = {

‎requirements-dev.txt‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,66 @@
11
alabaster==1.0.0
2-
annotated-types==0.7.0
3-
anyio==4.8.0
2+
anyio==4.9.0
43
babel==2.17.0
4+
backports.tarfile==1.2.0
55
black==25.1.0
6-
bracex==2.5.post1
7-
bump-my-version==0.32.1
8-
django-debug-toolbar==5.0.1
9-
doc8==1.1.2
6+
bracex==2.6
7+
bump-my-version==1.2.0
8+
django-debug-toolbar==5.2.0
9+
doc8==2.0.0
1010
docutils==0.21.2
11+
exceptiongroup==1.3.0
1112
execnet==2.1.1
12-
h11==0.14.0
13-
httpcore==1.0.7
13+
h11==0.16.0
14+
httpcore==1.0.9
1415
httpx==0.28.1
1516
id==1.5.0
1617
imagesize==1.4.1
17-
iniconfig==2.0.0
18-
isort==6.0.0
18+
iniconfig==2.1.0
19+
isort==6.0.1
1920
jaraco.classes==3.4.0
2021
jaraco.context==6.0.1
21-
jeepney==0.8.0
22+
jeepney==0.9.0
2223
keyring==25.6.0
23-
mypy-extensions==1.0.0
24-
nh3==0.2.20
24+
mypy_extensions==1.1.0
25+
nh3==0.2.21
2526
pathspec==0.12.1
2627
pbr==6.1.1
27-
platformdirs==4.3.6
28-
prompt_toolkit==3.0.50
29-
pycodestyle==2.12.1
30-
pydantic==2.10.6
31-
pydantic-settings==2.7.1
32-
pydantic_core==2.27.2
33-
pytest==8.3.4
34-
pytest-django==4.10.0
35-
pytest-rerunfailures==15.0
36-
pytest-xdist==3.6.1
28+
platformdirs==4.3.8
29+
prompt_toolkit==3.0.51
30+
pycodestyle==2.14.0
31+
pytest==8.4.1
32+
pytest-django==4.11.1
33+
pytest-rerunfailures==15.1
34+
pytest-xdist==3.7.0
3735
questionary==2.1.0
3836
readme_renderer==44.0
3937
requests-toolbelt==1.0.0
4038
restructuredtext_lint==1.4.0
4139
rfc3986==2.0.0
42-
rich==13.9.4
43-
rich-click==1.8.6
44-
ruff==0.9.7
40+
rich==14.0.0
41+
rich-click==1.8.9
42+
ruff==0.12.1
4543
secretstorage==3.3.3
4644
sniffio==1.3.1
47-
snowballstemmer==2.2.0
45+
snowballstemmer==3.0.1
4846
sphinx==8.1.3
4947
sphinx-autobuild==2024.10.3
5048
sphinx-copybutton==0.5.2
5149
sphinx-rtd-dark-mode==1.3.0
5250
sphinx-rtd-theme==3.0.2
53-
sphinx_reredirects==0.1.5
51+
sphinx_reredirects==0.1.6
5452
sphinxcontrib-applehelp==2.0.0
5553
sphinxcontrib-devhelp==2.0.0
5654
sphinxcontrib-htmlhelp==2.1.0
5755
sphinxcontrib-jquery==4.1
5856
sphinxcontrib-jsmath==1.0.1
5957
sphinxcontrib-qthelp==2.0.0
6058
sphinxcontrib-serializinghtml==2.0.0
61-
starlette==0.45.3
59+
starlette==0.47.1
6260
stevedore==5.4.1
63-
tomlkit==0.13.2
61+
tomlkit==0.13.3
6462
twine==6.1.0
65-
uvicorn==0.34.0
66-
vendorize==0.3.0
67-
watchfiles==1.0.4
68-
wcmatch==10.0
69-
websockets==15.0
63+
uvicorn==0.35.0
64+
watchfiles==1.1.0
65+
wcmatch==10.1
66+
websockets==15.0.1

0 commit comments

Comments
 (0)