Merge pull request #1870 from OpenEnergyPlatform/master

Release from Master back to develop
OpenEnergyPlatform · Sep 25, 2024 · 23127e9 · 23127e9
2 parents 40e4e38 + b311716
commit 23127e9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 
 [bumpversion:file:VERSION]
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 1.0.1
+version: 1.0.2
 doi:
-date-released: 2024-09-23
+date-released: 2024-09-24
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.1
+1.0.2
diff --git a/oeplatform/__init__.py b/oeplatform/__init__.py
@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"
diff --git a/versions/changelogs/1_0_2.md b/versions/changelogs/1_0_2.md
@@ -0,0 +1,11 @@
+# Changes to the oeplatform code
+
+## Changes
+
+## Features
+
+## Bugs
+
+- Fix various bugs: Fix incorrect urls and download results on the oeo page, remove cache headers from metadata api view, fix bug on table permission page that prevented adding other users to the table [(#1867)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1867)
+
+## Documentation updates
diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md
@@ -6,6 +6,4 @@
 
 ## Bugs
 
-- Fix various bugs: Fix incorrect urls and download results on the oeo page, remove cache headers from metadata api view, fix bug on table permission page that prevented adding other users to the table [(#1867)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1867)
-
 ## Documentation updates
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,4 @@

		## Bugs

		- Fix various bugs: Fix incorrect urls and download results on the oeo page, remove cache headers from metadata api view, fix bug on table permission page that prevented adding other users to the table [(#1867)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1867)

		## Documentation updates