Merge matchcode purldb

.readthedocs.yml

@@ -7,9 +7,9 @@ version: 2
 
 # Build in latest ubuntu/python
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.13"
 
 # Build PDF & ePub
 formats:

Makefile

@@ -10,8 +10,7 @@
 # Python version can be specified with `$ PYTHON_EXE=python3.x make conf`
 PYTHON_EXE?=python3
 VENV=venv
-MANAGE=${VENV}/bin/python manage_purldb.py
-MATCHCODE_MANAGE=${VENV}/bin/python manage_matchcode.py
+MANAGE=${VENV}/bin/python manage.py
 ACTIVATE?=. ${VENV}/bin/activate;
 VIRTUALENV_PYZ=../etc/thirdparty/virtualenv.pyz
 # Do not depend on Python to generate the SECRET_KEY
@@ -22,12 +21,9 @@ ENV_FILE=.env
 
 # Customize with `$ make postgres PACKAGEDB_DB_PASSWORD=YOUR_PASSWORD`
 PACKAGEDB_DB_PASSWORD=packagedb
-MATCHCODEIO_DB_PASSWORD=matchcodeio
-SCANCODEIO_DB_PASSWORD=scancodeio
 
 # Django settings shortcuts
-DJSM_PDB=DJANGO_SETTINGS_MODULE=purldb_project.settings
-DJSM_MAT=DJANGO_SETTINGS_MODULE=matchcode_project.settings
+DJSM_PDB=DJANGO_SETTINGS_MODULE=purldb.settings
 
 # Use sudo for postgres, but only on Linux
 UNAME := $(shell uname)
@@ -58,8 +54,6 @@ envfile:
 envfile_testing: envfile
 	@echo PACKAGEDB_DB_USER=\"postgres\" >> ${ENV_FILE}
 	@echo PACKAGEDB_DB_PASSWORD=\"postgres\" >> ${ENV_FILE}
-	@echo SCANCODEIO_DB_USER=\"postgres\" >> ${ENV_FILE}
-	@echo SCANCODEIO_DB_PASSWORD=\"postgres\" >> ${ENV_FILE}
 
 doc8:
 	@echo "-> Run doc8 validation"
@@ -101,23 +95,9 @@ postgres:
 	${SUDO_POSTGRES} createdb --encoding=utf-8 --owner=packagedb packagedb
 	@$(MAKE) migrate
 
-postgres_matchcodeio:
-	@echo "-> Configure PostgreSQL database"
-	@echo "-> Create database user 'matchcodeio'"
-	${SUDO_POSTGRES} createuser --no-createrole --no-superuser --login --inherit --createdb matchcodeio || true
-	${SUDO_POSTGRES} psql -c "alter user matchcodeio with encrypted password '${MATCHCODEIO_DB_PASSWORD}';" || true
-	@echo "-> Drop 'matchcodeio' database"
-	${SUDO_POSTGRES} dropdb matchcodeio || true
-	@echo "-> Create 'matchcodeio' database"
-	${SUDO_POSTGRES} createdb --encoding=utf-8 --owner=matchcodeio matchcodeio
-	${MATCHCODE_MANAGE} migrate
-
 run:
 	${MANAGE} runserver 8001 --insecure
 
-run_matchcodeio:
-	${MATCHCODE_MANAGE} runserver 8002 --insecure
-
 seed:
 	${MANAGE} seed
 
@@ -128,19 +108,13 @@ run_map:
 	${MANAGE} run_map
 
 test_purldb:
-	${ACTIVATE} ${DJSM_PDB} pytest -vvs --lf minecode packagedb purl2vcs purldb_project purldb_public_project --ignore packagedb/tests/test_throttling.py
+	${ACTIVATE} ${DJSM_PDB} pytest -vvs --lf minecode matchcode packagedb purl2vcs purldb clearcode clearindex --ignore packagedb/tests/test_throttling.py
 	${ACTIVATE} ${DJSM_PDB} pytest -vvs --lf packagedb/tests/test_throttling.py
 
-test_clearcode:
-	${ACTIVATE} ${DJSM_PDB} ${PYTHON_EXE} -m pytest -vvs clearcode clearindex
-
-test_matchcode:
-	${ACTIVATE} ${DJSM_MAT} ${PYTHON_EXE} -m pytest -vvs matchcode_pipeline matchcode
-
-test: test_purldb test_matchcode test_toolkit test_clearcode
+test_minecode_pipelines:
+	${ACTIVATE} ${DJSM_PDB} pytest -vvs minecode_pipelines
 
-test_minecode:
-	${ACTIVATE} ${PYTHON_EXE} -m pytest -vvs minecode_pipelines
+test: test_purldb
 
 shell:
 	${MANAGE} shell
@@ -179,4 +153,4 @@ docker-images:
 	@docker save minecode minecode_minecode nginx | gzip > dist/minecode-images-`git describe --tags`.tar.gz
 
 # keep this sorted
-.PHONY: bump check docs-check clean clearindex clearsync conf dev docker-images docs envfile envfile_testing index_packages migrate postgres postgres_matchcodeio priority_queue run run_map run_matchcodeio run_visit seed shell test test_clearcode test_matchcode test_purldb test_toolkit valid virtualenv
+.PHONY: bump check docs-check clean clearindex clearsync conf dev docker-images docs envfile envfile_testing index_packages migrate postgres priority_queue run run_map run_visit seed shell test test_purldb test_minecode_pipelines valid virtualenv

docker-compose.miners.yml

@@ -5,8 +5,8 @@ services:
   visitor:
     build: .
     command: sh -c "
-        wait-for-it web:8000 -- python manage_purldb.py seed &&
-        python manage_purldb.py run_visit --ignore-robots --ignore-throttle"
+        wait-for-it web:8000 -- python manage.py seed &&
+        python manage.py run_visit --ignore-robots --ignore-throttle"
     env_file:
       - docker_purldb.env
     volumes:
@@ -19,7 +19,7 @@ services:
 
   mapper:
     build: .
-    command: wait-for-it web:8000 -- python manage_purldb.py run_map
+    command: wait-for-it web:8000 -- python manage.py run_map
     env_file:
       - docker_purldb.env
     volumes:
@@ -45,7 +45,7 @@ services:
 
   clearindex:
     build: .
-    command: wait-for-it web:8000 -- python manage_purldb.py run_clearindex
+    command: wait-for-it web:8000 -- python manage.py run_clearindex
     env_file:
       - docker_purldb.env
     profiles: