Skip to content

Commit 73f5bda

Browse files
authored
Merge branch 'main' into correct-cve-regex
2 parents 36ce5e1 + 094c2bf commit 73f5bda

File tree

83 files changed

+4905
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4905
-611
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.8]
12+
python-version: [3.9]
1313

1414
steps:
1515
- name: Checkout code

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
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.8", "3.9", "3.10"]
32+
python-version: ["3.9", "3.10", "3.11"]
3333

3434
steps:
3535
- name: Checkout code

.github/workflows/pypi-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: python -m build --sdist --wheel --outdir dist/
3838

3939
- name: Upload built archives
40-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
4141
with:
4242
name: pypi_archives
4343
path: dist/*
@@ -51,7 +51,7 @@ jobs:
5151

5252
steps:
5353
- name: Download built archives
54-
uses: actions/download-artifact@v3
54+
uses: actions/download-artifact@v4
5555
with:
5656
name: pypi_archives
5757
path: dist
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Download built archives
74-
uses: actions/download-artifact@v3
74+
uses: actions/download-artifact@v4
7575
with:
7676
name: pypi_archives
7777
path: dist

CHANGELOG.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
Release notes
22
=============
33

4+
Version v34.0.1
5+
-------------------
6+
7+
- Add Pipeline to flag ghost packages (#1533)
8+
- Add logging configuration (#1533)
9+
- Drop support for python 3.8 (#1533)
10+
- Drop using docker-compose and use the built-in "docker compose" instead
11+
- Upgrade core dependencies including Django and Rest Framework
12+
- Fix typo in KEV improver (#1594)
13+
14+
15+
Version v34.0.0
16+
-------------------
17+
18+
- Improve API performance.
19+
- Add severity range score in API.
20+
- Refactor GitlabDataSource to work with browser extension
21+
22+
423
Version v34.0.0rc5
524
-------------------
625

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ docs:
129129

130130
docker-images:
131131
@echo "-> Build Docker services"
132-
docker-compose build
132+
docker compose build
133133
@echo "-> Pull service images"
134-
docker-compose pull
134+
docker compose pull
135135
@echo "-> Save the service images to a compressed tar archive in the dist/ directory"
136136
@mkdir -p dist/
137137
@docker save postgres vulnerablecode_vulnerablecode nginx | gzip > dist/vulnerablecode-images-`git describe --tags`.tar.gz

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ Getting started
6666
Run with Docker
6767
^^^^^^^^^^^^^^^^
6868

69-
First install docker and docker-compose, then run::
69+
First install docker, then run::
7070

7171
git clone https://github.com/nexB/vulnerablecode.git && cd vulnerablecode
7272
make envfile
73-
docker-compose build
74-
docker-compose up -d
75-
docker-compose run vulnerablecode ./manage.py import --list
73+
docker compose build
74+
docker compose up -d
75+
docker compose run vulnerablecode ./manage.py import --list
7676

7777
Then run an importer for nginx advisories (which is small)::
7878

79-
docker-compose exec vulnerablecode ./manage.py import vulnerabilities.importers.nginx.NginxImporter
80-
docker-compose exec vulnerablecode ./manage.py improve --all
79+
docker compose exec vulnerablecode ./manage.py import vulnerabilities.importers.nginx.NginxImporter
80+
docker compose exec vulnerablecode ./manage.py improve --all
8181

8282
At this point, the VulnerableCode app and API should be up and running with
8383
some data at http://localhost

aboutcode/hashid/README.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
aboutcode.hashid
2+
==================
3+
4+
This is a library of utilities to compute ids and file paths for AboutCode using VCID and PURLs.
5+
6+
License
7+
-------
8+
9+
Copyright (c) nexB Inc. and others. All rights reserved.
10+
11+
SPDX-License-Identifier: Apache-2.0
12+
13+
See https://github.com/aboutcode-org/vulnerablecode for support or download.
14+
15+
See https://aboutcode.org for more information about AboutCode OSS projects.

0 commit comments

Comments
 (0)