GitLab will be upgraded on June 23th evening. During the upgrade the service will be unavailable, sorry for the inconvenience.

Commit 63be1dda authored by payno's avatar payno

Merge branch 'master' of gitlab.esrf.fr:workflow/pypushflow

parents 850a3187 31a8f1f5
Pipeline #39171 passed with stages
in 12 minutes and 11 seconds
......@@ -233,7 +233,7 @@ class PythonActor(AbstractActor):
:param data: input data
"""
channel, in_data = in_data
logging.info("On trigger channel is " + str(channel))
logger.info("On trigger channel is " + str(channel))
# cast data to dict if necessary
if hasattr(in_data, "to_dict"):
in_data = in_data.to_dict()
......@@ -281,9 +281,9 @@ class PythonActor(AbstractActor):
self.error_handler.triggerOnError(inData)
def triggerDownStreamActor(self, output_last_processing=(None, {})):
logging.warning("---------------------")
logging.warning(output_last_processing)
logging.warning("---------------------")
logger.warning("---------------------")
logger.warning(output_last_processing)
logger.warning("---------------------")
try:
output_channel, inData = output_last_processing
except TypeError:
......
......@@ -79,7 +79,7 @@ MAJOR = 0
MINOR = 2
MICRO = 0
RELEV = "rc" # <16
SERIAL = 0 # <16
SERIAL = 1 # <16
date = __date__
......
......@@ -61,69 +61,14 @@ export LC_ALL=en_US.utf-8
)
RELEASE_LEVEL_VALUE = {
"dev": 0,
"alpha": 10,
"beta": 11,
"gamma": 11,
"rc": 12,
"final": 15,
}
MAJOR = 0
MINOR = 2
MICRO = 0
RELEV = "rc" # <16
SERIAL = 0 # <16
date = __date__
_version_info = namedtuple(
"version_info", ["major", "minor", "micro", "releaselevel", "serial"]
)
version_info = _version_info(MAJOR, MINOR, MICRO, RELEV, SERIAL)
strictversion = version = debianversion = "%d.%d.%d" % version_info[:3]
if version_info.releaselevel != "final":
version += "-%s%s" % version_info[-2:]
debianversion += (
"~adev%i" % version_info[-1] if RELEV == "dev" else "~%s%i" % version_info[-2:]
)
prerel = "a" if RELEASE_LEVEL_VALUE.get(version_info[3], 0) < 10 else "b"
if prerel not in "ab":
prerel = "a"
strictversion += prerel + str(version_info[-1])
def get_version():
return strictversion
"""Returns current version number from version.py file"""
from pypushflow.version import strictversion
def calc_hexversion(major=0, minor=0, micro=0, releaselevel="dev", serial=0):
"""Calculate the hexadecimal version number from the tuple version_info:
:param major: integer
:param minor: integer
:param micro: integer
:param relev: integer or string
:param serial: integer
:return: integerm always increasing with revision numbers
"""
try:
releaselevel = int(releaselevel)
except ValueError:
releaselevel = RELEASE_LEVEL_VALUE.get(releaselevel, 0)
hex_version = int(serial)
hex_version |= releaselevel * 1 << 4
hex_version |= int(micro) * 1 << 8
hex_version |= int(minor) * 1 << 16
hex_version |= int(major) * 1 << 24
return hex_version
hexversion = calc_hexversion(*version_info)
return strictversion
def get_readme():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment