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

Master back to develop #1909

Merged
merged 6 commits into from
Nov 19, 2024
Merged
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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.0.4
current_version = 1.0.5

[bumpversion:file:VERSION]

Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ authors:
title: "Open Energy Family - Open Energy Platform (OEP)"
type: software
license: AGPL-3.0-or-later
version: 1.0.4
version: 1.0.5
doi:
date-released: 2024-09-25
date-released: 2024-11-19
url: "https://github.com/OpenEnergyPlatform/oeplatform/"
2 changes: 1 addition & 1 deletion RELEASE_PROCEDURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Before see How to [Contribute](https://github.com/OpenEnergyPlatform/oeplatform/
- `versioneer` automatically updates the version number based on the tag
- this is now the official tagged commit
- Push the tag upstream: `git push upstream --tags`
- Alternatievely: tag on github platform while creating release
- Alternatively: tag on github platform while creating release
1. Make a new release on Github
- https://github.com/OpenEnergyPlatform/oeplatform/releases/new
- make sure that you choose the tag name defined above
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.4
1.0.5
2 changes: 1 addition & 1 deletion oeplatform/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.4"
__version__ = "1.0.5"
27 changes: 27 additions & 0 deletions versions/changelogs/1_0_5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Changes to the oeplatform code

## Changes

- Updated oeo in docker image to version 2.5 [(#1878)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1878)

- Fix typo and font-size after tag assignment update [(#1880)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1880)

- Include check for oeo-ext on startup [(#1879)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1879)

## Features

- divide metadata builder flow into subsections [(#1747)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1747)

## Bugs

- Updated Dockerfile for sass at theming dir [(#1855)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1855)

- The OEPs table creation process is now atomic to avoid errors: If an error is raised during creation of tables on the OEDB the table object in the django DB is still created. This leads to ghost tables that only exist in django. [(#1886)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1886)

- Fixed wrong calls in dataedit wizard to open collapsed items [(#1881)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1881)

## Documentation updates

- Added documentation for Design System and Accessibility [(#1716)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1716)
- Restructure documentation layout & enhance content [(#1905)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1905)
- Fix link to rest-api documentation on mkdocs and update text formatting on the documentation main page. [(#1907)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1907)
18 changes: 0 additions & 18 deletions versions/changelogs/current.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,8 @@

## Changes

- Updated oeo in docker image to version 2.5 [(#1878)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1878)

- Fix typo and font-size after tag assignment update [(#1880)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1880)

- Include check for oeo-ext on startup [(#1879)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1879)

## Features

- divide metadata builder flow into subsections [(#1747)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1747)

## Bugs

- Updated Dockerfile for sass at theming dir [(#1855)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1855)

- The OEPs table creation process is now atomic to avoid errors: If an error is raised during creation of tables on the OEDB the table object in the django DB is still created. This leads to ghost tables that only exist in django. [(#1886)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1886)

- Fixed wrong calls in dataedit wizard to open collapsed items [(#1881)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1881)

## Documentation updates

- Added documentation for Design System and Accessibility [(#1716)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1716)
- Restructure documentation layout & enhance content [(#1905)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1905)
- Fix link to rest-api documentation on mkdocs and update text formatting on the documentation main page. [(#1907)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1907)