Skip to content

Commit

Permalink
Merge branch 'aboutcode-org:main' into add-cwe-support-in-multiple-im…
Browse files Browse the repository at this point in the history
…porters
  • Loading branch information
ambuj-1211 authored Sep 15, 2024
2 parents 475e94b + ed17dbd commit 451f55b
Show file tree
Hide file tree
Showing 70 changed files with 4,553 additions and 503 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11"]

steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

steps:
- name: Download built archives
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
with:
name: pypi_archives
path: dist
Expand All @@ -71,7 +71,7 @@ jobs:

steps:
- name: Download built archives
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
with:
name: pypi_archives
path: dist
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
Release notes
=============

Version (next)
-------------------

- Add Pipeline to flag ghost packages (#1533)
- Add logging configuration (#1533)
- Drop support for python 3.8 (#1533)
- Drop using docker-compose and use the built-in "docker compose" instead
- Upgrade core dependencies including Django and Rest Framework


Version v34.0.0
-------------------

- Improve API performance.
- Add severity range score in API.
- Refactor GitlabDataSource to work with browser extension


Version v34.0.0rc5
-------------------

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ docs:

docker-images:
@echo "-> Build Docker services"
docker-compose build
docker compose build
@echo "-> Pull service images"
docker-compose pull
docker compose pull
@echo "-> Save the service images to a compressed tar archive in the dist/ directory"
@mkdir -p dist/
@docker save postgres vulnerablecode_vulnerablecode nginx | gzip > dist/vulnerablecode-images-`git describe --tags`.tar.gz
Expand Down
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ Getting started
Run with Docker
^^^^^^^^^^^^^^^^

First install docker and docker-compose, then run::
First install docker, then run::

git clone https://github.com/nexB/vulnerablecode.git && cd vulnerablecode
make envfile
docker-compose build
docker-compose up -d
docker-compose run vulnerablecode ./manage.py import --list
docker compose build
docker compose up -d
docker compose run vulnerablecode ./manage.py import --list

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

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

At this point, the VulnerableCode app and API should be up and running with
some data at http://localhost
Expand Down
15 changes: 15 additions & 0 deletions aboutcode/hashid/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
aboutcode.hashid
==================

This is a library of utilities to compute ids and file paths for AboutCode using VCID and PURLs.

License
-------

Copyright (c) nexB Inc. and others. All rights reserved.

SPDX-License-Identifier: Apache-2.0

See https://github.com/aboutcode-org/vulnerablecode for support or download.

See https://aboutcode.org for more information about AboutCode OSS projects.
Loading

0 comments on commit 451f55b

Please sign in to comment.