Skip to content
Snippets Groups Projects
Commit 45064063 authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

add numeric prefix to python versino name

parent 74afcd5c
No related branches found
No related tags found
No related merge requests found
......@@ -23,11 +23,15 @@ if (${BRANCH} STREQUAL "master")
SET (ASAPO_VERSION ${ASAPO_TAG})
SET (ASAPO_VERSION_COMMIT "")
SET (ASAPO_VERSION_DOCKER_SUFFIX "")
SET (PYTHON_ASAPO_VERSION ${ASAPO_VERSION})
else()
SET (ASAPO_VERSION ${BRANCH})
SET (ASAPO_VERSION_COMMIT ", build ${ASAPO_VERSION_COMMIT}")
SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
SET (PYTHON_ASAPO_VERSION 1.0.${ASAPO_VERSION})
endif()
message("Asapo Version: " ${ASAPO_VERSION})
message("Python Asapo Version: " ${PYTHON_ASAPO_VERSION})
message("Asapo commit: " ${ASAPO_VERSION_COMMIT})
......@@ -290,4 +290,4 @@ def create_server_broker(server_name,source_path,has_filesystem,beamtime_id,stre
return factory.create_server_broker(_bytes(server_name),_bytes(source_path),has_filesystem, _bytes(beamtime_id),_bytes(stream),_bytes(token),timeout_ms)
__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
__version__ = "@PYTHON_ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
......@@ -2,7 +2,7 @@ import setuptools
setuptools.setup(
name ="asapo_consumer",
version = "@ASAPO_VERSION@",
version = "@PYTHON_ASAPO_VERSION@",
install_requires=['numpy'],
include_package_data=True,
packages=['asapo_consumer'],
......
......@@ -14,7 +14,7 @@ ext_modules = [
setup(
name ="asapo_consumer",
ext_modules = ext_modules,
version = "@ASAPO_VERSION@",
version = "@PYTHON_ASAPO_VERSION@",
setup_requires=["numpy"],
install_requires=["numpy"]
)
......@@ -314,4 +314,4 @@ def create_producer(endpoint,beamtime_id,beamline,stream,token,nthreads,timeout_
return PyProducer.__create_producer(_bytes(endpoint),_bytes(beamtime_id),_bytes(beamline),_bytes(stream),_bytes(token),nthreads,timeout_sec)
__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
__version__ = "@PYTHON_ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
......@@ -2,7 +2,7 @@ import setuptools
setuptools.setup(
name ="asapo_producer",
version = "@ASAPO_VERSION@",
version = "@PYTHON_ASAPO_VERSION@",
install_requires=['numpy'],
include_package_data=True,
packages=['asapo_producer'],
......
......@@ -14,7 +14,7 @@ ext_modules = [
setup(
name ="asapo_producer",
ext_modules = ext_modules,
version = "@ASAPO_VERSION@",
version = "@PYTHON_ASAPO_VERSION@",
setup_requires=["numpy","cython>=0.28"],
install_requires=["numpy","cython>=0.28"]
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment