Merge branch 'main' into 446-vcio-v3-advisories

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

.devcontainer/demo/devcontainer.json

@@ -4,6 +4,9 @@
   "service": "web",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
   "overrideCommand": false,
+  "hostRequirements": {
+    "cpus": 4
+  },
   "forwardPorts": [8000],
   "portsAttributes": {
     "8000": {
@@ -16,11 +19,56 @@
       "openFiles": []
     },
     "vscode": {
+      "extensions": [],
       "settings": {
         "chat.disableAIFeatures": true,
-        "workbench.startupEditor": "none",
+        "telemetry.telemetryLevel": "off",
         "workbench.tips.enabled": false,
-        "git.openRepositoryInParentFolders": "never"
+        "workbench.startupEditor": "none",
+        "workbench.editor.enablePreview": false,
+        "security.workspace.trust.enabled": false,
+        "extensions.autoCheckUpdates": false,
+        "extensions.ignoreRecommendations": true,
+        "git.enabled": false,
+        "git.autorefresh": false,
+        "git.decorations.enabled": false,
+        "scm.diffDecorations": "none",
+        "editor.minimap.enabled": false,
+        "editor.quickSuggestions": {
+          "other": "off",
+          "comments": "off",
+          "strings": "off"
+        },
+        "editor.suggestOnTriggerCharacters": false,
+        "editor.wordBasedSuggestions": "off",
+        "editor.parameterHints.enabled": false,
+        "editor.codeLens": false,
+        "editor.lightbulb.enabled": "off",
+        "editor.inlayHints.enabled": "off",
+        "editor.occurrencesHighlight": "off",
+        "editor.selectionHighlight": false,
+        "editor.renderLineHighlight": "none",
+        "editor.renderWhitespace": "none",
+        "editor.formatOnSave": false,
+        "editor.accessibilitySupport": "off",
+        "breadcrumbs.enabled": false,
+        "terminal.integrated.enablePersistentSessions": false,
+        "terminal.integrated.gpuAcceleration": "off",
+        "files.watcherExclude": {
+          "**/.git/**": true,
+          "**/data/**": true,
+          "**/static/**": true,
+          "**/media/**": true,
+          "**/thirdparty/**": true,
+          "**/*.dist": true
+        },
+        "search.exclude": {
+          "**/.git": true,
+          "**/data": true,
+          "**/static": true,
+          "**/media": true,
+          "**/thirdparty": true
+        }
       }
     }
   }

.github/workflows/check-code-and-docs-validation.yml

@@ -1,4 +1,4 @@
-name: Run unit tests
+name: Check code and docs validation
 
 on:
   workflow_dispatch:

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

@@ -22,5 +22,10 @@ jobs:
       - name: Generate the .env file and the SECRET_KEY
         run: make envfile
 
+      - name: Build Docker image
+        run: docker compose -f compose.yml -f compose.build.yml build
+
       - name: Run tests
-        run: docker compose run web python ./manage.py test --verbosity=2 --noinput
+        run: |
+          docker compose -f compose.yml -f compose.build.yml run web \
+            python ./manage.py test --verbosity=2 --noinput --parallel auto

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+### Version 5.8.1
+
+* fix: improve performances and logging for SCIO importer (#546)
+* feat: modernize Docker Compose setup and simplify installation docs (#544)
+
 ### Version 5.8.0
 
 * feat: [five-c] Compliance dashboard export/report by @tdruez in https://github.com/aboutcode-org/dejacode/pull/522

Makefile

@@ -49,7 +49,7 @@ superuser:
 	${MANAGE} createsuperuser
 
 ########################################################################################
-# Utilities
+# Linters / docs
 ########################################################################################
 
 DOCS_LOCATION=./docs
@@ -78,36 +78,12 @@ docs:
 	uvx --from sphinx==9.1.0 --with furo==2025.12.19 sphinx-build -b html ${DOCS_LOCATION} ${DOCS_LOCATION}/_build/html/
 
 ########################################################################################
-
-VENV_LOCATION=.venv
-ACTIVATE?=. ${VENV_LOCATION}/bin/activate;
-#MANAGE=${VENV_LOCATION}/bin/python manage.py
-# Do not depend on Python to generate the SECRET_KEY
-GET_SECRET_KEY=`head -c50 /dev/urandom | base64 | head -c50`
-# Customize with `$ make envfile ENV_FILE=/etc/dejacode/.env`
-ENV_FILE=.env
-DOCKER_COMPOSE=docker compose -f docker-compose.yml
-DOCKER_EXEC=${DOCKER_COMPOSE} exec
-DB_NAME=dejacode_db
-DB_USERNAME=dejacode
-DB_PASSWORD=dejacode
-DB_CONTAINER_NAME=db
-DB_INIT_FILE=./data/postgresql/initdb.sql.gz
-POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8
-TIMESTAMP=$(shell date +"%Y-%m-%d_%H%M")
-
-conf: virtualenv
-	@echo "-> Install dependencies"
-	uv sync --frozen
-	@echo "-> Create the var/ directory"
-	@mkdir -p var
-
-dev: virtualenv
-	@echo "-> Configure and install development dependencies"
-	uv sync --frozen --extra dev
+# Utilities
+########################################################################################
 
 outdated:
 	@echo "-> Check for outdated packages (with 7 days cooldown)"
+	uv sync --frozen --quiet
 	uv pip list --outdated \
 		--no-config \
 		--index-url https://pypi.org/simple \
@@ -121,25 +97,61 @@ upgrade:
 		exit 1; \
 	fi
 	@echo "-> Download $(PACKAGE) wheels for Linux x86_64"
-	pip download $(PACKAGE) \
+	uvx pip download $(PACKAGE) \
 		--only-binary=:all: \
 		--platform manylinux_2_28_x86_64 \
 		--platform manylinux_2_17_x86_64 \
 		--python-version 3.14 \
 		--dest ./thirdparty/dist/
 	@echo "-> Download $(PACKAGE) wheels for macOS ARM64"
-	pip download $(PACKAGE) \
+	uvx pip download $(PACKAGE) \
 		--only-binary=:all: \
 		--platform macosx_11_0_arm64 \
 		--python-version 3.14 \
 		--dest ./thirdparty/dist/
 	@echo "-> Update pyproject.toml and uv.lock"
-	uv add $(PACKAGE)
+	uvx uv add $(PACKAGE)
 
 lock:
 	@echo "-> Regenerate uv.lock from local wheels"
 	uv lock
 
+clean:
+	@echo "-> Clean the Python env"
+	rm -rf .venv/ .*_cache/ *.egg-info/ build/ dist/
+	find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
+
+########################################################################################
+# Local venv commands (legacy)
+########################################################################################
+
+VENV_LOCATION=.venv
+ACTIVATE?=. ${VENV_LOCATION}/bin/activate;
+#MANAGE=${VENV_LOCATION}/bin/python manage.py
+# Do not depend on Python to generate the SECRET_KEY
+GET_SECRET_KEY=`head -c50 /dev/urandom | base64 | head -c50`
+# Customize with `$ make envfile ENV_FILE=/etc/dejacode/.env`
+ENV_FILE=.env
+DOCKER_COMPOSE=docker compose -f docker-compose.yml
+DOCKER_EXEC=${DOCKER_COMPOSE} exec
+DB_NAME=dejacode_db
+DB_USERNAME=dejacode
+DB_PASSWORD=dejacode
+DB_CONTAINER_NAME=db
+DB_INIT_FILE=./data/postgresql/initdb.sql.gz
+POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8
+TIMESTAMP=$(shell date +"%Y-%m-%d_%H%M")
+
+conf: virtualenv
+	@echo "-> Install dependencies"
+	uv sync --frozen
+	@echo "-> Create the var/ directory"
+	@mkdir -p var
+
+dev: virtualenv
+	@echo "-> Configure and install development dependencies"
+	uv sync --frozen --extra dev
+
 envfile:
 	@echo "-> Create the .env file and generate a secret key"
 	@if test -f ${ENV_FILE}; then echo "${ENV_FILE} file exists already"; exit 1; fi
@@ -150,15 +162,6 @@ envfile_dev: envfile
 	@echo "-> Update the .env file for development"
 	@echo DATABASE_PASSWORD=\"dejacode\" >> ${ENV_FILE}
 
-check-deploy:
-	@echo "-> Check Django deployment settings"
-	${MANAGE} check --deploy
-
-clean:
-	@echo "-> Clean the Python env"
-	rm -rf .venv/ .*_cache/ *.egg-info/ build/ dist/
-	find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
-
 initdb:
 	@echo "-> Stop Docker services that access the database"
 	${DOCKER_COMPOSE} stop web worker
@@ -183,4 +186,4 @@ psql:
 log:
 	${DOCKER_COMPOSE} logs --tail="100" ${SERVICE}
 
-.PHONY: virtualenv conf dev lock upgrade envfile envfile_dev check outdated doc8 valid check-deploy clean initdb postgresdb postgresdb_clean migrate run test docs build psql bash shell log superuser
+.PHONY: virtualenv conf dev lock upgrade envfile envfile_dev check outdated doc8 valid clean initdb postgresdb postgresdb_clean migrate run test docs build psql bash shell log superuser

README.rst

@@ -23,7 +23,7 @@ using GitHub Codespaces. The badge below launches a ready-to-use demo instance:
 the application starts automatically, with a demo account already created for you.
 
 .. image:: https://github.com/codespaces/badge.svg
-   :target: https://github.com/codespaces/new/aboutcode-org/dejacode?ref=main&devcontainer_path=.devcontainer%2Fdemo%2Fdevcontainer.json&quickstart=true
+   :target: https://github.com/codespaces/new/aboutcode-org/dejacode?ref=main&devcontainer_path=.devcontainer%2Fdemo%2Fdevcontainer.json&machine=standardLinux32gb&quickstart=true
    :alt: Open in GitHub Codespaces
 
 #. **Click** the badge above and **confirm** the creation of the Codespace.

component_catalog/tests/test_importers.py

@@ -601,10 +601,10 @@ def test_importers_view_num_queries_view(self):
         with self.assertMaxQueries(9):
             self.client.get(reverse("admin:component_catalog_package_import"))
 
-        with self.assertNumQueries(4):
+        with self.assertMaxQueries(5):
             self.client.get(reverse("admin:organization_owner_import"))
 
-        with self.assertMaxQueries(10):
+        with self.assertMaxQueries(11):
             self.client.get(reverse("admin:component_catalog_component_import"))
 
     def test_component_import_keywords(self):

component_catalog/tests/test_views.py

@@ -52,6 +52,7 @@
 from dje.models import ExternalReference
 from dje.models import ExternalSource
 from dje.models import History
+from dje.tests import MaxQueryMixin
 from dje.tests import add_perm
 from dje.tests import add_perms
 from dje.tests import create_superuser
@@ -77,7 +78,7 @@
 User = get_user_model()
 
 
-class ComponentUserViewsTestCase(TestCase):
+class ComponentUserViewsTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.nexb_dataspace = Dataspace.objects.create(name="nexB")
         self.nexb_user = User.objects.create_superuser(
@@ -980,7 +981,7 @@ def test_component_catalog_details_view_num_queries(self):
         History.log_change(self.basic_user, self.component1, "Changed version.")
         History.log_change(self.nexb_user, self.component1, "Changed notes.")
 
-        with self.assertNumQueries(32):
+        with self.assertMaxQueries(33):
             self.client.get(url)
 
     def test_component_catalog_details_view_package_tab_fields_visibility(self):
@@ -1095,7 +1096,7 @@ def test_component_catalog_component_create_ajax_view(self):
         self.assertContains(response, expected, html=True)
 
 
-class PackageUserViewsTestCase(TestCase):
+class PackageUserViewsTestCase(MaxQueryMixin, TestCase):
     testfiles_location = join(dirname(__file__), "testfiles")
 
     def setUp(self):
@@ -1133,7 +1134,7 @@ def setUp(self):
 
     def test_package_list_view_num_queries(self):
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(16):
+        with self.assertMaxQueries(17):
             self.client.get(reverse("component_catalog:package_list"))
 
     def test_package_list_view_pagination(self):
@@ -1271,7 +1272,7 @@ def test_package_details_view_num_queries(self):
         )
 
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(30):
+        with self.assertMaxQueries(31):
             self.client.get(self.package1.get_absolute_url())
 
     def test_package_details_view_content(self):
@@ -3766,7 +3767,7 @@ def test_component_catalog_package_update_view_save_as_with_collect_data(
         self.assertEqual(1, len(mock_collect_data.mock_calls))
 
 
-class ComponentListViewTestCase(TestCase):
+class ComponentListViewTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.dataspace = Dataspace.objects.create(
             name="nexB",
@@ -3856,7 +3857,7 @@ def setUp(self):
 
     def test_component_catalog_list_view_num_queries(self):
         self.client.login(username="nexb_user", password="t3st")
-        with self.assertNumQueries(17):
+        with self.assertMaxQueries(18):
             self.client.get(reverse("component_catalog:component_list"))
 
     def test_component_catalog_list_view_default(self):

compose.demo.yml

@@ -16,6 +16,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+      start_period: 30s
+      start_interval: 1s
 
   web:
     image: ghcr.io/aboutcode-org/dejacode:latest

compose.dev.yml

@@ -22,8 +22,6 @@ services:
   web:
     build: .
     image: dejacode:dev
-    env_file:
-      - .env
     environment:
       - DATABASE_HOST=db
       - DATABASE_PASSWORD=dejacode
@@ -37,6 +35,7 @@ services:
     ports:
       - "8000:8000"
     volumes:
+      - ./.env:/opt/dejacode/.env
       - ./component_catalog:/opt/dejacode/component_catalog
       - ./dejacode:/opt/dejacode/dejacode
       - ./dejacode_toolkit:/opt/dejacode/dejacode_toolkit