Commit d43fcc18 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Move to lmcbaseclasses-0.4.1. 

Update of Pipfile, docker and release files.
parent fe08778f

csp-lmc-common/Pipfile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ name = "nexus-hosted" 
# otherwise pytango will be recompiled.

numpy = "==1.17.2"

pytango = "==9.3.1"

ska_logging = ">=0.2.0"

lmcbaseclasses= ">=0.4.0"



# itango is added to make it easier to exercise the device in a CLI session,

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """csp-lmc-common"""

version = "0.3.1"

version = "0.4.0"

version_info = version.split(".")

description = """SKA CSP.LMC Common Software"""

author = "INAF-OAA"

csp-lmc-common/docker/.release

+4 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 


"""Release information for Python Package"""



name = """tangods-cspmaster"""

version = "0.3.0"

name = """csplmc-common"""

version = "0.4.0"

version_info = version.split(".")

description = """SKA CSP.LMC Common Classe"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.3.1

tag=csp-lmc-common-0.3.1
 
release=0.4.0

tag=csp-lmc-common-0.4.0

csp-lmc-common/docker/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ RUN ipython profile create 
#install lmc-base-classes

USER root

RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/ska-logging/0.2.1/ska_logging-0.2.1.tar.gz

RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/lmcbaseclasses/0.4.0+5bdedbed/lmcbaseclasses-0.4.0+5bdedbed.tar.gz

RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/lmcbaseclasses/0.4.1+14ff4f1b/lmcbaseclasses-0.4.1+14ff4f1b.tar.gz

CMD ["/venv/bin/python", "/app/csp_lmc_common/CspMaster.py" ]

csp-lmc-common/docker/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ endif 
	$(DOCKER_COMPOSE_ARGS) docker-compose -f csp-tangodb.yml up -d

	# put a sleep to wait TANGO DB 

	@sleep 10

	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up 

	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up -d



piplock: build  ## overwrite Pipfile.lock with the image version

	docker run $(IMAGE_TO_TEST) cat /app/Pipfile.lock > $(CURDIR)/Pipfile.lock