diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-12-02 01:04:35 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2016-12-02 01:04:35 +0100 |
| commit | 70bc6ff9d036239c6d2810437e5b78cf95c04dce (patch) | |
| tree | f9c9474e7ad036407bfa793eacf6867e578ea561 /python/conda | |
| parent | 298fda68e277c46d06fcf81866318dd0a1010746 (diff) | |
| download | astra-70bc6ff9d036239c6d2810437e5b78cf95c04dce.tar.gz astra-70bc6ff9d036239c6d2810437e5b78cf95c04dce.tar.bz2 astra-70bc6ff9d036239c6d2810437e5b78cf95c04dce.tar.xz astra-70bc6ff9d036239c6d2810437e5b78cf95c04dce.zip | |
Update versions for 1.8rc1 conda package
Diffstat (limited to 'python/conda')
| -rw-r--r-- | python/conda/linux_release/builder/Dockerfile | 2 | ||||
| -rw-r--r-- | python/conda/meta.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile index 6acef62..d09a9d7 100644 --- a/python/conda/linux_release/builder/Dockerfile +++ b/python/conda/linux_release/builder/Dockerfile @@ -1,7 +1,7 @@ FROM astra-build-env ARG BUILD_NUMBER= WORKDIR /root -RUN git clone -b conda_release https://github.com/astra-toolbox/astra-toolbox +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 conda-build --python=3.5 astra-toolbox/python/conda/libastra RUN conda-build --python=3.5 astra-toolbox/python/conda diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 84054c1..88c01d1 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -30,14 +30,14 @@ requirements: - numpy - scipy - six - - libastra ==1.8b # TODO: change to release version + - libastra ==1.8rc1 # TODO: change to release version run: - python - numpy - scipy - six - - libastra ==1.8b # TODO: change to release version + - libastra ==1.8rc1 # TODO: change to release version about: |