Merge pull request #480 from softwarepub/refactor/data-model

(Draft) New Data Model

Author: SKernchen

.flake8

@@ -7,3 +7,10 @@ max-complexity = 15
 max-line-length = 120
 per-file-ignores =
     src/hermes/commands/marketplace.py:E231
+exclude =
+    migrations
+    __pycache__
+    manage.py
+    settings.py
+    venv
+    .venv

.github/workflows/hermes-zenodo.yml

@@ -41,8 +41,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-      - run: pip install hermes hermes-plugin-python
+          python-version: '3.11'
+      - run: pip install git+https://github.com/softwarepub/hermes.git
       - run: hermes harvest
       - run: hermes process
       - run: hermes curate
@@ -85,13 +85,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-      - run: pip install hermes
+          python-version: '3.11'
+      - run: pip install git+https://github.com/softwarepub/hermes.git
 
       # ADAPT
       # If you want to publish artifacts (e.g., a zipped snapshot of your repository),
       # you can prepare this here.
-      - run: git archive --format zip HEAD src > hermes.zip
+      - run: git archive --format zip HEAD > hermes.zip
 
       # Run the HERMES deposition and postprocessing steps.
       # ADAPT

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.12"]  # Ignore Python < 3.11, they are unsupported
+        python-version: ["3.11"]  # Ignore Python < 3.11, they are unsupported
 
     steps:
       - uses: actions/checkout@v4

LICENSE.md

@@ -11,11 +11,11 @@ SPDX-FileContributor: Stephan Druskat
 ## Licenses
 
 The work contained in this repository is licensed under different licenses:
-- Source code is licensed under [`Apache-2.0`](LICENSES/Apache-2.0.txt).
-- Documentation (including images) is licensed under [`CC BY-SA 4.0`](LICENSES/CC-BY-SA-4.0.txt).
-- The HERMES visual ("logo") is licensed under [`CC BY-ND 4.0`](LICENSES/CC-BY-ND-4.0.txt).
-- Other files are licensed under [`CC0-1.0`](LICENSES/CC0-1.0.txt).
- 
+- Source code is licensed under [`Apache-2.0`](/../../LICENSES/Apache-2.0.txt). <!-- Paths start at docs/source/ -->
+- Documentation (including images) is licensed under [`CC BY-SA 4.0`](/../../LICENSES/CC-BY-SA-4.0.txt).
+- The HERMES visual ("logo") is licensed under [`CC BY-ND 4.0`](/../../LICENSES/CC-BY-ND-4.0.txt).
+- Other files are licensed under [`CC0-1.0`](/../../LICENSES/CC0-1.0.txt).
+
 Please see the individual files for more accurate information.
 Please also let us know in a new issue if you find content that seems to be unlicensed.
 

LICENSES/CC-BY-SA-3.0.txt

@@ -0,0 +1,17 @@
+This work is being provided by the copyright holders under the following license.
+
+License
+By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
+
+     • The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+     • Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
+     • Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright (c) [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.

LICENSES/W3C-20150513.txt

@@ -17,3 +17,9 @@ path = ["REUSE.toml"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "German Aerospace Center (DLR), Helmholtz-Zentrum Dresden-Rossendorf, Forschungszentrum Jülich"
 SPDX-License-Identifier = "CC0-1.0"
+
+[[annotations]]
+path = ["src/**/*.py", "test/**/*.py"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "German Aerospace Center (DLR), Helmholtz-Zentrum Dresden-Rossendorf, Forschungszentrum Jülich"
+SPDX-License-Identifier = "Apache-2.0"

REUSE.toml

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2026 German Aerospace Center (DLR)
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# SPDX-FileContributor: Michael Fritzsche
+
+# add option to pass zenodo sandbox auth token to pytest to run ./test/hermes_test/commands/deposit/test_invenio_e2e.py
+def pytest_addoption(parser):
+    parser.addoption("--sandbox_auth", action="store", default=None)