Merge branch 'main' into fix403

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
         src/(MCPClient/MCPServer|dashboard)/osdeps/.*\.json
       )
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.1
+  rev: v3.15.2
   hooks:
   - id: pyupgrade
     args: [--py38-plus]

CITATION.cff

@@ -12,6 +12,8 @@ authors:
     country: CA
     email: [email protected]
 identifiers:
+  - type: url
+    value: 'https://phaidra.univie.ac.at/o:185511'
   - type: swh
     value: 'swh:1:dir:58f29939b1d3947eb1551930dec41dd6dd3398d3'
 repository-code: 'https://github.com/artefactual/archivematica'
@@ -25,3 +27,4 @@ abstract: >-
 keywords:
   - digital-preservation
   - python
+  - open-source

CONTRIBUTING.md

@@ -77,10 +77,8 @@ new features in the [Archivematica Issues repo]. This is also where Artefactual
 staff record upcoming enhancements when they have been sponsored for inclusion
 either by Artefactual Systems or by a client.
 
-Please feel free also to use the [Issues repo wiki] as a space for gathering and
-collaborating on ideas. If you are not already a member of the
-Archivematica repo (required for editing the wiki), file an issue there with
-the title "Request membership."
+Please feel free also to use the [Archivematica Issues repo] as a space for
+gathering and collaborating on ideas.
 
 ## Submitting code changes
 
@@ -422,15 +420,14 @@ Further content comes after a blank line.
 [mailing list]: https://groups.google.com/forum/#!forum/archivematica
 [Archivematica Issues repo]: https://github.com/archivematica/Issues
 [user]: https://groups.google.com/forum/#!forum/archivematica
-[Issues repo wiki]: https://github.com/archivematica/Issues/wiki
 [files]: https://help.github.com/articles/getting-permanent-links-to-files/
 [code snippets]: https://help.github.com/articles/creating-a-permanent-link-to-a-code-snippet/
-[development installation]: https://wiki.archivematica.org/Getting_started#Installation
+[development installation]: https://github.com/artefactual/archivematica/blob/qa/1.x/hack/README.md
 [GitHub]: https://github.com/
 [guide]: https://help.github.com/articles/fork-a-repo
 [excellent]: https://help.github.com/articles/using-pull-requests
 [Line comment]: http://i.imgur.com/FsWppGN.png
-[code review guidelines]: code_review.md
+[code review guidelines]: https://github.com/artefactual/archivematica/blob/qa/1.x/code_review.md
 [interactive rebase feature]: http://www.git-scm.com/book/en/Git-Tools-Rewriting-History
 [Contributor's Agreement]: https://wiki.archivematica.org/images/e/e6/Archivematica-CLA-firstname-lastname-YYYY.pdf
 [Apache Foundation]: http://apache.org
@@ -439,14 +436,14 @@ Further content comes after a blank line.
 [PEP8]: https://www.python.org/dev/peps/pep-0008/
 [Black]: https://github.com/ambv/black
 [flake8]: https://pypi.python.org/pypi/flake8
-[continuous integration system]: https://travis-ci.org/artefactual/archivematica
+[continuous integration system]: https://github.com/artefactual/archivematica/actions
 [Pylint]: https://www.pylint.org/
 [docstrings]: https://en.wikipedia.org/wiki/Docstring#Python
 [PEP 257]: https://www.python.org/dev/peps/pep-0257/
 [Sphinx-compatible docstrings]: http://pythonhosted.org/an_example_pypi_project/sphinx.html#function-definitions
 [examples]: http://sphinx-doc.org/domains.html#info-field-lists
 [attributes to use]: http://sphinx-doc.org/domains.html#the-python-domain
-[unittest]: https://docs.python.org/2/library/unittest.html
+[unittest]: https://docs.python.org/3.9/library/unittest.html
 [py.test]: http://pytest.org
 [TestCase]: https://docs.djangoproject.com/en/1.8/topics/testing/tools/#django.test.TestCase
 [VCR.py]: https://github.com/kevin1024/vcrpy

hack/Dockerfile

@@ -190,6 +190,7 @@ RUN set -ex \
 		p7zip-full \
 		pbzip2 \
 		pst-utils \
+		python3-lxml \
 		rsync \
 		siegfried \
 		sleuthkit \

hack/Makefile

@@ -333,7 +333,7 @@ test-all: start-mysql  ## Run all tests.
 
 test-at-build:  ## AMAUAT: build image.
 	$(call compose_amauat, \
-		build archivematica-acceptance-tests)
+		build --build-arg USER_ID=$(CALLER_UID) --build-arg GROUP_ID=$(CALLER_GID) archivematica-acceptance-tests)
 
 test-at-check: test-at-build  ## AMAUAT: test browsers.
 	$(call compose_amauat, \

hack/etc/nginx/conf.d/archivematica.conf

@@ -3,6 +3,7 @@ server {
     listen 8000;
     server_name dp-processing.is.ed.ac.uk dp-storageservice.is.ed.ac.uk;
 
+<<<<<<< HEAD
     # Redirect HTTP to HTTPS
     if ($http_x_forwarded_proto = "http") {
         return 301 https://$host$request_uri;
@@ -25,12 +26,23 @@ server {
         proxy_read_timeout 172800s;
         proxy_pass $upstream_endpoint;
     }
+=======
+		proxy_set_header Host $http_host;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+		proxy_redirect off;
+		proxy_buffering off;
+		proxy_read_timeout 172800s;
+		proxy_pass $upstream_endpoint;
+	}
+>>>>>>> main
 }
 
 server {
     listen 443;
     server_name dp-processing.is.ed.ac.uk;
 
+<<<<<<< HEAD
     client_max_body_size 256M;
 
     location / {
@@ -45,6 +57,16 @@ server {
         proxy_read_timeout 172800s;
         proxy_pass $upstream_endpoint;
     }
+=======
+		proxy_set_header Host $http_host;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+		proxy_redirect off;
+		proxy_buffering off;
+		proxy_read_timeout 172800s;
+		proxy_pass $upstream_endpoint;
+	}
+>>>>>>> main
 }
 
 server {

requirements-dev.txt

@@ -10,7 +10,7 @@ amclient==1.3.0
     # via -r requirements.txt
 ammcpc==0.2.0
     # via -r requirements.txt
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   -r requirements.txt
     #   django
@@ -23,7 +23,7 @@ bagit @ git+https://github.com/artefactual-labs/bagit-python.git@4b8fde73b4e6314
     # via -r requirements.txt
 brotli==1.1.0
     # via -r requirements.txt
-build==1.1.1
+build==1.2.1
     # via pip-tools
 cachetools==5.3.3
     # via tox
@@ -47,7 +47,7 @@ click==8.1.7
     # via pip-tools
 colorama==0.4.6
     # via tox
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements-dev.in
     #   pytest-cov
@@ -66,7 +66,7 @@ django==4.2.11
     #   django-cas-ng
     #   django-csp
     #   mozilla-django-oidc
-django-auth-ldap==4.6.0
+django-auth-ldap==4.8.0
     # via -r requirements.txt
 django-autoslug==1.9.9
     # via -r requirements.txt
@@ -86,7 +86,7 @@ elasticsearch==6.8.2
     # via -r requirements.txt
 exceptiongroup==1.2.0
     # via pytest
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   tox
     #   virtualenv
@@ -106,12 +106,12 @@ idna==3.6
     # via
     #   -r requirements.txt
     #   requests
-importlib-metadata==7.0.1
+importlib-metadata==7.1.0
     # via
     #   -r requirements.txt
     #   build
     #   pytest-randomly
-importlib-resources==6.1.2
+importlib-resources==6.4.0
     # via
     #   -r requirements.txt
     #   opf-fido
@@ -131,7 +131,7 @@ jsonschema-specifications==2023.12.1
     #   jsonschema
 lazy-paged-sequence==0.3
     # via -r requirements.txt
-lxml==5.1.0
+lxml==5.2.1
     # via
     #   -r requirements.txt
     #   ammcpc
@@ -141,7 +141,7 @@ metsrw==0.5.1
     # via -r requirements.txt
 mockldap @ git+https://github.com/artefactual-labs/[email protected]
     # via -r requirements-dev.in
-mozilla-django-oidc==4.0.0
+mozilla-django-oidc==4.0.1
     # via -r requirements.txt
 mysqlclient==2.2.4
     # via
@@ -151,17 +151,17 @@ olefile==0.47
     # via
     #   -r requirements.txt
     #   opf-fido
-opf-fido==1.6.1
+opf-fido @ git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca
     # via -r requirements.txt
-packaging==23.2
+packaging==24.0
     # via
     #   -r requirements.txt
     #   build
     #   gunicorn
     #   pyproject-api
     #   pytest
     #   tox
-pip-tools==7.4.0
+pip-tools==7.4.1
     # via -r requirements-dev.in
 platformdirs==4.2.0
     # via
@@ -175,20 +175,20 @@ prometheus-client==0.20.0
     # via
     #   -r requirements.txt
     #   django-prometheus
-pyasn1==0.5.1
+pyasn1==0.6.0
     # via
     #   -r requirements.txt
     #   pyasn1-modules
     #   python-ldap
-pyasn1-modules==0.3.0
+pyasn1-modules==0.4.0
     # via
     #   -r requirements.txt
     #   python-ldap
-pycparser==2.21
+pycparser==2.22
     # via
     #   -r requirements.txt
     #   cffi
-pyopenssl==24.0.0
+pyopenssl==24.1.0
     # via
     #   -r requirements.txt
     #   josepy
@@ -198,18 +198,18 @@ pyproject-hooks==1.0.0
     # via
     #   build
     #   pip-tools
-pytest==8.0.2
+pytest==8.1.1
     # via
     #   -r requirements-dev.in
     #   pytest-cov
     #   pytest-django
     #   pytest-mock
     #   pytest-randomly
-pytest-cov==4.1.0
+pytest-cov==5.0.0
     # via -r requirements-dev.in
 pytest-django==4.8.0
     # via -r requirements-dev.in
-pytest-mock==3.12.0
+pytest-mock==3.14.0
     # via -r requirements-dev.in
 pytest-randomly==3.15.0
     # via -r requirements-dev.in
@@ -230,7 +230,7 @@ python-mimeparse==1.6.0
     # via
     #   -r requirements.txt
     #   django-tastypie
-referencing==0.33.0
+referencing==0.34.0
     # via
     #   -r requirements.txt
     #   jsonschema
@@ -267,7 +267,7 @@ tomli==2.0.1
     #   pyproject-hooks
     #   pytest
     #   tox
-tox==4.13.0
+tox==4.14.2
     # via -r requirements-dev.in
 typing-extensions==4.10.0
     # via
@@ -283,11 +283,11 @@ urllib3==2.2.1
     #   requests
 virtualenv==20.25.1
     # via tox
-wheel==0.42.0
+wheel==0.43.0
     # via pip-tools
 whitenoise==6.6.0
     # via -r requirements.txt
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   -r requirements.txt
     #   importlib-metadata
@@ -304,7 +304,7 @@ zope-interface==6.2
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.0
     # via pip-tools
-setuptools==69.1.1
+setuptools==69.2.0
     # via
     #   -r requirements.txt
     #   pip-tools

requirements.in

@@ -21,7 +21,7 @@ jsonschema
 lazy-paged-sequence
 lxml
 metsrw
-opf-fido
+git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca#opf-fido
 prometheus_client
 python-dateutil
 requests