Skip to content

Commit

Permalink
Bump version 4.4.18: IstSos view updates
Browse files Browse the repository at this point in the history
  • Loading branch information
meomancer committed Apr 17, 2024
1 parent e379808 commit 9969430
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 17 deletions.
4 changes: 2 additions & 2 deletions deployment/.env
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ PYTHONPATH=/home/web/django_project:/geonode
USE_DEFAULT_GEOSERVER_STYLE=False
INITIAL_FIXTURES=True

VERSION=4.4.17
ISTSOS_VERSION=2.4.1-2
VERSION=4.4.18
ISTSOS_VERSION=2.4.1-3

# ------ GEOSERVER ------
STABLE_EXTENSIONS=web-resource-plugin,netcdf-out-plugin
Expand Down
2 changes: 1 addition & 1 deletion django_project/gwml2
Submodule gwml2 updated from e2e7da to 2fe28a
18 changes: 6 additions & 12 deletions django_project/igrac_api/api/istsos.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
from rest_framework.views import APIView

from igrac_api.authentication import APIKeyAuthentication
from igrac_api.cache import get_params, check_cache
from igrac_api.tasks import cache_istsos
from igrac_api.cache import get_params


class IstsosView(APIView):
Expand All @@ -16,16 +15,11 @@ class IstsosView(APIView):
def get(self, request):
"""GET ISTSOS API."""
url = request.get_full_path()
content, content_type = check_cache(url)
status_code = 200
if not content:
params = get_params(url)
response = requests.get('http://istsos/istsos/istsos?' + params)
content = response.content
content_type = response.headers['Content-Type']
status_code = response.status_code
cache_istsos.delay(url)

params = get_params(url)
response = requests.get('http://istsos/istsos/istsos?' + params)
content = response.content
content_type = response.headers['Content-Type']
status_code = response.status_code
django_response = HttpResponse(
content=content,
status=status_code,
Expand Down
2 changes: 1 addition & 1 deletion django_project/version/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.17
4.4.18
2 changes: 1 addition & 1 deletion istsos2

0 comments on commit 9969430

Please sign in to comment.