Merge pull request #20 from meaningfy-ws/feature/mdr-69

Feature/mdr 69
meaningfy-ws · Oct 8, 2020 · c6e3e67 · c6e3e67
2 parents 465db94 + f995f31
commit c6e3e67
Show file tree

Hide file tree

Showing 63 changed files with 19 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -135,8 +135,8 @@ build/
 cucumber_report.json
 junit_report.xml
 *.ldb
-/templates/diff/o/
-/templates/itb-shacl-report/o/
+/rdf_report_templates/diff/o/
+/rdf_report_templates/itb-shacl-report/o/
 /tests/test_data/validation-reports/simple/results/
 /tests/test_data/validation-reports/simple/tests/
 /tests/test_data/validation-reports/treaties-ap/results/
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,3 @@
+recursive-include rdf_report_templates/ *
+graft rdf_report_templates
+global-exclude *.pyc *$py.class
diff --git a/eds4jinja2/__init__.py b/eds4jinja2/__init__.py
@@ -8,8 +8,8 @@
 __docformat__ = "restructuredtext en"
 
 # The format of the __version__ line is matched by a regex in setup.py and /docs/conf.py
-__version__ = "0.1.22"
-__date__ = "2020-09-16"
+__version__ = "0.1.23"
+__date__ = "2020-10-8"
 
 import logging
 

diff --git a/rdf_report_templates/__init__.py b/rdf_report_templates/__init__.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python3
+
+# __init__.py
+# Date:  08/10/2020
+# Author: Eugeniu Costetchi
+# Email: costezki.eugen@gmail.com 
+
+""" This package includes eds4jinja2 templates used by a few Meaningfy projects """
diff --git a/templates/diff/TODO.md → rdf_report_templates/diff/TODO.md b/templates/diff/TODO.md → rdf_report_templates/diff/TODO.md
diff --git a/templates/diff/config.json → rdf_report_templates/diff/config.json b/templates/diff/config.json → rdf_report_templates/diff/config.json
diff --git a/templates/diff/templates/layout.html → ...port_templates/diff/templates/layout.html b/templates/diff/templates/layout.html → ...port_templates/diff/templates/layout.html
diff --git a/templates/diff/templates/macros.html → ...port_templates/diff/templates/macros.html b/templates/diff/templates/macros.html → ...port_templates/diff/templates/macros.html
diff --git a/templates/diff/templates/main.html → ...report_templates/diff/templates/main.html b/templates/diff/templates/main.html → ...report_templates/diff/templates/main.html
diff --git a/templates/diff/templates/prefixes.json → ...rt_templates/diff/templates/prefixes.json b/templates/diff/templates/prefixes.json → ...rt_templates/diff/templates/prefixes.json
diff --git a/...tes/sections/added_instance_concepts.html → ...tes/sections/added_instance_concepts.html b/...tes/sections/added_instance_concepts.html → ...tes/sections/added_instance_concepts.html
diff --git a/...ons/added_property_concept_alt_label.html → ...ons/added_property_concept_alt_label.html b/...ons/added_property_concept_alt_label.html → ...ons/added_property_concept_alt_label.html
diff --git a/...added_property_concept_dc_identifier.html → ...added_property_concept_dc_identifier.html b/...added_property_concept_dc_identifier.html → ...added_property_concept_dc_identifier.html
diff --git a/...dded_property_concept_dct_identifier.html → ...dded_property_concept_dct_identifier.html b/...dded_property_concept_dct_identifier.html → ...dded_property_concept_dct_identifier.html
diff --git a/...added_property_concept_editorialNote.html → ...added_property_concept_editorialNote.html b/...added_property_concept_editorialNote.html → ...added_property_concept_editorialNote.html
diff --git a/...tions/added_property_concept_example.html → ...tions/added_property_concept_example.html b/...tions/added_property_concept_example.html → ...tions/added_property_concept_example.html
diff --git a/.../added_property_concept_hidden_label.html → .../added_property_concept_hidden_label.html b/.../added_property_concept_hidden_label.html → .../added_property_concept_hidden_label.html
diff --git a/.../added_property_concept_history_note.html → .../added_property_concept_history_note.html b/.../added_property_concept_history_note.html → .../added_property_concept_history_note.html
diff --git a/...ions/added_property_concept_notation.html → ...ions/added_property_concept_notation.html b/...ions/added_property_concept_notation.html → ...ions/added_property_concept_notation.html
diff --git a/...dded_property_concept_owl_deprecated.html → ...dded_property_concept_owl_deprecated.html b/...dded_property_concept_owl_deprecated.html → ...dded_property_concept_owl_deprecated.html
diff --git a/...ded_property_concept_owl_versioninfo.html → ...ded_property_concept_owl_versioninfo.html b/...ded_property_concept_owl_versioninfo.html → ...ded_property_concept_owl_versioninfo.html
diff --git a/...ns/added_property_concept_pref_label.html → ...ns/added_property_concept_pref_label.html b/...ns/added_property_concept_pref_label.html → ...ns/added_property_concept_pref_label.html
diff --git a/...ns/added_property_concept_scope_note.html → ...ns/added_property_concept_scope_note.html b/...ns/added_property_concept_scope_note.html → ...ns/added_property_concept_scope_note.html
diff --git a/...ded_property_concept_skos_changeNote.html → ...ded_property_concept_skos_changeNote.html b/...ded_property_concept_skos_changeNote.html → ...ded_property_concept_skos_changeNote.html
diff --git a/...ded_property_concept_skos_definition.html → ...ded_property_concept_skos_definition.html b/...ded_property_concept_skos_definition.html → ...ded_property_concept_skos_definition.html
diff --git a/...dded_property_concept_skos_in_scheme.html → ...dded_property_concept_skos_in_scheme.html b/...dded_property_concept_skos_in_scheme.html → ...dded_property_concept_skos_in_scheme.html
diff --git a/...ons/added_property_concept_skos_note.html → ...ons/added_property_concept_skos_note.html b/...ons/added_property_concept_skos_note.html → ...ons/added_property_concept_skos_note.html
diff --git a/...ified_concept_alt_label_literal_form.html → ...ified_concept_alt_label_literal_form.html b/...ified_concept_alt_label_literal_form.html → ...ified_concept_alt_label_literal_form.html
diff --git a/...added_reified_concept_notation_value.html → ...added_reified_concept_notation_value.html b/...added_reified_concept_notation_value.html → ...added_reified_concept_notation_value.html
diff --git a/...fied_concept_pref_label_literal_form.html → ...fied_concept_pref_label_literal_form.html b/...fied_concept_pref_label_literal_form.html → ...fied_concept_pref_label_literal_form.html
diff --git a/...s/sections/deleted_instance_concepts.html → ...s/sections/deleted_instance_concepts.html b/...s/sections/deleted_instance_concepts.html → ...s/sections/deleted_instance_concepts.html
diff --git a/...s/deleted_property_concept_alt_label.html → ...s/deleted_property_concept_alt_label.html b/...s/deleted_property_concept_alt_label.html → ...s/deleted_property_concept_alt_label.html
diff --git a/...leted_property_concept_dc_identifier.html → ...leted_property_concept_dc_identifier.html b/...leted_property_concept_dc_identifier.html → ...leted_property_concept_dc_identifier.html
diff --git a/...eted_property_concept_dct_identifier.html → ...eted_property_concept_dct_identifier.html b/...eted_property_concept_dct_identifier.html → ...eted_property_concept_dct_identifier.html
diff --git a/...leted_property_concept_editorialNote.html → ...leted_property_concept_editorialNote.html b/...leted_property_concept_editorialNote.html → ...leted_property_concept_editorialNote.html
diff --git a/...ons/deleted_property_concept_example.html → ...ons/deleted_property_concept_example.html b/...ons/deleted_property_concept_example.html → ...ons/deleted_property_concept_example.html
diff --git a/...eleted_property_concept_hidden_label.html → ...eleted_property_concept_hidden_label.html b/...eleted_property_concept_hidden_label.html → ...eleted_property_concept_hidden_label.html
diff --git a/...eleted_property_concept_history_note.html → ...eleted_property_concept_history_note.html b/...eleted_property_concept_history_note.html → ...eleted_property_concept_history_note.html
diff --git a/...ns/deleted_property_concept_notation.html → ...ns/deleted_property_concept_notation.html b/...ns/deleted_property_concept_notation.html → ...ns/deleted_property_concept_notation.html
diff --git a/...eted_property_concept_owl_deprecated.html → ...eted_property_concept_owl_deprecated.html b/...eted_property_concept_owl_deprecated.html → ...eted_property_concept_owl_deprecated.html
diff --git a/...ted_property_concept_owl_versioninfo.html → ...ted_property_concept_owl_versioninfo.html b/...ted_property_concept_owl_versioninfo.html → ...ted_property_concept_owl_versioninfo.html
diff --git a/.../deleted_property_concept_pref_label.html → .../deleted_property_concept_pref_label.html b/.../deleted_property_concept_pref_label.html → .../deleted_property_concept_pref_label.html
diff --git a/.../deleted_property_concept_scope_note.html → .../deleted_property_concept_scope_note.html b/.../deleted_property_concept_scope_note.html → .../deleted_property_concept_scope_note.html
diff --git a/...ted_property_concept_skos_changeNote.html → ...ted_property_concept_skos_changeNote.html b/...ted_property_concept_skos_changeNote.html → ...ted_property_concept_skos_changeNote.html
diff --git a/...ted_property_concept_skos_definition.html → ...ted_property_concept_skos_definition.html b/...ted_property_concept_skos_definition.html → ...ted_property_concept_skos_definition.html
diff --git a/...eted_property_concept_skos_in_scheme.html → ...eted_property_concept_skos_in_scheme.html b/...eted_property_concept_skos_in_scheme.html → ...eted_property_concept_skos_in_scheme.html
diff --git a/...s/deleted_property_concept_skos_note.html → ...s/deleted_property_concept_skos_note.html b/...s/deleted_property_concept_skos_note.html → ...s/deleted_property_concept_skos_note.html
diff --git a/...ified_concept_alt_label_literal_form.html → ...ified_concept_alt_label_literal_form.html b/...ified_concept_alt_label_literal_form.html → ...ified_concept_alt_label_literal_form.html
diff --git a/...leted_reified_concept_notation_value.html → ...leted_reified_concept_notation_value.html b/...leted_reified_concept_notation_value.html → ...leted_reified_concept_notation_value.html
diff --git a/...fied_concept_pref_label_literal_form.html → ...fied_concept_pref_label_literal_form.html b/...fied_concept_pref_label_literal_form.html → ...fied_concept_pref_label_literal_form.html
diff --git a/templates/itb-shacl-report/config.json → ...rt_templates/itb-shacl-report/config.json b/templates/itb-shacl-report/config.json → ...rt_templates/itb-shacl-report/config.json
diff --git a/...es/itb-shacl-report/templates/layout.html → ...es/itb-shacl-report/templates/layout.html b/...es/itb-shacl-report/templates/layout.html → ...es/itb-shacl-report/templates/layout.html
diff --git a/...es/itb-shacl-report/templates/macros.html → ...es/itb-shacl-report/templates/macros.html b/...es/itb-shacl-report/templates/macros.html → ...es/itb-shacl-report/templates/macros.html
diff --git a/...ates/itb-shacl-report/templates/main.html → ...ates/itb-shacl-report/templates/main.html b/...ates/itb-shacl-report/templates/main.html → ...ates/itb-shacl-report/templates/main.html
diff --git a/.../itb-shacl-report/templates/prefixes.json → .../itb-shacl-report/templates/prefixes.json b/.../itb-shacl-report/templates/prefixes.json → .../itb-shacl-report/templates/prefixes.json
diff --git a/...eport/templates/sections/simple_view.html → ...eport/templates/sections/simple_view.html b/...eport/templates/sections/simple_view.html → ...eport/templates/sections/simple_view.html
diff --git a/templates/rdfunit-shacl-report/config.json → ...emplates/rdfunit-shacl-report/config.json b/templates/rdfunit-shacl-report/config.json → ...emplates/rdfunit-shacl-report/config.json
diff --git a/...dfunit-shacl-report/templates/layout.html → ...dfunit-shacl-report/templates/layout.html b/...dfunit-shacl-report/templates/layout.html → ...dfunit-shacl-report/templates/layout.html
diff --git a/...dfunit-shacl-report/templates/macros.html → ...dfunit-shacl-report/templates/macros.html b/...dfunit-shacl-report/templates/macros.html → ...dfunit-shacl-report/templates/macros.html
diff --git a/.../rdfunit-shacl-report/templates/main.html → .../rdfunit-shacl-report/templates/main.html b/.../rdfunit-shacl-report/templates/main.html → .../rdfunit-shacl-report/templates/main.html
diff --git a/...unit-shacl-report/templates/prefixes.json → ...unit-shacl-report/templates/prefixes.json b/...unit-shacl-report/templates/prefixes.json → ...unit-shacl-report/templates/prefixes.json
diff --git a/...eport/templates/sections/simple_view.html → ...eport/templates/sections/simple_view.html b/...eport/templates/sections/simple_view.html → ...eport/templates/sections/simple_view.html
diff --git a/setup.py b/setup.py
@@ -38,7 +38,11 @@ def find_version(filename):
     install_requires=requirements,
     tests_require=requirements_dev,
     extras_require=extras,
+    packages=find_packages(exclude=("test*",)),
     include_package_data=True,
+    # data_files={
+    #     'eds4jinja2_templates': ['templates/**/*'],
+    # },
     # package_data={'': ['*.txt'], },
     author="Eugeniu Costetchi",
     author_email="costezki.eugen@gmail.com",
@@ -52,7 +56,6 @@ def find_version(filename):
     url="https://github.com/meaningfy-ws/eds4jinja2",
     platforms='any',
     keywords='template, jinja, report, report generation, rdf, sparql, linked-data, data-source, dynamic-context',
-    packages=find_packages(exclude=("tests",)),
     # exclude=["tests", "test_*"],
     classifiers=[
         "Development Status :: 3 - Alpha",