Merge branch 'maintenance' into devel

Conflicts:
	src/octoprint/server/__init__.py

src/octoprint/__init__.py

@@ -11,8 +11,9 @@ from ._version import get_versions
 versions = get_versions()
 
 __version__ = versions['version']
-__branch__ = versions['branch'] if 'branch' in versions else None
+__branch__ = versions.get('branch', None)
 __display_version__ = "{} ({} branch)".format(__version__, __branch__) if __branch__ else __version__
+__revision__ = versions.get('full-revisionid', versions.get('full', None))
 
 del versions
 del get_versions

src/octoprint/plugins/softwareupdate/__init__.py

@@ -20,7 +20,7 @@ from . import version_checks, updaters, exceptions, util, cli
 
 
 from octoprint.server.util.flask import restricted_access
-from octoprint.server import admin_permission, VERSION
+from octoprint.server import admin_permission, VERSION, REVISION
 from octoprint.util import dict_merge
 import octoprint.settings
 
@@ -716,9 +716,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
 			result["displayVersion"] = check.get("displayVersion", "{octoprint_version}")
 
 			if check["type"] == "github_commit":
-				from octoprint._version import get_versions
-				versions = get_versions()
-				result["current"] = versions.get("full-revisionid", versions.get("full", "unknown"))
+				result["current"] = REVISION if REVISION else "unknown"
 			else:
 				result["current"] = VERSION
 		else:

src/octoprint/server/__init__.py

@@ -52,7 +52,7 @@ admin_permission = Permission(RoleNeed("admin"))
 user_permission = Permission(RoleNeed("user"))
 
 # only import the octoprint stuff down here, as it might depend on things defined above to be initialized already
-from octoprint import __version__, __branch__, __display_version__
+from octoprint import __version__, __branch__, __display_version__, __revision__
 from octoprint.printer import get_connection_options
 from octoprint.printer.profile import PrinterProfileManager
 from octoprint.printer.standard import Printer
@@ -75,6 +75,7 @@ UI_API_KEY = ''.join('%02X' % ord(z) for z in uuid.uuid4().bytes)
 VERSION = __version__
 BRANCH = __branch__
 DISPLAY_VERSION = __display_version__
+REVISION = __revision__
 
 LOCALES = []
 LANGUAGES = set()