diff --git a/cookbook/templates/system.html b/cookbook/templates/system.html index 44e0c6aa..18e56fa7 100644 --- a/cookbook/templates/system.html +++ b/cookbook/templates/system.html @@ -18,7 +18,7 @@ {% endblocktrans %}

{% trans 'System Information' %}

- {% if version_if %} + {% if version_info %}
diff --git a/cookbook/urls.py b/cookbook/urls.py index d73973ff..7b6d1838 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -7,7 +7,7 @@ from rest_framework.schemas import get_schema_view from cookbook.helper import dal from recipes.settings import DEBUG, PLUGINS -from version_info import TANDOOR_VERSION +from cookbook.version_info import TANDOOR_VERSION from .models import (Automation, Comment, CustomFilter, Food, InviteLink, Keyword, MealPlan, Recipe, RecipeBook, RecipeBookEntry, RecipeImport, ShoppingList, Step, Storage, diff --git a/version_info.py b/cookbook/version_info.py similarity index 100% rename from version_info.py rename to cookbook/version_info.py diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 6eb383a2..f3465f3a 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -1,7 +1,5 @@ import os import re -import subprocess -import traceback from datetime import datetime from uuid import UUID @@ -24,10 +22,9 @@ from cookbook.helper.permission_helper import group_required, has_group_permissi from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, ShareLink, Space, ViewLog, UserSpace) from cookbook.tables import (CookLogTable, ViewLogTable) +from cookbook.version_info import VERSION_INFO from recipes.settings import PLUGINS -from version_info import VERSION_INFO - def index(request): with scopes_disabled(): diff --git a/version.py b/version.py index 8eb57a83..ae46b42e 100644 --- a/version.py +++ b/version.py @@ -69,6 +69,6 @@ except subprocess.CalledProcessError as e: except: traceback.print_exc() -with open('version_info.py', 'w+', encoding='UTF-8') as f: +with open('cookbook/version_info.py', 'w+', encoding='UTF-8') as f: print(f"writing version info {version_info}") f.write(f'TANDOOR_VERSION = "{tandoor_tag}"\nTANDOOR_REF = "{tandoor_hash}"\nVERSION_INFO = {version_info}')