From 45064063a9692be62c4127b903a17ff566f294d5 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 14 Apr 2020 16:58:17 +0200
Subject: [PATCH] add numeric prefix to python versino name
---
CMakeModules/prepare_version_tag.cmake | 4 ++++
consumer/api/python/asapo_consumer.pyx.in | 2 +-
consumer/api/python/binary_dist_windows/setup.py.in | 2 +-
consumer/api/python/source_dist_linux/setup.py.in | 2 +-
producer/api/python/asapo_producer.pyx.in | 2 +-
producer/api/python/binary_dist_windows/setup.py.in | 2 +-
producer/api/python/source_dist_linux/setup.py.in | 2 +-
7 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeModules/prepare_version_tag.cmake
index 1a1517517..3a862a5c1 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeModules/prepare_version_tag.cmake
@@ -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})
diff --git a/consumer/api/python/asapo_consumer.pyx.in b/consumer/api/python/asapo_consumer.pyx.in
index 2b4978a80..679b699cc 100644
--- a/consumer/api/python/asapo_consumer.pyx.in
+++ b/consumer/api/python/asapo_consumer.pyx.in
@@ -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@"
diff --git a/consumer/api/python/binary_dist_windows/setup.py.in b/consumer/api/python/binary_dist_windows/setup.py.in
index f36079e2d..d142f2f21 100644
--- a/consumer/api/python/binary_dist_windows/setup.py.in
+++ b/consumer/api/python/binary_dist_windows/setup.py.in
@@ -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'],
diff --git a/consumer/api/python/source_dist_linux/setup.py.in b/consumer/api/python/source_dist_linux/setup.py.in
index f669a88b0..a171722ab 100644
--- a/consumer/api/python/source_dist_linux/setup.py.in
+++ b/consumer/api/python/source_dist_linux/setup.py.in
@@ -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"]
)
diff --git a/producer/api/python/asapo_producer.pyx.in b/producer/api/python/asapo_producer.pyx.in
index 7f28a27ec..38597a554 100644
--- a/producer/api/python/asapo_producer.pyx.in
+++ b/producer/api/python/asapo_producer.pyx.in
@@ -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@"
diff --git a/producer/api/python/binary_dist_windows/setup.py.in b/producer/api/python/binary_dist_windows/setup.py.in
index c606b8112..49769067d 100644
--- a/producer/api/python/binary_dist_windows/setup.py.in
+++ b/producer/api/python/binary_dist_windows/setup.py.in
@@ -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'],
diff --git a/producer/api/python/source_dist_linux/setup.py.in b/producer/api/python/source_dist_linux/setup.py.in
index d1f198780..b7b2f6681 100644
--- a/producer/api/python/source_dist_linux/setup.py.in
+++ b/producer/api/python/source_dist_linux/setup.py.in
@@ -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"]
)
--
GitLab