Skip to content

Commit

Permalink
Merge pull request #113 from OpenEnergyPlatform/master
Browse files Browse the repository at this point in the history
Master back to develop
  • Loading branch information
jh-RLI authored Oct 31, 2024
2 parents ea1066b + ecd55b9 commit 6de5bb1
Show file tree
Hide file tree
Showing 19 changed files with 23 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "0.2.1"
current_version = "1.0.0"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Changelog

current
--------------------
*


1.0.0 (2024-10-31)
--------------------
* Fully rewrite OMI and implement the json schema spec only, remove python class based parsing (#104)[https://github.com/OpenEnergyPlatform/omi/pull/104]
* Add a new conversion functionality to convert form v160 to v200 oemetadata [(#111)](https://github.com/rl-institut/super-repo/pull/111)

Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ Overview
:alt: PyPI Package latest release
:target: https://pypi.org/project/omi

.. |commits-since| image:: https://img.shields.io/github/commits-since/OpenEnergyPlatform/omi/v0.2.1.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/OpenEnergyPlatform/omi/v1.0.0.svg
:alt: Commits since latest release
:target: https://github.com/OpenEnergyPlatform/omi/compare/v0.2.1...master
:target: https://github.com/OpenEnergyPlatform/omi/compare/v1.0.0...master

.. |wheel| image:: https://img.shields.io/pypi/wheel/omi.svg
:alt: PyPI Wheel
Expand Down Expand Up @@ -190,7 +190,7 @@ Module usage::
with open("script/metadata/result_inspection.json", "w", encoding="utf-8") as json_file:
json.dump(metadata, json_file, ensure_ascii=False, indent=4) # `indent=4` makes the JSON file easier to read

**Additional Fields **
**Additional Fields**

To be in line with the oemetadata specification we do not allow for additional properties or fields in the metadata.
We want to keep the oemetadata relatively lean and readable still linking to other documents or to
Expand Down
1 change: 0 additions & 1 deletion docs/authors.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/changelog.rst

This file was deleted.

53 changes: 0 additions & 53 deletions docs/conf.py

This file was deleted.

1 change: 0 additions & 1 deletion docs/contributing.rst

This file was deleted.

22 changes: 0 additions & 22 deletions docs/index.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/installation.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/readme.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/reference/index.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/reference/omi.rst

This file was deleted.

4 changes: 0 additions & 4 deletions docs/requirements.txt

This file was deleted.

11 changes: 0 additions & 11 deletions docs/spelling_wordlist.txt

This file was deleted.

13 changes: 0 additions & 13 deletions docs/usage.rst

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "omi"
version = "0.2.1"
version = "1.0.0"
description = "A library to process and translate open energy metadata."
authors = [
"Hendrik Huyskens <hendrik.huyskens@rl-institut.de>",
Expand Down
23 changes: 12 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
[bumpversion]
current_version = 1.0.0

[bdist_wheel]
universal = 1


[flake8]
max-line-length = 140
exclude = */migrations/*

[tool:pytest]
testpaths = tests
norecursedirs =
migrations

migrations
python_files =
test_*.py
*_test.py
tests.py
test_*.py
*_test.py
tests.py
addopts =
-ra
--strict
--doctest-modules
--doctest-glob=\*.rst
--tb=short
-ra
--strict
--doctest-modules
--doctest-glob=\*.rst
--tb=short

[isort]
force_single_line = True
Expand Down
2 changes: 1 addition & 1 deletion src/omi/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.1"
__version__ = "1.0.0"
8 changes: 0 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ deps =
sphinxcontrib-spelling
pyenchant

[testenv:docs]
deps =
-r{toxinidir}/docs/requirements.txt
commands =
sphinx-build {posargs:-E} -b doctest docs dist/docs
sphinx-build {posargs:-E} -b html docs dist/docs
; sphinx-build -b linkcheck docs dist/docs

[testenv:codecov]
deps =
codecov
Expand Down

0 comments on commit 6de5bb1

Please sign in to comment.