diff --git a/.travis.yml b/.travis.yml index 61318b6a4..62c8f26a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,4 @@ deploy: provider: script script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; on: - branch: 4.0.2-rc + branch: 4.0.2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 635481139..c34d30e38 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: sls_detector_software - version: 4.0.2rc + version: 4.0.2 source: - path: .. @@ -16,8 +16,8 @@ requirements: - {{ compiler('c') }} - {{compiler('cxx')}} - cmake - - qwt 6.* - - qt=4.8.7=7 + # - qwt 6.* + # - qt=4.8.7 - zeromq=4.2.5=hfc679d8_5 - pyzmq - xorg-libx11 @@ -52,38 +52,38 @@ requirements: outputs: - name: sls_detector_lib - version: 4.0.2rc + version: 4.0.2 script: copy_lib.sh requirements: build: - {{ compiler('c') }} - {{compiler('cxx')}} - - name: sls_detector_gui - version: 4.0.2rc - script: copy_gui.sh - requirements: - build: - - {{ compiler('c') }} - - {{compiler('cxx')}} - - cmake - - qwt 6.* - - qt=4.8.7=7 - - zeromq=4.2.5=hfc679d8_5 - - pyzmq - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-libegl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - run: - - sls_detector_lib=4.0.1 - - qwt 6.* - - qt=4.8.7=7 + # - name: sls_detector_gui + # version: 4.0.2rc + # script: copy_gui.sh + # requirements: + # build: + # - {{ compiler('c') }} + # - {{compiler('cxx')}} + # - cmake + # - qwt 6.* + # - qt=4.8.7=7 + # - zeromq=4.2.5=hfc679d8_5 + # - pyzmq + # - xorg-libx11 + # - xorg-libice + # - xorg-libxext + # - xorg-libsm + # - xorg-libxau + # - xorg-libxrender + # - xorg-libxfixes + # - {{ cdt('mesa-libgl-devel') }} # [linux] + # - {{ cdt('mesa-libegl-devel') }} # [linux] + # - {{ cdt('mesa-dri-drivers') }} # [linux] + # - {{ cdt('libselinux') }} # [linux] + # - {{ cdt('libxdamage') }} # [linux] + # - {{ cdt('libxxf86vm') }} # [linux] + # run: + # - sls_detector_lib=4.0.1 + # - qwt 6.* + # - qt=4.8.7=7