diff --git a/hack/Makefile b/hack/Makefile index 54c3e5e0b9..6cdc45f2fd 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -192,7 +192,7 @@ compile-requirements-am: ## Run pip-compile for Archivematica -c "make pip-compile" compile-requirements-ss: ## Run pip-compile for Storage Service - docker compose run --workdir /src/requirements \ + docker compose run --workdir /src \ -e XDG_CACHE_HOME=/tmp/pip-cache \ --rm \ --no-deps \ diff --git a/hack/submodules/archivematica-storage-service b/hack/submodules/archivematica-storage-service index ea8d771847..6196e34ad2 160000 --- a/hack/submodules/archivematica-storage-service +++ b/hack/submodules/archivematica-storage-service @@ -1 +1 @@ -Subproject commit ea8d7718476ed762ad1899a6f9bdbb1f6ffbfee3 +Subproject commit 6196e34ad20b66544e2426cd9be7551103efae99 diff --git a/src/MCPClient/osdeps/Ubuntu-20.json b/src/MCPClient/osdeps/Ubuntu-20.json index 643652dd60..55c73a491c 100644 --- a/src/MCPClient/osdeps/Ubuntu-20.json +++ b/src/MCPClient/osdeps/Ubuntu-20.json @@ -133,7 +133,7 @@ } ], "osdeps_repos": [ - "deb [arch=amd64] http://packages.archivematica.org/1.14.x/ubuntu-externals focal main", + "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals focal main", "deb http://archive.ubuntu.com/ubuntu/ focal multiverse", "deb http://archive.ubuntu.com/ubuntu/ focal-security universe", "deb http://archive.ubuntu.com/ubuntu/ focal-updates multiverse" diff --git a/tox.ini b/tox.ini index 95f4b3d2ee..e8facf4f3b 100644 --- a/tox.ini +++ b/tox.ini @@ -68,8 +68,7 @@ commands = python {env:MCPCLIENT_DIR}/ensure_no_mutable_globals.py [testenv:storage-service] deps = - -r{env:STORAGE_SERVICE_ROOT}/requirements/production.txt - -r{env:STORAGE_SERVICE_ROOT}/requirements/test.txt + -r{env:STORAGE_SERVICE_ROOT}/requirements-dev.txt [testenv:migrations-dashboard] commands = django-admin makemigrations --check --dry-run