Changed folder layout.

FAIRmat-NFDI · May 17, 2024 · 819126b · 819126b
1 parent d8a621b
commit 819126b
Show file tree

Hide file tree

Showing 37 changed files with 22 additions and 24 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -121,6 +121,6 @@ where = ["src"]
 
 [project.entry-points.'nomad.plugin']
 
-perovskite_solar_cell_database = "perovskite_solar_cell_database.schema_packages:perovskite_solar_cell_database"
+perovskite_solar_cell_database = "perovskite_solar_cell_database:schema"
 
 # myapp = "nomad_solar_cells_efficiency_tables.apps:myapp"
diff --git a/src/perovskite_solar_cell_database/__init__.py b/src/perovskite_solar_cell_database/__init__.py
@@ -0,0 +1,19 @@
+from nomad.config.models.plugins import SchemaPackageEntryPoint
+from pydantic import Field
+
+
+class PerovskiteDatabasePackageEntryPoint(SchemaPackageEntryPoint):
+    # parameter: int = Field(0, description='Custom configuration parameter')
+
+    def load(self):
+        from perovskite_solar_cell_database.schema import (
+            m_package,
+        )
+
+        return m_package
+
+
+schema = PerovskiteDatabasePackageEntryPoint(
+    name='PerovskiteSolarCell',
+    description='Schema package defined for the perovskite solar cells database.',
+)
diff --git a/.../schema_packages/data_tools/AM15G.dat.txt → ...ar_cell_database/data_tools/AM15G.dat.txt b/.../schema_packages/data_tools/AM15G.dat.txt → ...ar_cell_database/data_tools/AM15G.dat.txt
diff --git a/...base/schema_packages/data_tools/README.md → ..._solar_cell_database/data_tools/README.md b/...base/schema_packages/data_tools/README.md → ..._solar_cell_database/data_tools/README.md
diff --git a/...se/schema_packages/data_tools/__init__.py → ...olar_cell_database/data_tools/__init__.py b/...se/schema_packages/data_tools/__init__.py → ...olar_cell_database/data_tools/__init__.py
diff --git a/...chema_packages/data_tools/entry_writer.py → ..._cell_database/data_tools/entry_writer.py b/...chema_packages/data_tools/entry_writer.py → ..._cell_database/data_tools/entry_writer.py
diff --git a/.../schema_packages/data_tools/eqe_parser.py → ...ar_cell_database/data_tools/eqe_parser.py b/.../schema_packages/data_tools/eqe_parser.py → ...ar_cell_database/data_tools/eqe_parser.py
diff --git a/...e/schema_packages/data_tools/jv_parser.py → ...lar_cell_database/data_tools/jv_parser.py b/...e/schema_packages/data_tools/jv_parser.py → ...lar_cell_database/data_tools/jv_parser.py
diff --git a/...ackages/perovskite_solar_cell_database.py → src/perovskite_solar_cell_database/schema.py b/...ackages/perovskite_solar_cell_database.py → src/perovskite_solar_cell_database/schema.py
@@ -33,9 +33,7 @@
 )
 from nomad.metainfo import Package, Section, SubSection, SchemaPackage
 
-configuration = config.get_plugin_entry_point(
-    'perovskite_solar_cell_database.schema_packages:perovskite_solar_cell_database'
-)
+configuration = config.get_plugin_entry_point('perovskite_solar_cell_database:schema')
 
 m_package = SchemaPackage()
 

diff --git a/src/perovskite_solar_cell_database/schema_packages/__init__.py b/src/perovskite_solar_cell_database/schema_packages/__init__.py
diff --git a/...hema_packages/schema_sections/__init__.py → ...cell_database/schema_sections/__init__.py b/...hema_packages/schema_sections/__init__.py → ...cell_database/schema_sections/__init__.py
diff --git a/...se/schema_packages/schema_sections/add.py → ...olar_cell_database/schema_sections/add.py b/...se/schema_packages/schema_sections/add.py → ...olar_cell_database/schema_sections/add.py
diff --git a/...a_packages/schema_sections/backcontact.py → ...l_database/schema_sections/backcontact.py b/...a_packages/schema_sections/backcontact.py → ...l_database/schema_sections/backcontact.py
diff --git a/...e/schema_packages/schema_sections/cell.py → ...lar_cell_database/schema_sections/cell.py b/...e/schema_packages/schema_sections/cell.py → ...lar_cell_database/schema_sections/cell.py
diff --git a/...packages/schema_sections/encapsulation.py → ...database/schema_sections/encapsulation.py b/...packages/schema_sections/encapsulation.py → ...database/schema_sections/encapsulation.py
diff --git a/...se/schema_packages/schema_sections/eqe.py → ...olar_cell_database/schema_sections/eqe.py b/...se/schema_packages/schema_sections/eqe.py → ...olar_cell_database/schema_sections/eqe.py
diff --git a/...se/schema_packages/schema_sections/etl.py → ...olar_cell_database/schema_sections/etl.py b/...se/schema_packages/schema_sections/etl.py → ...olar_cell_database/schema_sections/etl.py
diff --git a/...ges/schema_sections/formula_normalizer.py → ...ase/schema_sections/formula_normalizer.py b/...ges/schema_sections/formula_normalizer.py → ...ase/schema_sections/formula_normalizer.py
diff --git a/...se/schema_packages/schema_sections/htl.py → ...olar_cell_database/schema_sections/htl.py b/...se/schema_packages/schema_sections/htl.py → ...olar_cell_database/schema_sections/htl.py
diff --git a/...ages/schema_sections/ions/A-ion_data.xlsx → ...base/schema_sections/ions/A-ion_data.xlsx b/...ages/schema_sections/ions/A-ion_data.xlsx → ...base/schema_sections/ions/A-ion_data.xlsx
diff --git a/...ages/schema_sections/ions/B-ion_data.xlsx → ...base/schema_sections/ions/B-ion_data.xlsx b/...ages/schema_sections/ions/B-ion_data.xlsx → ...base/schema_sections/ions/B-ion_data.xlsx
diff --git a/...ages/schema_sections/ions/C-ion_data.xlsx → ...base/schema_sections/ions/C-ion_data.xlsx b/...ages/schema_sections/ions/C-ion_data.xlsx → ...base/schema_sections/ions/C-ion_data.xlsx
diff --git a/...packages/schema_sections/ions/__init__.py → ...database/schema_sections/ions/__init__.py b/...packages/schema_sections/ions/__init__.py → ...database/schema_sections/ions/__init__.py
diff --git a/...hema_packages/schema_sections/ions/ion.py → ...cell_database/schema_sections/ions/ion.py b/...hema_packages/schema_sections/ions/ion.py → ...cell_database/schema_sections/ions/ion.py
diff --git a/...packages/schema_sections/ions/ion_vars.py → ...database/schema_sections/ions/ion_vars.py b/...packages/schema_sections/ions/ion_vars.py → ...database/schema_sections/ions/ion_vars.py
diff --git a/...ase/schema_packages/schema_sections/jv.py → ...solar_cell_database/schema_sections/jv.py b/...ase/schema_packages/schema_sections/jv.py → ...solar_cell_database/schema_sections/jv.py
diff --git a/...schema_packages/schema_sections/module.py → ...r_cell_database/schema_sections/module.py b/...schema_packages/schema_sections/module.py → ...r_cell_database/schema_sections/module.py
diff --git a/...chema_packages/schema_sections/outdoor.py → ..._cell_database/schema_sections/outdoor.py b/...chema_packages/schema_sections/outdoor.py → ..._cell_database/schema_sections/outdoor.py
diff --git a/...ma_packages/schema_sections/perovskite.py → ...ll_database/schema_sections/perovskite.py b/...ma_packages/schema_sections/perovskite.py → ...ll_database/schema_sections/perovskite.py
diff --git a/.../schema_sections/perovskite_deposition.py → .../schema_sections/perovskite_deposition.py b/.../schema_sections/perovskite_deposition.py → .../schema_sections/perovskite_deposition.py
diff --git a/...se/schema_packages/schema_sections/ref.py → ...olar_cell_database/schema_sections/ref.py b/...se/schema_packages/schema_sections/ref.py → ...olar_cell_database/schema_sections/ref.py
diff --git a/...ma_packages/schema_sections/stabilised.py → ...ll_database/schema_sections/stabilised.py b/...ma_packages/schema_sections/stabilised.py → ...ll_database/schema_sections/stabilised.py
diff --git a/...ema_packages/schema_sections/stability.py → ...ell_database/schema_sections/stability.py b/...ema_packages/schema_sections/stability.py → ...ell_database/schema_sections/stability.py
diff --git a/...ema_packages/schema_sections/substrate.py → ...ell_database/schema_sections/substrate.py b/...ema_packages/schema_sections/substrate.py → ...ell_database/schema_sections/substrate.py
diff --git a/.../schema_packages/schema_sections/utils.py → ...ar_cell_database/schema_sections/utils.py b/.../schema_packages/schema_sections/utils.py → ...ar_cell_database/schema_sections/utils.py
diff --git a/...e/schema_packages/schema_sections/vars.py → ...lar_cell_database/schema_sections/vars.py b/...e/schema_packages/schema_sections/vars.py → ...lar_cell_database/schema_sections/vars.py
diff --git a/tests/data/example.archive.json b/tests/data/example.archive.json
@@ -1,6 +1,6 @@
 {
     "data": {
-        "m_def": "perovskite_solar_cell_database.schema_packages.perovskite_solar_cell_database.PerovskiteSolarCell",
+        "m_def": "perovskite_solar_cell_database.schema.PerovskiteSolarCell",
         "ref": {
             "ID": 36709,
             "ID_temp": 36709,