Skip to content

Commit

Permalink
Merge pull request #1774 from OpenEnergyPlatform/hotfix-docker-build-…
Browse files Browse the repository at this point in the history
…again-and-cache-config

Hotfix docker build again and cache config
  • Loading branch information
jh-RLI authored Jul 26, 2024
2 parents 7d322b2 + 9b84f22 commit 3d759fc
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 5 deletions.
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 = 0.21.1
current_version = 0.21.2

[bumpversion:file:VERSION]

Expand Down
2 changes: 1 addition & 1 deletion 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: 0.21.1
version: 0.21.2
doi:
date-released: 2024-07-25
url: "https://github.com/OpenEnergyPlatform/oeplatform/"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.21.1
0.21.2
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY ./docker/apache2.conf /etc/apache2/conf-enabled/oeplatform.conf
COPY . /app
COPY ./docker/docker-entrypoint.sh /app/docker-entrypoint.sh

RUN mkdir /app/ontologies && cd /app/ontologies && wget https://github.com/OpenEnergyPlatform/ontology/releases/download/v2.4.0/build-files.zip && unzip oeo.zip && rm oeo.zip
RUN mkdir /app/ontologies && cd /app/ontologies && wget https://github.com/OpenEnergyPlatform/ontology/releases/download/v2.4.0/build-files.zip && unzip build-files.zip && rm build-files.zip

RUN cp /app/oeplatform/securitysettings.py.default /app/oeplatform/securitysettings.py && python manage.py collectstatic --noinput && rm /app/oeplatform/securitysettings.py

Expand Down
2 changes: 2 additions & 0 deletions factsheet/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.http import HttpResponse, HttpResponseForbidden, JsonResponse
from django.shortcuts import render
from django.utils.cache import patch_response_headers
from django.views.decorators.cache import never_cache
from rdflib import RDF, Graph, Literal, URIRef
from rdflib.compare import graph_diff, to_isomorphic
from SPARQLWrapper import JSON
Expand Down Expand Up @@ -2051,6 +2052,7 @@ def populate_factsheets_elements(request, *args, **kwargs):
return response


@never_cache
def filter_scenario_bundles_view(request):
# Get the table IRI from the request or any other source
table_iri = request.GET.get("table_iri", "")
Expand Down
2 changes: 1 addition & 1 deletion oeplatform/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.21.1"
__version__ = "0.21.2"
13 changes: 13 additions & 0 deletions versions/changelogs/0_21_2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Changes to the oeplatform code

## Changes

- Add never cache decorator to scenario bundle plugin view [#1774](https://github.com/OpenEnergyPlatform/oeplatform/pull/1774)

## Features

## Bugs

- Fix docker image build workflow again [#1774](https://github.com/OpenEnergyPlatform/oeplatform/pull/1774)

## Documentation updates

0 comments on commit 3d759fc

Please sign in to comment.