Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor version to v20 (2.0) in all files #21 #168

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Refactor version to v20 (2.0) in all files #21 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e69a3
Refactor version to v20 in all files #21
Ludee Oct 16, 2024
6778f0c
Update changelog #21
Ludee Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Here is a template for new release sections
- Update broken Link in key description example [(#159)](https://github.com/OpenEnergyPlatform/oemetadata/pull/159)
- Update resource/profile to resource/type [(#164)](https://github.com/OpenEnergyPlatform/oemetadata/pull/164)
- Update links in context.json and example.json for all versions [(#167)](https://github.com/OpenEnergyPlatform/oemetadata/pull/167)
- Restrict the version number to only major and minor versions since 2.0 [(#168)](https://github.com/OpenEnergyPlatform/oemetadata/pull/168)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/context.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/context.json",
"$id": "general.json#metadata/v20/schemas/context.json",
"type": "object",
"properties": {
"context": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/contribution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/contribution.json",
"$id": "general.json#metadata/v20/schemas/contribution.json",
"type": "object",
"properties": {
"contributors": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/general.json",
"$id": "general.json#metadata/v20/schemas/general.json",
"type": "object",
"properties": {
"name": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/json_ld.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "json_ld.json#metadata/v200_draft/schemas/json_ld.json",
"$id": "json_ld.json#metadata/v20/schemas/json_ld.json",
"type": "object",
"properties": {
"@id": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/licences.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/licences.json",
"$id": "general.json#metadata/v20/schemas/licences.json",
"type": "object",
"properties": {
"licenses": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/meta.json",
"$id": "general.json#metadata/v20/schemas/meta.json",
"type": "object",
"properties": {
"metaMetadata": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/resources.json",
"$id": "general.json#metadata/v20/schemas/resources.json",
"type": "object",
"properties": {
"resources": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/review.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/review.json",
"$id": "general.json#metadata/v20/schemas/review.json",
"type": "object",
"properties": {
"review": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/sources.json",
"$id": "general.json#metadata/v20/schemas/sources.json",
"type": "object",
"properties": {
"sources": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/spatial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/spatial.json",
"$id": "general.json#metadata/v20/schemas/spatial.json",
"type": "object",
"properties": {
"spatial": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/schemas/temporal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/temporal.json",
"$id": "general.json#metadata/v20/schemas/temporal.json",
"type": "object",
"properties": {
"temporal": {
Expand Down
2 changes: 1 addition & 1 deletion metadata/latest/build_source/scripts/resolve_schema_refs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Constants
BASE_PATH = Path("metadata/")
VERSION = "v200_draft"
VERSION = "v20"
VERSION_PATH = BASE_PATH / VERSION
SCHEMA_BUILD_PATH = VERSION_PATH / "build"
MAIN_SCHEMA_PATH = SCHEMA_BUILD_PATH / "main_schema.json"
Expand Down
0 metadata/v200_draft/README.md → metadata/v20/README.md
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/__init__.py → metadata/v20/__init__.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ..._draft/build_source/schema_structure.json → ...ta/v20/build_source/schema_structure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/OpenEnergyPlatform/oemetadata/master/oemetadata/latest/schema.json",
"description": "Open Energy Plaftorm (OEP) metadata schema latest",
"description": "Open Energy Platform (OEP) metadata schema latest",
"type": "object",
"properties": {
"generalCollection": {
"$ref": "general_collection.json#"
"collection": {
"$ref": "collection.json#"
},
"resources": {
"description": "A collection of related data resource descriptions and metadata. This may include relational data models which are technically related",
Expand Down
2 changes: 1 addition & 1 deletion ...ld_source/schemas/general_collection.json → .../v20/build_source/schemas/collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/general_collection.json",
"$id": "general.json#metadata/v20/schemas/collection.json",
"type": "object",
"properties": {
"name": {
Expand Down
2 changes: 1 addition & 1 deletion ...0_draft/build_source/schemas/context.json → ...ata/v20/build_source/schemas/context.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/context.json",
"$id": "general.json#metadata/v20/schemas/context.json",
"type": "object",
"properties": {
"context": {
Expand Down
2 changes: 1 addition & 1 deletion ...0_draft/build_source/schemas/general.json → ...ata/v20/build_source/schemas/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/general.json",
"$id": "general.json#metadata/v20/schemas/general.json",
"type": "object",
"properties": {
"name": {
Expand Down
2 changes: 1 addition & 1 deletion ..._draft/build_source/schemas/licences.json → ...ta/v20/build_source/schemas/licences.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/licences.json",
"$id": "general.json#metadata/v20/schemas/licences.json",
"type": "object",
"properties": {
"licenses": {
Expand Down
2 changes: 1 addition & 1 deletion ...aft/build_source/schemas/linked_data.json → ...v20/build_source/schemas/linked_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/linked_data.json",
"$id": "general.json#metadata/v20/schemas/linked_data.json",
"type": "object",
"properties": {
"linkedData": {
Expand Down
2 changes: 1 addition & 1 deletion ...v200_draft/build_source/schemas/meta.json → metadata/v20/build_source/schemas/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/meta.json",
"$id": "general.json#metadata/v20/schemas/meta.json",
"type": "object",
"properties": {
"metaMetadata": {
Expand Down
2 changes: 1 addition & 1 deletion ...raft/build_source/schemas/provenance.json → .../v20/build_source/schemas/provenance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/provenance.json",
"$id": "general.json#metadata/v20/schemas/provenance.json",
"type": "object",
"properties": {
"provenance": {
Expand Down
2 changes: 1 addition & 1 deletion ..._draft/build_source/schemas/resource.json → ...ta/v20/build_source/schemas/resource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/resource.json",
"$id": "general.json#metadata/v20/schemas/resource.json",
"type": "object",
"properties": {
"type": {
Expand Down
2 changes: 1 addition & 1 deletion ...00_draft/build_source/schemas/review.json → ...data/v20/build_source/schemas/review.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/review.json",
"$id": "general.json#metadata/v20/schemas/review.json",
"type": "object",
"properties": {
"review": {
Expand Down
2 changes: 1 addition & 1 deletion ...0_draft/build_source/schemas/sources.json → ...ata/v20/build_source/schemas/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/sources.json",
"$id": "general.json#metadata/v20/schemas/sources.json",
"type": "object",
"properties": {
"sources": {
Expand Down
2 changes: 1 addition & 1 deletion ...0_draft/build_source/schemas/spatial.json → ...ata/v20/build_source/schemas/spatial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/spatial.json",
"$id": "general.json#metadata/v20/schemas/spatial.json",
"type": "object",
"properties": {
"spatial": {
Expand Down
2 changes: 1 addition & 1 deletion ..._draft/build_source/schemas/temporal.json → ...ta/v20/build_source/schemas/temporal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "general.json#metadata/v200_draft/schemas/temporal.json",
"$id": "general.json#metadata/v20/schemas/temporal.json",
"type": "object",
"properties": {
"temporal": {
Expand Down
2 changes: 1 addition & 1 deletion ...e/scripts/generate_example_from_schema.py → ...e/scripts/generate_example_from_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

# Constants
BASE_PATH = Path("metadata/")
VERSION = "v200_draft"
VERSION = "v20"
VERSION_PATH = BASE_PATH / VERSION
SCHEMA_BUILD_PATH = VERSION_PATH / "build_source"
MAIN_SCHEMA_PATH = SCHEMA_BUILD_PATH / "schema_structure.json"
Expand Down
2 changes: 1 addition & 1 deletion .../scripts/generate_template_from_schema.py → .../scripts/generate_template_from_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

# Constants
BASE_PATH = Path("metadata/")
VERSION = "v200_draft"
VERSION = "v20"
VERSION_PATH = BASE_PATH / VERSION
SCHEMA_BUILD_PATH = VERSION_PATH / "build_source"
MAIN_SCHEMA_PATH = SCHEMA_BUILD_PATH / "schema_structure.json"
Expand Down
2 changes: 1 addition & 1 deletion ...ild_source/scripts/resolve_schema_refs.py → ...ild_source/scripts/resolve_schema_refs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Constants
BASE_PATH = Path("metadata/")
VERSION = "v200_draft"
VERSION = "v20"
VERSION_PATH = BASE_PATH / VERSION
SCHEMA_BUILD_PATH = VERSION_PATH / "build_source"
MAIN_SCHEMA_PATH = SCHEMA_BUILD_PATH / "schema_structure.json"
Expand Down
0 metadata/v200_draft/context.json → metadata/v20/context.json
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/example.json → metadata/v20/example.json
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/example.py → metadata/v20/example.py
View file
Open in desktop
File renamed without changes.
0 ...ta/v200_draft/metadata_key_description.md → metadata/v20/metadata_key_description.md
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/schema.json → metadata/v20/schema.json
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/schema.py → metadata/v20/schema.py
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/template.json → metadata/v20/template.json
View file
Open in desktop
File renamed without changes.
0 metadata/v200_draft/template.py → metadata/v20/template.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/metadata/v200/test_example.py → tests/metadata/v20/test_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
def test_if_example_json_loads_successfully():
from metadata.v200_draft.example import OEMETADATA_V200_EXAMPLE
from metadata.v20.example import OEMETADATA_V200_EXAMPLE


def test_example_against_schema_which_should_succeed():
import jsonschema
from metadata.v200_draft.example import OEMETADATA_V200_EXAMPLE
from metadata.v200_draft.schema import OEMETADATA_V200_SCHEMA
from metadata.v20.example import OEMETADATA_V200_EXAMPLE
from metadata.v20.schema import OEMETADATA_V200_SCHEMA

assert jsonschema.validate(OEMETADATA_V200_EXAMPLE, OEMETADATA_V200_SCHEMA) == None
6 changes: 3 additions & 3 deletions tests/metadata/v200/test_schema.py → tests/metadata/v20/test_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
def test_if_schema_json_loads_successfully():
try:
from metadata.v200_draft.schema import OEMETADATA_V200_SCHEMA
from metadata.v20.schema import OEMETADATA_V200_SCHEMA
except Warning:
print("Metadata Schema v2.0.0 cant load. Check if the files are missing!")


def test_if_schema_json_has_correct_schema_and_id_set():
from metadata.v200_draft.schema import OEMETADATA_V200_SCHEMA
from metadata.v20.schema import OEMETADATA_V200_SCHEMA
import string

def get_string(s):
Expand All @@ -23,7 +23,7 @@ def get_string(s):

def test_schema_against_metaschema_which_should_succeed():
import jsonschema
from metadata.v200_draft.schema import OEMETADATA_V200_SCHEMA
from metadata.v20.schema import OEMETADATA_V200_SCHEMA
from metadata.metaschema.draft07.schema import OEMETADATA_METASCHEMA_DRAFT07_SCHEMA

assert (
Expand Down
6 changes: 3 additions & 3 deletions tests/metadata/v200/test_template.py → tests/metadata/v20/test_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
def test_if_template_json_loads_successfully():
from metadata.v200_draft.template import OEMETADATA_V200_TEMPLATE
from metadata.v20.template import OEMETADATA_V200_TEMPLATE


def test_template_against_schema_which_should_succeed():
import jsonschema
from metadata.v200_draft.template import OEMETADATA_V200_TEMPLATE
from metadata.v200_draft.schema import OEMETADATA_V200_SCHEMA
from metadata.v20.template import OEMETADATA_V200_TEMPLATE
from metadata.v20.schema import OEMETADATA_V200_SCHEMA

assert jsonschema.validate(OEMETADATA_V200_TEMPLATE, OEMETADATA_V200_SCHEMA) == None
Loading