Skip to content

Commit 4de4f84

Browse files
authored
chore: upgrade django to version 6.x (#2052)
Signed-off-by: tdruez <[email protected]>
1 parent b966b47 commit 4de4f84

File tree

8 files changed

+29
-23
lines changed

8 files changed

+29
-23
lines changed

.github/workflows/run-unit-tests-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
24+
python-version: ["3.12", "3.13", "3.14"]
2525

2626
steps:
2727
- name: Checkout code

.github/workflows/run-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
max-parallel: 4
4141
matrix:
42-
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
42+
python-version: ["3.12", "3.13", "3.14"]
4343

4444
steps:
4545
- name: Checkout code

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ Docker Compose users with existing data: run `./migrate-pg13-to-17.sh` before st
77
the stack.
88
Fresh installations require no action.
99

10+
v37.0.0 (unreleased)
11+
--------------------
12+
13+
- Upgrade Django to release 6.x
14+
15+
- Drop support for Python3.10 and Python3.11
16+
1017
v36.1.0 (2026-01-22)
1118
--------------------
1219

etc/thirdparty/virtualenv.pyz

14 KB
Binary file not shown.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
about_resource: virtualenv.pyz
22
name: get-virtualenv
3-
version: 20.35.4
4-
download_url: https://github.com/pypa/get-virtualenv/raw/20.35.4/public/virtualenv.pyz
3+
version: 20.36.1
4+
download_url: https://github.com/pypa/get-virtualenv/raw/20.36.1/public/virtualenv.pyz
55
description: virtualenv is a tool to create isolated Python environments.
66
homepage_url: https://github.com/pypa/virtualenv
77
license_expression: lgpl-2.1-plus AND (bsd-new OR apache-2.0) AND mit AND python AND bsd-new
@@ -10,4 +10,4 @@ copyright: Copyright (c) The Python Software Foundation and others
1010
redistribute: yes
1111
attribute: yes
1212
track_changes: yes
13-
package_url: pkg:github/pypa/get-virtualenv@20.35.4#public/virtualenv.pyz
13+
package_url: pkg:github/pypa/get-virtualenv@20.36.1#public/virtualenv.pyz

pyproject.toml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "scancodeio"
77
version = "36.1.0"
88
description = "Automate software composition analysis pipelines"
99
readme = "README.rst"
10-
requires-python = ">=3.10"
10+
requires-python = ">=3.12,<3.15"
1111
license = "Apache-2.0"
1212
license-files = ["LICENSE", "NOTICE", "scan.NOTICE"]
1313
authors = [
@@ -26,19 +26,17 @@ classifiers = [
2626
"Intended Audience :: Legal Industry",
2727
"Programming Language :: Python",
2828
"Programming Language :: Python :: 3 :: Only",
29-
"Programming Language :: Python :: 3.10",
30-
"Programming Language :: Python :: 3.11",
3129
"Programming Language :: Python :: 3.12",
3230
"Programming Language :: Python :: 3.13",
3331
"Programming Language :: Python :: 3.14",
3432
"Topic :: Utilities"
3533
]
3634

3735
dependencies = [
38-
"importlib-metadata==8.7.0",
39-
"setuptools==80.9.0",
36+
"importlib-metadata==8.7.1",
37+
"setuptools==82.0.0",
4038
# Django related
41-
"Django==5.2.9",
39+
"Django==6.0.2",
4240
"django-environ==0.12.0",
4341
"django-crispy-forms==2.5",
4442
"crispy-bootstrap3==2024.1",
@@ -47,22 +45,22 @@ dependencies = [
4745
"django-taggit==6.1.0",
4846
"django-htmx==1.27.0",
4947
# Database
50-
"psycopg[binary]==3.3.1",
48+
"psycopg[binary]==3.3.2",
5149
# wait_for_database Django management command
5250
"django-probes==1.8.0",
5351
# Task queue
5452
"rq==2.6.1",
55-
"django-rq==3.2.1",
56-
"redis==7.1.0",
53+
"django-rq==3.2.2",
54+
"redis==7.1.1",
5755
# WSGI server
58-
"gunicorn==23.0.0",
56+
"gunicorn==25.0.3",
5957
# Docker
6058
"container-inspector==33.1.0",
6159
# ScanCode-toolkit
6260
"scancode-toolkit[packages]==32.5.0",
6361
"extractcode[full]==31.0.0",
6462
"commoncode==32.4.2",
65-
"Beautifulsoup4[chardet]==4.13.4",
63+
"Beautifulsoup4[chardet]==4.14.3",
6664
"packageurl-python==0.17.6",
6765
# FetchCode
6866
"fetchcode==0.8.0",
@@ -79,12 +77,12 @@ dependencies = [
7977
"XlsxWriter==3.2.9",
8078
"openpyxl==3.1.5",
8179
"requests==2.32.5",
82-
"GitPython==3.1.45",
80+
"GitPython==3.1.46",
8381
# Profiling
84-
"pyinstrument==5.1.1",
82+
"pyinstrument==5.1.2",
8583
# CycloneDX
8684
"cyclonedx-python-lib==11.6.0",
87-
"jsonschema==4.25.1",
85+
"jsonschema==4.26.0",
8886
# MatchCode-toolkit
8987
"matchcode-toolkit==7.2.2",
9088
# Univers
@@ -105,12 +103,12 @@ dependencies = [
105103
[project.optional-dependencies]
106104
dev = [
107105
# Validation
108-
"ruff==0.14.7",
106+
"ruff==0.15.0",
109107
"doc8==2.0.0",
110108
# Debug
111-
"django-debug-toolbar==6.1.0",
109+
"django-debug-toolbar==6.2.0",
112110
# Documentation
113-
"Sphinx==8.1.3", # Newer versions dropped Python 3.10 support
111+
"Sphinx==8.1.3",
114112
"sphinx-rtd-theme==3.0.2",
115113
"sphinx-rtd-dark-mode==1.3.0",
116114
"sphinxcontrib-django==2.5",

scancodeio/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def extract_short_commit(git_describe):
8888
warnings.filterwarnings("ignore", module="extractcode")
8989
warnings.filterwarnings("ignore", module="typecode")
9090
warnings.filterwarnings("ignore", module="clamd")
91+
warnings.filterwarnings("ignore", module="cyclonedx")
9192

9293

9394
def command_line():

scanpipe/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def is_active(self):
201201
[
202202
field_name
203203
for field_name in self.form.changed_data
204-
if field_name not in ["sort"]
204+
if field_name != "sort"
205205
]
206206
)
207207

0 commit comments

Comments
 (0)