diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-12-09 06:25:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 06:25:54 -0800 |
| commit | 510f84ea64cca403d4ce85f3fdb77596ce06463a (patch) | |
| tree | b801948a0d3a9ad32202760097d41b2ffad5c55d | |
| parent | 77f2cedaac088da5107dcfb37ae62d8f3a56f335 (diff) | |
| parent | 25f38c8ac5275ff88cc1245ab475510864543ceb (diff) | |
| download | astra-510f84ea64cca403d4ce85f3fdb77596ce06463a.tar.gz astra-510f84ea64cca403d4ce85f3fdb77596ce06463a.tar.bz2 astra-510f84ea64cca403d4ce85f3fdb77596ce06463a.tar.xz astra-510f84ea64cca403d4ce85f3fdb77596ce06463a.zip | |
Merge pull request #85 from dmpelt/conda_numpy_version
Use specific numpy version in conda package
| -rw-r--r-- | python/conda/linux_release/builder/Dockerfile | 13 | ||||
| -rw-r--r-- | python/conda/linux_release/release.sh | 1 | ||||
| -rw-r--r-- | python/conda/meta.yaml | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile index d09a9d7..12bde50 100644 --- a/python/conda/linux_release/builder/Dockerfile +++ b/python/conda/linux_release/builder/Dockerfile @@ -1,8 +1,13 @@ FROM astra-build-env ARG BUILD_NUMBER= WORKDIR /root -RUN git clone -b master https://github.com/astra-toolbox/astra-toolbox -RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda//meta.yaml +RUN git clone --depth 1 https://github.com/astra-toolbox/astra-toolbox +RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/meta.yaml RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra -RUN conda-build --python=3.5 astra-toolbox/python/conda -RUN conda-build --python=2.7 astra-toolbox/python/conda +RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda +RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda +RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda +RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda +RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda +RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda +RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh index 35cbdd0..cf62bd5 100644 --- a/python/conda/linux_release/release.sh +++ b/python/conda/linux_release/release.sh @@ -6,6 +6,7 @@ D=`mktemp -d` [ -f buildenv/Miniconda3-4.2.12-Linux-x86_64.sh ] || (cd buildenv; wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh ) docker build -t astra-build-env buildenv +#docker build --no-cache --build-arg=BUILD_NUMBER=0 -t astra-builder builder docker build --no-cache -t astra-builder builder docker run --name astra-build-cnt -v $D:/out:z astra-builder /bin/bash -c "cp /root/miniconda3/conda-bld/linux-64/*astra* /out" diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 162103f..8194d04 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -33,7 +33,7 @@ requirements: run: - python - - numpy + - numpy x.x - scipy - six - libastra ==1.8 |