Small fix for handling display versions (#1625)

* Small fix for handling display versions

Making a distinction between __version__ and the version we display in the info panel (displayr_version).
The hosted cellxgene can overwrite the display_version using a plugin.

Improve version handling in the customized assets
This commit is contained in:
bmccandless
2020-07-16 15:11:37 -07:00
committed by GitHub
parent ed23d5dd9d
commit f223d7504e
6 changed files with 8 additions and 15 deletions
-6
View File
@@ -16,12 +16,6 @@ define full_path
$(shell [[ $(1) = /* ]] && echo $(1) || echo $(PROJECT_ROOT)/$(1))
endef
# https://stackoverflow.com/a/14777895/9587410
ifeq ($(shell uname),Darwin) # is Windows_NT on XP, 2000, 7, Vista, 10...
IS_DARWIN := "true"
endif
export CELLXGENE_COMMIT := $(shell git rev-parse --short HEAD)
export CXG_SERVER_PORT := $(call env_or_else_default,CXG_SERVER_PORT)
export CXG_CLIENT_PORT := $(call env_or_else_default,CXG_CLIENT_PORT)
export CXG_OPTIONS := $(call env_or_else_default,CXG_OPTIONS)