diff --git a/consumer/api/python/dev-requirements.txt b/consumer/api/python/dev-requirements.txt deleted file mode 100644 index 6e5e5e427263113b61c154a9241cb72204b14989..0000000000000000000000000000000000000000 --- a/consumer/api/python/dev-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -cython -numpy==1.14.6 \ No newline at end of file diff --git a/consumer/api/python/dev-requirements.txt.in b/consumer/api/python/dev-requirements.txt.in new file mode 100644 index 0000000000000000000000000000000000000000..4e11c03464ac4c65bc7fb6546697651997cd72b8 --- /dev/null +++ b/consumer/api/python/dev-requirements.txt.in @@ -0,0 +1,2 @@ +cython +numpy==@NUMPY_VERSION@ \ No newline at end of file diff --git a/consumer/api/python/source_dist_linux/setup.py.in b/consumer/api/python/source_dist_linux/setup.py.in index 5da1c0dfd88338da59fa5fa0ed342a963c30b4da..2fcefc2e001868a33b67d345f0b1e5bba1269ac7 100644 --- a/consumer/api/python/source_dist_linux/setup.py.in +++ b/consumer/api/python/source_dist_linux/setup.py.in @@ -16,6 +16,6 @@ setup( name ="asapo_consumer", ext_modules = ext_modules, version = "@PYTHON_ASAPO_VERSION@", - setup_requires=["numpy"], - install_requires=["numpy"] + setup_requires=["numpy>=@NUMPY_VERSION@", "cython>=0.28"], + install_requires=["numpy>=@NUMPY_VERSION@"] ) diff --git a/deploy/build_env/manylinux2010/build.sh b/deploy/build_env/manylinux2010/build.sh index 4ac46715ee8ce87664ff1385ec9d26cc48737895..01d1684aa99e519bf1e40761711853b3f0647ab4 100755 --- a/deploy/build_env/manylinux2010/build.sh +++ b/deploy/build_env/manylinux2010/build.sh @@ -1,18 +1,30 @@ #!/usr/bin/env bash set -e +declare -A numpy_versions +numpy_versions[cp27mu]=1.12.1 +numpy_versions[cp27m]=1.12.1 +numpy_versions[cp35m]=1.12.1 +numpy_versions[cp36m]=1.12.1 +numpy_versions[cp37m]=1.14.5 +numpy_versions[cp38]=1.17.3 + for python_path in /opt/python/cp{27,35,36,37}*m; do + python_version=$(basename $python_path) + python_version=${python_version#*-} python=$python_path/bin/python pip=$python_path/bin/pip + numpy_version=${numpy_versions[$python_version]} + echo "building wheel for python_version=$python_version with numpy_version=$numpy_version" cd /asapo/build - cmake -DENABLE_LIBFABRIC=off -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DPython_EXECUTABLE=$python .. + cmake -DENABLE_LIBFABRIC=off -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DPython_EXECUTABLE=$python -DNUMPY_VERSION=$numpy_version .. cd consumer \ - && $pip install -r /asapo/consumer/api/python/dev-requirements.txt \ + && $pip install -r api/python/dev-requirements.txt\ && make \ && $pip wheel api/python/source_dist_linux/dist/*.tar.gz -w wheelhouse --no-deps cd ../producer \ - && $pip install -r /asapo/producer/api/python/dev-requirements.txt \ + && $pip install -r api/python/dev-requirements.txt \ && make \ && $pip wheel api/python/source_dist_linux/dist/*.tar.gz -w wheelhouse --no-deps done diff --git a/producer/api/python/dev-requirements.txt b/producer/api/python/dev-requirements.txt deleted file mode 100644 index 6e5e5e427263113b61c154a9241cb72204b14989..0000000000000000000000000000000000000000 --- a/producer/api/python/dev-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -cython -numpy==1.14.6 \ No newline at end of file diff --git a/producer/api/python/dev-requirements.txt.in b/producer/api/python/dev-requirements.txt.in new file mode 100644 index 0000000000000000000000000000000000000000..4e11c03464ac4c65bc7fb6546697651997cd72b8 --- /dev/null +++ b/producer/api/python/dev-requirements.txt.in @@ -0,0 +1,2 @@ +cython +numpy==@NUMPY_VERSION@ \ No newline at end of file diff --git a/producer/api/python/source_dist_linux/setup.py.in b/producer/api/python/source_dist_linux/setup.py.in index b7b2f668176139cb2340e154644492fadc258f55..10cec57a09a632e43967031b28389ac8dab6b6b3 100644 --- a/producer/api/python/source_dist_linux/setup.py.in +++ b/producer/api/python/source_dist_linux/setup.py.in @@ -15,6 +15,6 @@ setup( name ="asapo_producer", ext_modules = ext_modules, version = "@PYTHON_ASAPO_VERSION@", - setup_requires=["numpy","cython>=0.28"], - install_requires=["numpy","cython>=0.28"] + setup_requires=["numpy>=@NUMPY_VERSION@", "cython>=0.28"], + install_requires=["numpy>=@NUMPY_VERSION@"] )