Remove archivematicaCommon/lib directory

artefactual · Oct 17, 2024 · aac0a6c · aac0a6c
1 parent 7de35a2
commit aac0a6c
Show file tree

Hide file tree

Showing 37 changed files with 10 additions and 11 deletions.
diff --git a/hack/Dockerfile b/hack/Dockerfile
@@ -224,15 +224,15 @@ COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
 FROM base AS archivematica-mcp-client
 
 ENV DJANGO_SETTINGS_MODULE=settings.common
-ENV PYTHONPATH=/src/src/MCPClient/:/src/src/MCPClient/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
+ENV PYTHONPATH=/src/src/MCPClient/:/src/src/MCPClient/clientScripts:/src/src/archivematicaCommon/:/src/src/dashboard/
 ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES=/src/src/MCPClient/archivematicaClientModules
 ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY=/src/src/MCPClient/assets/
 ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY=/src/src/MCPClient/clientScripts/
 
 # Some scripts in archivematica-fpr-admin executed by MCPClient rely on certain
 # files being available in this image (e.g. see https://git.io/vA1wF).
-COPY --link src/archivematicaCommon/lib/externals/fido/ /usr/lib/archivematica/archivematicaCommon/externals/fido/
-COPY --link src/archivematicaCommon/lib/externals/fiwalk_plugins/ /usr/lib/archivematica/archivematicaCommon/externals/fiwalk_plugins/
+COPY --link src/archivematicaCommon/externals/fido/ /usr/lib/archivematica/archivematicaCommon/externals/fido/
+COPY --link src/archivematicaCommon/externals/fiwalk_plugins/ /usr/lib/archivematica/archivematicaCommon/externals/fiwalk_plugins/
 
 ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient.py"]
 
@@ -241,7 +241,7 @@ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient.
 FROM base AS archivematica-mcp-server
 
 ENV DJANGO_SETTINGS_MODULE=settings.common
-ENV PYTHONPATH=/src/src/MCPServer/:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
+ENV PYTHONPATH=/src/src/MCPServer/:/src/src/archivematicaCommon/:/src/src/dashboard/
 
 ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPServer/archivematicaMCP.py"]
 
@@ -271,7 +271,7 @@ COPY --chown=${USER_ID}:${GROUP_ID} --from=archivematica-dashboard-frontend-buil
 WORKDIR /src/src/dashboard
 
 ENV DJANGO_SETTINGS_MODULE=settings.local
-ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/lib/
+ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/
 ENV AM_GUNICORN_BIND=0.0.0.0:8000
 ENV AM_GUNICORN_CHDIR=/src/src/dashboard
 ENV FORWARDED_ALLOW_IPS=*
@@ -305,7 +305,7 @@ RUN set -ex \
 	&& mkdir -p /var/archivematica/.cache/ms-playwright \
 	&& python3 -m playwright install firefox
 
-ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/lib/
+ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/
 
 # -----------------------------------------------------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ norecursedirs = ".svn _build tmp* node_modules bower_components share .tox"
 
 [tool.coverage.run]
 omit = [
-    "**/src/archivematicaCommon/lib/externals/*",
+    "**/src/archivematicaCommon/externals/*",
     "**/migrations/*",
     "**/south_migrations/*",
     "**/management/commands/*",
@@ -15,7 +15,7 @@ omit = [
     "**/manage.py",
 ]
 include = [
-    "**/src/archivematicaCommon/lib/*",
+    "**/src/archivematicaCommon/*",
     "**/src/dashboard/*",
     "**/src/MCPClient/*",
     "**/src/MCPServer/*",
@@ -118,8 +118,7 @@ legacy_tox_ini = """
         SRC_DIR = {toxinidir}/src
         HACK_DIR = {toxinidir}/hack
         # Archivematica Common
-        ARCHIVEMATICA_COMMON_ROOT = {env:SRC_DIR}/archivematicaCommon
-        ARCHIVEMATICA_COMMON_DIR = {env:ARCHIVEMATICA_COMMON_ROOT}/lib
+        ARCHIVEMATICA_COMMON_DIR = {env:SRC_DIR}/archivematicaCommon
         # Dashboard
         DASHBOARD_DIR = {env:SRC_DIR}/dashboard
         DASHBOARD_PYTHONPATH = {env:DASHBOARD_DIR}:{env:ARCHIVEMATICA_COMMON_DIR}

diff --git a/src/archivematicaCommon/lib/__init__.py → src/archivematicaCommon/__init__.py b/src/archivematicaCommon/lib/__init__.py → src/archivematicaCommon/__init__.py
diff --git a/src/archivematicaCommon/lib/appconfig.py → src/archivematicaCommon/appconfig.py b/src/archivematicaCommon/lib/appconfig.py → src/archivematicaCommon/appconfig.py
diff --git a/...aticaCommon/lib/archivematicaFunctions.py → ...ivematicaCommon/archivematicaFunctions.py b/...aticaCommon/lib/archivematicaFunctions.py → ...ivematicaCommon/archivematicaFunctions.py
diff --git a/src/archivematicaCommon/lib/bag.py → src/archivematicaCommon/bag.py b/src/archivematicaCommon/lib/bag.py → src/archivematicaCommon/bag.py
diff --git a/src/archivematicaCommon/lib/bindpid.py → src/archivematicaCommon/bindpid.py b/src/archivematicaCommon/lib/bindpid.py → src/archivematicaCommon/bindpid.py
diff --git a/...archivematicaCommon/lib/common_metrics.py → src/archivematicaCommon/common_metrics.py b/...archivematicaCommon/lib/common_metrics.py → src/archivematicaCommon/common_metrics.py
diff --git a/src/archivematicaCommon/lib/countryCodes.py → src/archivematicaCommon/countryCodes.py b/src/archivematicaCommon/lib/countryCodes.py → src/archivematicaCommon/countryCodes.py
diff --git a/...rchivematicaCommon/lib/custom_handlers.py → src/archivematicaCommon/custom_handlers.py b/...rchivematicaCommon/lib/custom_handlers.py → src/archivematicaCommon/custom_handlers.py
diff --git a/...hivematicaCommon/lib/databaseFunctions.py → src/archivematicaCommon/databaseFunctions.py b/...hivematicaCommon/lib/databaseFunctions.py → src/archivematicaCommon/databaseFunctions.py
diff --git a/src/archivematicaCommon/lib/dbconns.py → src/archivematicaCommon/dbconns.py b/src/archivematicaCommon/lib/dbconns.py → src/archivematicaCommon/dbconns.py
diff --git a/src/archivematicaCommon/lib/dicts.py → src/archivematicaCommon/dicts.py b/src/archivematicaCommon/lib/dicts.py → src/archivematicaCommon/dicts.py
diff --git a/...aticaCommon/lib/elasticSearchFunctions.py → ...ivematicaCommon/elasticSearchFunctions.py b/...aticaCommon/lib/elasticSearchFunctions.py → ...ivematicaCommon/elasticSearchFunctions.py
diff --git a/...archivematicaCommon/lib/email_settings.py → src/archivematicaCommon/email_settings.py b/...archivematicaCommon/lib/email_settings.py → src/archivematicaCommon/email_settings.py
diff --git a/...chivematicaCommon/lib/env_configparser.py → src/archivematicaCommon/env_configparser.py b/...chivematicaCommon/lib/env_configparser.py → src/archivematicaCommon/env_configparser.py
diff --git a/...aticaCommon/lib/executeOrRunSubProcess.py → ...ivematicaCommon/executeOrRunSubProcess.py b/...aticaCommon/lib/executeOrRunSubProcess.py → ...ivematicaCommon/executeOrRunSubProcess.py
diff --git a/...vematicaCommon/lib/externals/HTML/HTML.py → ...rchivematicaCommon/externals/HTML/HTML.py b/...vematicaCommon/lib/externals/HTML/HTML.py → ...rchivematicaCommon/externals/HTML/HTML.py
diff --git a/.../externals/HTML/Licence_CeCILL_V2-en.html → .../externals/HTML/Licence_CeCILL_V2-en.html b/.../externals/HTML/Licence_CeCILL_V2-en.html → .../externals/HTML/Licence_CeCILL_V2-en.html
diff --git a/.../externals/HTML/Licence_CeCILL_V2-fr.html → .../externals/HTML/Licence_CeCILL_V2-fr.html b/.../externals/HTML/Licence_CeCILL_V2-fr.html → .../externals/HTML/Licence_CeCILL_V2-fr.html
diff --git a/...ticaCommon/lib/externals/HTML/__init__.py → ...vematicaCommon/externals/HTML/__init__.py b/...ticaCommon/lib/externals/HTML/__init__.py → ...vematicaCommon/externals/HTML/__init__.py
diff --git a/...ivematicaCommon/lib/externals/__init__.py → ...archivematicaCommon/externals/__init__.py b/...ivematicaCommon/lib/externals/__init__.py → ...archivematicaCommon/externals/__init__.py
diff --git a/...ib/externals/extractMaildirAttachments.py → ...on/externals/extractMaildirAttachments.py b/...ib/externals/extractMaildirAttachments.py → ...on/externals/extractMaildirAttachments.py
diff --git a/.../fido/archivematica_format_extensions.xml → .../fido/archivematica_format_extensions.xml b/.../fido/archivematica_format_extensions.xml → .../fido/archivematica_format_extensions.xml
diff --git a/...lib/externals/fiwalk_plugins/ficonfig.txt → ...mon/externals/fiwalk_plugins/ficonfig.txt b/...lib/externals/fiwalk_plugins/ficonfig.txt → ...mon/externals/fiwalk_plugins/ficonfig.txt
diff --git a/.../externals/fiwalk_plugins/pronom_ident.py → .../externals/fiwalk_plugins/pronom_ident.py b/.../externals/fiwalk_plugins/pronom_ident.py → .../externals/fiwalk_plugins/pronom_ident.py
diff --git a/...ticaCommon/lib/externals/maildirToMbox.py → ...vematicaCommon/externals/maildirToMbox.py b/...ticaCommon/lib/externals/maildirToMbox.py → ...vematicaCommon/externals/maildirToMbox.py
diff --git a/...vematicaCommon/lib/externals/xmltodict.py → ...rchivematicaCommon/externals/xmltodict.py b/...vematicaCommon/lib/externals/xmltodict.py → ...rchivematicaCommon/externals/xmltodict.py
diff --git a/...archivematicaCommon/lib/fileOperations.py → src/archivematicaCommon/fileOperations.py b/...archivematicaCommon/lib/fileOperations.py → src/archivematicaCommon/fileOperations.py
diff --git a/...rchivematicaCommon/lib/gearman_encoder.py → src/archivematicaCommon/gearman_encoder.py b/...rchivematicaCommon/lib/gearman_encoder.py → src/archivematicaCommon/gearman_encoder.py
diff --git a/...ematicaCommon/lib/identifier_functions.py → ...chivematicaCommon/identifier_functions.py b/...ematicaCommon/lib/identifier_functions.py → ...chivematicaCommon/identifier_functions.py
diff --git a/src/archivematicaCommon/lib/namespaces.py → src/archivematicaCommon/namespaces.py b/src/archivematicaCommon/lib/namespaces.py → src/archivematicaCommon/namespaces.py
diff --git a/src/archivematicaCommon/lib/processing.py → src/archivematicaCommon/processing.py b/src/archivematicaCommon/lib/processing.py → src/archivematicaCommon/processing.py
diff --git a/...archivematicaCommon/lib/storageService.py → src/archivematicaCommon/storageService.py b/...archivematicaCommon/lib/storageService.py → src/archivematicaCommon/storageService.py
diff --git a/src/archivematicaCommon/lib/version.py → src/archivematicaCommon/version.py b/src/archivematicaCommon/lib/version.py → src/archivematicaCommon/version.py
diff --git a/src/archivematicaCommon/lib/xml2obj.py → src/archivematicaCommon/xml2obj.py b/src/archivematicaCommon/lib/xml2obj.py → src/archivematicaCommon/xml2obj.py
diff --git a/src/dashboard/main/migrations/0041_bind_pids.py b/src/dashboard/main/migrations/0041_bind_pids.py
@@ -23,7 +23,7 @@ def data_migration(apps, schema_editor):
     PID---generally the UUID of the entity---is passed during handle creation.)
     That the PURL (i.e., PID's URL) may be configured to resolve to
     different external (resolve) URLs depending on the qualifier (GET query
-    parameter) that is appended to it. See archivematicaCommon/lib/bindpid.py
+    parameter) that is appended to it. See archivematicaCommon/bindpid.py
     for more details.
     """