From 990f32397b8795a7605f2d4be9e479388f3756f0 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 13 Feb 2020 15:08:36 +0100 Subject: [PATCH] WIP --- .travis.yml | 2 +- conda-recepie/conda_build_config.yaml | 3 +++ conda-recepie/meta.yaml | 9 +++------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96687308d..db87ebb2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ script: deploy: provider: script - script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; + script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; on: branch: udp diff --git a/conda-recepie/conda_build_config.yaml b/conda-recepie/conda_build_config.yaml index 9c458094d..b028cf132 100644 --- a/conda-recepie/conda_build_config.yaml +++ b/conda-recepie/conda_build_config.yaml @@ -2,3 +2,6 @@ python: - 3.6 - 3.7 - 3.8 + +numpy: + - 1.17 \ No newline at end of file diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml index 4568cab37..2d7874c9e 100755 --- a/conda-recepie/meta.yaml +++ b/conda-recepie/meta.yaml @@ -16,13 +16,10 @@ requirements: build: - {{ compiler('c') }} - {{compiler('cxx')}} - # - python {{python}} - cmake - - qwt 6 #require qt5 investigate before activating gui - - qt=4.8 - # - zeromq=4.2.5=hfc679d8_5 + - qwt 6 + - qt 4.8 - zeromq - # - pyzmq - xorg-libx11 - xorg-libice - xorg-libxext @@ -69,9 +66,9 @@ outputs: requirements: build: + - python - {{ compiler('c') }} - {{compiler('cxx')}} - - python - {{ pin_subpackage('slsdetlib', exact=True) }} - setuptools