mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-28 03:26:45 +00:00
Handle missing dulwich module (#7497)
- If "invoke version" called from outside venv, may not detect correct dulwich module - Ref: https://github.com/inventree/InvenTree/issues/7444
This commit is contained in:
parent
89196ef701
commit
54a9bcef57
@ -3,6 +3,7 @@
|
|||||||
Provides information on the current InvenTree version
|
Provides information on the current InvenTree version
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import platform
|
import platform
|
||||||
@ -14,20 +15,29 @@ from datetime import timedelta as td
|
|||||||
import django
|
import django
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from dulwich.repo import NotGitRepository, Repo
|
|
||||||
|
|
||||||
from common.settings import get_global_setting
|
|
||||||
|
|
||||||
from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION
|
from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION
|
||||||
|
|
||||||
# InvenTree software version
|
# InvenTree software version
|
||||||
INVENTREE_SW_VERSION = '0.16.0 dev'
|
INVENTREE_SW_VERSION = '0.16.0 dev'
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger('inventree')
|
||||||
|
|
||||||
|
|
||||||
# Discover git
|
# Discover git
|
||||||
try:
|
try:
|
||||||
|
from dulwich.repo import Repo
|
||||||
|
|
||||||
main_repo = Repo(pathlib.Path(__file__).parent.parent.parent.parent.parent)
|
main_repo = Repo(pathlib.Path(__file__).parent.parent.parent.parent.parent)
|
||||||
main_commit = main_repo[main_repo.head()]
|
main_commit = main_repo[main_repo.head()]
|
||||||
except (NotGitRepository, FileNotFoundError):
|
except (ImportError, ModuleNotFoundError):
|
||||||
|
logger.warning(
|
||||||
|
'Warning: Dulwich module not found, git information will not be available.'
|
||||||
|
)
|
||||||
|
main_repo = None
|
||||||
|
main_commit = None
|
||||||
|
except Exception:
|
||||||
|
main_repo = None
|
||||||
main_commit = None
|
main_commit = None
|
||||||
|
|
||||||
|
|
||||||
@ -53,11 +63,15 @@ def checkMinPythonVersion():
|
|||||||
|
|
||||||
def inventreeInstanceName():
|
def inventreeInstanceName():
|
||||||
"""Returns the InstanceName settings for the current database."""
|
"""Returns the InstanceName settings for the current database."""
|
||||||
|
from common.settings import get_global_setting
|
||||||
|
|
||||||
return get_global_setting('INVENTREE_INSTANCE')
|
return get_global_setting('INVENTREE_INSTANCE')
|
||||||
|
|
||||||
|
|
||||||
def inventreeInstanceTitle():
|
def inventreeInstanceTitle():
|
||||||
"""Returns the InstanceTitle for the current database."""
|
"""Returns the InstanceTitle for the current database."""
|
||||||
|
from common.settings import get_global_setting
|
||||||
|
|
||||||
if get_global_setting('INVENTREE_INSTANCE_TITLE'):
|
if get_global_setting('INVENTREE_INSTANCE_TITLE'):
|
||||||
return get_global_setting('INVENTREE_INSTANCE')
|
return get_global_setting('INVENTREE_INSTANCE')
|
||||||
|
|
||||||
@ -121,6 +135,8 @@ def isInvenTreeUpToDate():
|
|||||||
|
|
||||||
A background task periodically queries GitHub for latest version, and stores it to the database as "_INVENTREE_LATEST_VERSION"
|
A background task periodically queries GitHub for latest version, and stores it to the database as "_INVENTREE_LATEST_VERSION"
|
||||||
"""
|
"""
|
||||||
|
from common.settings import get_global_setting
|
||||||
|
|
||||||
latest = get_global_setting(
|
latest = get_global_setting(
|
||||||
'_INVENTREE_LATEST_VERSION', backup_value=None, create=False
|
'_INVENTREE_LATEST_VERSION', backup_value=None, create=False
|
||||||
)
|
)
|
||||||
|
4
tasks.py
4
tasks.py
@ -1069,8 +1069,8 @@ API {InvenTreeVersion.inventreeApiVersion()}
|
|||||||
Node {node if node else 'N/A'}
|
Node {node if node else 'N/A'}
|
||||||
Yarn {yarn if yarn else 'N/A'}
|
Yarn {yarn if yarn else 'N/A'}
|
||||||
|
|
||||||
Commit hash:{InvenTreeVersion.inventreeCommitHash()}
|
Commit hash: {InvenTreeVersion.inventreeCommitHash()}
|
||||||
Commit date:{InvenTreeVersion.inventreeCommitDate()}"""
|
Commit date: {InvenTreeVersion.inventreeCommitDate()}"""
|
||||||
)
|
)
|
||||||
if len(sys.argv) == 1 and sys.argv[0].startswith('/opt/inventree/env/lib/python'):
|
if len(sys.argv) == 1 and sys.argv[0].startswith('/opt/inventree/env/lib/python'):
|
||||||
print(
|
print(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user