Skip to content

Commit b1ba74c

Browse files
authored
Merge pull request #2157 from aboutcode-org/update_technologies
Update technologies in VCIO
2 parents 4a11509 + 3d74689 commit b1ba74c

File tree

10 files changed

+28
-24
lines changed

10 files changed

+28
-24
lines changed

.github/workflows/docs.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.9]
12+
python-version: [3.12]
1313

1414
steps:
1515
- name: Checkout code

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
max-parallel: 4
3131
matrix:
32-
python-version: ["3.9", "3.10", "3.11"]
32+
python-version: ["3.12", "3.13"]
3333

3434
steps:
3535
- name: Checkout code
@@ -39,10 +39,10 @@ jobs:
3939
uses: actions/setup-python@v2
4040
with:
4141
python-version: ${{ matrix.python-version }}
42+
4243

4344
- name: Install dependencies
4445
run: make dev envfile
45-
4646
# Disable codestyle checks until we have cleaned up the code
4747
# - name: Validate code format
4848
# run: make check

.github/workflows/pypi-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Python
2929
uses: actions/setup-python@v1
3030
with:
31-
python-version: 3.9
31+
python-version: 3.12
3232

3333
- name: Install pypa/build
3434
run: python -m pip install build --user

.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.12"
1313

1414
# Build PDF & ePub
1515
formats:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See https://github.com/nexB/vulnerablecode for support or download.
77
# See https://aboutcode.org for more information about nexB OSS projects
88

9-
FROM python:3.9
9+
FROM python:3.12
1010

1111
WORKDIR /app
1212

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ endif
4949

5050
virtualenv:
5151
@echo "-> Bootstrap the virtualenv with PYTHON_EXE=${PYTHON_EXE}"
52-
@${PYTHON_EXE} ${VIRTUALENV_PYZ} --never-download --no-periodic-update ${VENV}
52+
@${PYTHON_EXE} -m venv ${VENV}
53+
@$(MAKE) upgrade-tools
54+
55+
upgrade-tools:
56+
@echo "-> Upgrade pip / setuptools / wheel (Python 3.12 safe)"
57+
@${VENV}/bin/python -m pip install --upgrade --force-reinstall \
58+
"pip>=24" "setuptools>=69" "wheel>=0.42" packaging
5359

5460
conf: virtualenv
5561
@echo "-> Install dependencies"

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
db:
5-
image: postgres:13
5+
image: postgres:15
66
command: -c config_file=/etc/postgresql/postgresql.conf
77
env_file:
88
- docker.env

requirements.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ alabaster==0.7.12
44
asgiref==3.8.1
55
asttokens==2.0.5
66
async-timeout==4.0.2
7-
attrs==21.4.0
7+
attrs==23.2.0
88
Babel==2.9.1
99
backcall==0.2.0
1010
bcrypt==3.2.0
@@ -23,11 +23,11 @@ coreschema==0.0.4
2323
cryptography==44.0.1
2424
crispy-bootstrap4==2024.1
2525
cwe2==3.0.0
26-
dateparser==1.1.1
26+
dateparser==1.3.0
2727
decorator==5.1.1
2828
defusedxml==0.7.1
2929
distro==1.7.0
30-
Django==4.2.25
30+
Django==5.2.11
3131
django-altcha==0.2.0
3232
django-crispy-forms==2.3
3333
django-environ==0.11.2
@@ -48,24 +48,22 @@ GitPython==3.1.41
4848
gunicorn==23.0.0
4949
idna==3.3
5050
imagesize==1.3.0
51-
importlib-metadata==4.11.3
5251
iniconfig==1.1.1
5352
ipython==8.10.0
5453
isort==5.10.1
5554
itypes==1.2.0
5655
jedi==0.18.1
5756
Jinja2==3.1.6
58-
jsonschema==3.2.0
57+
jsonschema==4.21.0
5958
license-expression==30.3.1
60-
lxml==4.9.1
61-
Markdown==3.3.4
62-
markdown-it-py==3.0.0
59+
lxml==6.0.2
60+
Markdown==3.5.0
6361
MarkupSafe==2.1.1
6462
matplotlib-inline==0.1.3
6563
multidict==6.0.2
6664
mypy-extensions==0.4.3
6765
packageurl-python==0.17.6
68-
packaging==21.3
66+
packaging==23.2
6967
paramiko==3.4.0
7068
parso==0.8.3
7169
pathspec==0.9.0
@@ -76,7 +74,7 @@ platformdirs==2.5.1
7674
pluggy==1.0.0
7775
pprintpp==0.4.0
7876
prompt-toolkit==3.0.30
79-
psycopg2-binary==2.9.3
77+
psycopg2-binary==2.9.11
8078
ptyprocess==0.7.0
8179
pure-eval==0.2.2
8280
py==1.11.0
@@ -90,7 +88,7 @@ pytest==7.1.1
9088
pytest-django==4.5.2
9189
python-dateutil==2.8.2
9290
python-dotenv==0.20.0
93-
pytz==2022.1
91+
pytz==2024.2
9492
PyYAML==6.0.1
9593
redis==5.0.1
9694
requests==2.32.0

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ license_files =
4848
README.rst
4949

5050
[options]
51-
python_requires = >=3.9
51+
python_requires = >=3.12
5252

5353
packages=find:
5454
include_package_data = true
5555
zip_safe = false
5656

5757
install_requires =
58-
Django>=4.2.0,<=5.0
58+
Django>=5.2.11,<=6.0
5959
psycopg2-binary>=2.8.6
6060
djangorestframework>=3.15.0
6161
django-extensions>=3.2.3
@@ -83,8 +83,8 @@ install_requires =
8383
toml>=0.10.2
8484
lxml>=4.6.4
8585
defusedxml>=0.7.1
86-
Markdown>=3.3.0
87-
dateparser>=1.1.1
86+
Markdown>=3.5.0
87+
dateparser>=1.3.0
8888
cvss>=2.4
8989
cwe2>=3.0.0
9090

vulnerabilities/management/commands/export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def packages_by_type_ns_name():
188188
"fixing_vulnerabilities__weaknesses",
189189
"fixing_vulnerabilities__severities",
190190
)
191-
.iterator()
191+
.iterator(chunk_size=1000)
192192
)
193193

194194
for tp_ns_name, packages in groupby(qs, key=by_purl_type_ns_name):

0 commit comments

Comments
 (0)