Makefile update

Makefile

-.PHONY: install-confignator install-confignator-userspace ccs-storage codeblockreusefeature install-testlib
+.PHONY: install-confignator ccs-storage codeblockreusefeature install-testlib
 
-all: install build-pc
+# all: install install-database-dev-env
 
 install: install-python-requirements install-confignator ccs-storage codeblockreusefeature
 
 databases: ccs-storage codeblockreusefeature
 
-# build-pc: build-fw-profile build-crplm build-cria build-crfee
-
 install-confignator:
 	@echo "+---------------------------------------+"
 	@echo "| installing confignator Python package |"
 	@echo "+---------------------------------------+"
-	    $(MAKE) build -C $(CURDIR)/Tst/confignator
-	    if [ -z $VIRTUAL_ENV ]; then pip install --user -U $(CURDIR)/Tst/confignator/dist/*.whl; else pip install -U $(CURDIR)/Tst/confignator/dist/*.whl; fi
-	@echo "+--------------------------------------+"
-	@echo "| installed confignator Python package |"
-	@echo "+--------------------------------------+"
-	@echo
-	
-install-confignator-userspace:
-	@echo "+---------------------------------------+"
-	@echo "| installing confignator Python package |"
-	@echo "+---------------------------------------+"
-	    $(MAKE) build -C $(CURDIR)/Tst/confignator
-	    pip install --user -U $(CURDIR)/Tst/confignator/dist/*.whl
+		$(MAKE) build -C $(CURDIR)/Tst/confignator
+	    if [ -z $VIRTUAL_ENV ]; then pip install --user -U --force-reinstall $(CURDIR)/Tst/confignator/dist/*.whl; else pip install -U --force-reinstall $(CURDIR)/Tst/confignator/dist/*.whl; fi
+		$(MAKE) build-doc -C $(CURDIR)/Tst/confignator
 	@echo "+--------------------------------------+"
 	@echo "| installed confignator Python package |"
 	@echo "+--------------------------------------+"
@@ -49,16 +37,6 @@ install-database-dev-env:
 	@echo "| installed Python dev packages for the database    |"
 	@echo "+---------------------------------------------------+"
 	@echo
-	
-install-python-env:
-	@echo "+-----------------------------+"
-	@echo "| installing Python modules   |"
-	@echo "+-----------------------------+"
-	    python -m pip install --user -U numpy scipy matplotlib cairocffi mysqlclient sqlalchemy wheel sphinx sphinx_rtd_theme astropy crcmod psutil
-	@echo "+-----------------------------+"
-	@echo "| installed Python modules    |"
-	@echo "+-----------------------------+"
-	@echo
 
 install-python-requirements:
 	@echo "+-----------------------------+"

Tst/confignator/Makefile

@@ -7,6 +7,8 @@ DOC_DST = "doc/source/_apidocfiles/"
 DOC_OPEN = $(CURDIR)/confignator/open_doc.py
 DIST_DIR = $(CURDIR)/dist
 
+LOG_LEVEL = "WARNING"
+
 .PHONY: build clean-build install uninstall reinstall build-doc clean-doc-build all open-doc
 
 all: clean build install build-doc open-doc
@@ -34,7 +36,7 @@ build:	clean
 		@echo "log-file = ''" >> $(CONFIGNATOR_CFG)
 		@echo >> $(CONFIGNATOR_CFG)
 		@echo "[confignator-logging]" >> $(CONFIGNATOR_CFG)
-		@echo "level = INFO" >> $(CONFIGNATOR_CFG)
+		@echo "level = $(LOG_LEVEL)" >> $(CONFIGNATOR_CFG)
 		@echo >> $(CONFIGNATOR_CFG)
 		# build the Python package
 		# python3 setup.py sdist;