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.

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

Update python version #223

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-License-Identifier: MIT

name: gh-pages
on:
push:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/metadata-test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-License-Identifier: MIT

# https://github.com/actions/runner
# https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/introduction-to-github-actions#understanding-the-workflow-file
# https://docs.github.com/pt/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
Expand All @@ -22,8 +26,7 @@ jobs:
strategy:
matrix:
python-version:
- 3.6
- 3.7
- 3.12
steps:
- name: Check out source repository
uses: actions/checkout@v2
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: Build 📦 and release on pypi
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-License-Identifier: MIT

name: Build 📦 and release on pypi

on:
release:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: MIT

name: REUSE Compliance Check

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-License-Identifier: MIT

name: Build and release on pypi tests

on:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Rename ``source``- ``licenses`` to ``sourceLicenses`` [(#215)](https://github.com/OpenEnergyPlatform/oemetadata/pull/215)
- Update create template [(#217)](https://github.com/OpenEnergyPlatform/oemetadata/pull/217)
- Update folder structure [(#221)](https://github.com/OpenEnergyPlatform/oemetadata/pull/221)
- Update python version to 3.12 [(#223)](https://github.com/OpenEnergyPlatform/oemetadata/pull/223)

### Removed
- [(#)]()
Expand Down
4 changes: 4 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-License-Identifier: CC0-1.0

cff-version: 1.2.0
message: "If you use this software, please cite it using these metadata."
authors:
Expand Down
50 changes: 1 addition & 49 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: MIT

version = 1

Expand All @@ -22,60 +22,12 @@ precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = ".github/workflows/*.yml"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "CITATION.cff"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "USERS.cff"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "format_code.sh"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "tox.ini"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "requirements.txt"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "requirements-docs.txt"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "setup.py"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "setup.cfg"
precedence = "override"
SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "metadata/v2/v20/build_source/schemas/*.json"
precedence = "override"
Expand Down
4 changes: 4 additions & 0 deletions USERS.cff
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: Jonas Huber <@jh-RLI> © Reiner Lemoine Institut
# SPDX-FileCopyrightText: Ludwig Hülk <@Ludee> © Reiner Lemoine Institut
# SPDX-License-Identifier: CC0-1.0

cff-version: 1.2.0
message: "If you use this software, please leave your name for reference.
authors:
Expand Down
18 changes: 9 additions & 9 deletions metadata/latest/build_source/schemas/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
"type": "object",
"properties": {
"name": {
"description": "A filename or database conform collection name.",
"description": "A filename or database conform dataset name.",
"type": ["string", "null"],
"examples": ["oep_oemetadata"],
"badge": "Iron",
"title": "Collection Name"
"title": "Dataset Name"
},
"title": {
"description": "A human readable collection name.",
"description": "A human readable dataset name.",
"type": ["string", "null"],
"examples": ["OEP OEMetadata"],
"badge": "Bronze",
"title": "Collection Title"
"title": "Dataset Title"
},
"description": {
"description": "A free text description of the collection.",
"description": "A free text description of the dataset.",
"type": ["string", "null"],
"examples": ["A collection of tables for the OEMetadata examples."],
"examples": ["A dataset for the OEMetadata examples."],
"badge": "Bronze",
"title": "Collection Description"
"title": "Dataset Description"
},
"id": {
"description": "A unique identifier (UUID/DOI) for the collection.",
"description": "A unique identifier (UUID/DOI) for the dataset.",
"type": ["string", "null"],
"examples": ["https://databus.openenergyplatform.org/oeplatform/reference"],
"badge": "Silver",
"title": "Collection Identifier",
"title": "Dataset Identifier",
"format": "uri",
"readOnly": true
}
Expand Down
12 changes: 6 additions & 6 deletions metadata/latest/build_source/schemas/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@
"type": ["string", "null"],
"examples": ["wind energy converting unit"],
"badge": "Platinum",
"title": "Name"
"title": "Is About Name"
},
"path": {
"@id": {
"description": "The path of the ontology term (IRI).",
"type": ["string", "null"],
"examples": ["https://openenergyplatform.org/ontology/oeo/OEO_00000044"],
"badge": "Platinum",
"title": "Path",
"title": "Is About Identifier",
"format": "uri"
}
},
Expand Down Expand Up @@ -127,14 +127,14 @@
"type": ["string", "null"],
"examples": ["onshore wind farm"],
"badge": "Platinum",
"title": "Name"
"title": "Value Reference Name"
},
"path": {
"@id": {
"description": "The path of the ontology term (IRI) in the column.",
"type": ["string", "null"],
"examples": ["https://openenergyplatform.org/ontology/oeo/OEO_00000311"],
"badge": "Platinum",
"title": "Path",
"title": "Value Reference Identifier",
"format": "uri"
}
},
Expand Down
6 changes: 3 additions & 3 deletions metadata/latest/build_source/schemas/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
"type": ["string", "null"],
"examples": ["energy"],
"badge": "Platinum",
"title": "Name"
"title": "Subject Name"
},
"path": {
"@id": {
"description": "A unique identifier (URI/IRI) of the ontology class.",
"type": ["string", "null"],
"examples": ["https://openenergy-platform.org/ontology/oeo/OEO_00000150"],
"badge": "Platinum",
"title": "Path",
"title": "Subject Identifier",
"format": "uri"
}
},
Expand Down
8 changes: 4 additions & 4 deletions metadata/latest/build_source/schemas/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"badge": "Bronze",
"title": "Publication Year"
},
"path": {
"@id": {
"description": "A URL to the original source.",
"type": ["string", "null"],
"examples": ["https://www.ipcc.ch/report/ar6/syr/downloads/report/IPCC_AR6_SYR_FullVolume.pdf"],
"badge": "Bronze",
"title": "Path",
"title": "Source Identifier",
"format": "uri"
},
"licenses": {
"sourceLicenses": {
"type": "array",
"items": {
"description": "An array of objects of licenses under which the described source is provided. See https://openenergyplatform.github.io/academy/courses/08_licensing/ for further information.",
Expand All @@ -76,7 +76,7 @@
"type": ["string", "null"],
"examples": ["https://opendatacommons.org/licenses/odbl/1-0/index.html"],
"badge": "Bronze",
"title": "Path",
"title": "License Identifier",
"format": "uri"
},
"instruction": {
Expand Down
4 changes: 2 additions & 2 deletions metadata/latest/build_source/schemas/spatial.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"type": ["string", "null"],
"examples": ["https://www.wikidata.org/wiki/Q77077223"],
"badge": "Platinum",
"title": "Address"
"title": "Address Identifier"
},
"latitude": {
"description": "The latitude (lat) information of the location. Specifies the north / south position of the geometry.",
Expand Down Expand Up @@ -60,7 +60,7 @@
"examples": ["https://www.wikidata.org/wiki/Q64"],
"format": "uri",
"badge": "Platinum",
"title": "Extent URI"
"title": "Extent Identifier"
},
"resolutionValue": {
"description": "The value of the resolution.",
Expand Down
16 changes: 8 additions & 8 deletions metadata/v2/v20/build_source/schemas/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
"type": "object",
"properties": {
"name": {
"description": "A filename or database conform collection name.",
"description": "A filename or database conform dataset name.",
"type": ["string", "null"],
"examples": ["oep_oemetadata"],
"badge": "Iron",
"title": "Collection Name"
"title": "Dataset Name"
},
"title": {
"description": "A human readable collection name.",
"description": "A human readable dataset name.",
"type": ["string", "null"],
"examples": ["OEP OEMetadata"],
"badge": "Bronze",
"title": "Collection Title"
"title": "Dataset Title"
},
"description": {
"description": "A free text description of the collection.",
"description": "A free text description of the dataset.",
"type": ["string", "null"],
"examples": ["A collection of tables for the OEMetadata examples."],
"examples": ["A dataset for the OEMetadata examples."],
"badge": "Bronze",
"title": "Collection Description"
"title": "Dataset Description"
},
"id": {
"description": "A unique identifier (UUID/DOI) for the collection.",
"type": ["string", "null"],
"examples": ["https://databus.openenergyplatform.org/oeplatform/reference"],
"badge": "Silver",
"title": "Collection Identifier",
"title": "Dataset Identifier",
"format": "uri",
"readOnly": true
}
Expand Down
2 changes: 1 addition & 1 deletion metadata/v2/v20/build_source/schemas/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"description": "The publishing agency of the data. This can be the OEP.",
"type": ["string", "null"],
"examples": ["Open Energy Platform (OEP)"],
"badge": "Gold",
"badge": "Bronze",
"title": "Publisher"
},"publisherLogo": {
"description": "A URL to the logo of the publishing agency of data.",
Expand Down
4 changes: 2 additions & 2 deletions metadata/v2/v20/build_source/schemas/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"type": ["string", "null"],
"examples": ["https://openenergyplatform.org/ontology/oeo/OEO_00000044"],
"badge": "Platinum",
"title": "Is About URI",
"title": "Is About Identifier",
"format": "uri"
}
},
Expand Down Expand Up @@ -134,7 +134,7 @@
"type": ["string", "null"],
"examples": ["https://openenergyplatform.org/ontology/oeo/OEO_00000311"],
"badge": "Platinum",
"title": "Value Reference URI",
"title": "Value Reference Identifier",
"format": "uri"
}
},
Expand Down
2 changes: 1 addition & 1 deletion metadata/v2/v20/build_source/schemas/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"type": ["string", "null"],
"examples": ["https://openenergy-platform.org/ontology/oeo/OEO_00000150"],
"badge": "Platinum",
"title": "Subject URI",
"title": "Subject Identifier",
"format": "uri"
}
},
Expand Down
6 changes: 3 additions & 3 deletions metadata/v2/v20/build_source/schemas/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
"title": "Publication Year"
},
"path": {
"description": "A URL to the original source.",
"description": "A DOI or link to the original source.",
"type": ["string", "null"],
"examples": ["https://www.ipcc.ch/report/ar6/syr/downloads/report/IPCC_AR6_SYR_FullVolume.pdf"],
"badge": "Bronze",
"title": "Path",
"title": "DOI",
"format": "uri"
},
"sourceLicenses": {
Expand Down Expand Up @@ -76,7 +76,7 @@
"type": ["string", "null"],
"examples": ["https://creativecommons.org/licenses/by/4.0/legalcode"],
"badge": "Bronze",
"title": "Path",
"title": "License Identifier",
"format": "uri"
},
"instruction": {
Expand Down
Loading
Loading