diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58c49b57bebd6a55411513afd39f3904dd6276fa..06e6624a7fee0404abbb37aa9b34ea41769683ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -image: continuumio/conda_builder_linux - stages: - build @@ -10,55 +8,39 @@ variables: CONDA_NPY: "111" PYTHONUNBUFFERED: "1" -cache: - key: "$CI_BUILD_NAME" - paths: - - conda-env/.pkgs/*.tar.bz2 - - conda-env/.pkgs/urls.txt - - conda-env/src_cache - - .build_template: &build_job stage: build + before_script: + - export PATH=/opt/miniconda/bin:/usr/local/bin:$PATH script: - conda config --set always_yes true - conda config --set show_channel_urls true - conda config --add channels ${UPLOAD_URL} - conda config --set ssl_verify false - - conda install --quiet --yes -c defaults -c conda-forge conda=4.2 curl conda-build-all + - conda install --quiet --yes -c defaults conda=4.2 curl conda-build-all - conda clean --lock - conda info - - conda-build-all ./dependencies --inspect-channels ${UPLOAD_URL} --matrix-conditions "numpy >=1.11" "python >=2.7,<3|>=3.4,<3.6" || true - - conda-build-all ./recipes --inspect-channels ${UPLOAD_URL} --matrix-conditions "numpy >=1.11" "python >=2.7,<3|>=3.4,<3.6" || true - + - conda-build-all ./dependencies --inspect-channels ${UPLOAD_URL} --matrix-conditions "numpy >=1.11" "python >=2.7,<3|>=3.4,<3.6" + - conda-build-all ./recipes --inspect-channels ${UPLOAD_URL} --matrix-conditions "numpy >=1.11" "python >=2.7,<3|>=3.4,<3.6" + cache: + key: "$CI_BUILD_NAME" + paths: + - conda-env/.pkgs/*.tar.bz2 + - conda-env/.pkgs/urls.txt + - conda-env/src_cache build-linux-64: <<: *build_job - - before_script: - - export PATH=/opt/miniconda/bin:/usr/local/bin:$PATH - - export LD_LIBRARY_PATH=/opt/miniconda/lib:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH - - export LIBRARY_PATH=/opt/miniconda/lib:/usr/local/lib64:/usr/local/lib:$LIBRARY_PATH - - export INCLUDE=/opt/miniconda/include:$INCLUDE - + image: continuumio/conda_builder_linux after_script: - export PATH=/opt/miniconda/bin:/usr/local/bin:$PATH - ./upload-packages.sh linux-64 - tags: - docker - build-osx-64: <<: *build_job - - before_script: - - rm -f ~/.condarc || true - - rm -f /opt/miniconda/.condarc || true - - export PATH=/opt/miniconda/bin:$PATH - after_script: - ./upload-packages.sh osx-64 - tags: - conda-macosx diff --git a/dependencies/ccache/meta.yaml b/dependencies/ccache/meta.yaml index 2428b8b63106acf6c5ac4e212056a10a3ad62735..37de272e0180a51053732441f5c39c61f4e7aa46 100644 --- a/dependencies/ccache/meta.yaml +++ b/dependencies/ccache/meta.yaml @@ -17,11 +17,11 @@ build: requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - zlib 1.2.8 - xz 5.2.2 - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - zlib >=1.2.8,<1.3 diff --git a/dependencies/cyvlfeat/meta.yaml b/dependencies/cyvlfeat/meta.yaml index 6e7919831c1f00974cb4ed7e3416b8c49753e5e2..dcf12f00bf83b7eaaee83c00ca38721d02a7373d 100644 --- a/dependencies/cyvlfeat/meta.yaml +++ b/dependencies/cyvlfeat/meta.yaml @@ -9,13 +9,13 @@ source: git_url: https://github.com/menpo/cyvlfeat.git build: - number: 0 + number: 1 requirements: build: - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] - python - setuptools - numpy x.x @@ -27,7 +27,7 @@ requirements: - python - vlfeat 0.9.* - numpy x.x - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/dependencies/eigen/meta.yaml b/dependencies/eigen/meta.yaml index fcb98f2008faaa91af2709ab412ffc2a666030cd..51c555f74839e4dc55a83155952474bd1c939b9c 100644 --- a/dependencies/eigen/meta.yaml +++ b/dependencies/eigen/meta.yaml @@ -13,19 +13,19 @@ source: - int-real-conversion.patch build: - number: 1 + number: 2 skip: true # [linux] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - cmake - python # [win] - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: files: diff --git a/dependencies/ffmpeg/meta.yaml b/dependencies/ffmpeg/meta.yaml index c887cc74d90ac43bf66d3bbbf77f2e0e9c070e47..cb341a433a95eaaa438dc03f1db03aa7f39c63d8 100644 --- a/dependencies/ffmpeg/meta.yaml +++ b/dependencies/ffmpeg/meta.yaml @@ -11,23 +11,20 @@ source: build: skip: true # [win] - number: 2 + number: 3 requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - pkg-config - libtool - yasm - x264 20131217 - zlib 1.2.8 - - gcc 4.8.5 # [osx] - - libgcc 4.8.5 # [osx] run: - x264 20131217 - zlib >=1.2.8,<1.3 - - libgcc >=4.8.5 # [osx] test: commands: diff --git a/dependencies/giflib/meta.yaml b/dependencies/giflib/meta.yaml index 207ef458fe4bf006aeafc28f641fec3ad797ef09..fb37e038225a401e79bd9320fdbf2a6c1d9acda6 100644 --- a/dependencies/giflib/meta.yaml +++ b/dependencies/giflib/meta.yaml @@ -10,17 +10,17 @@ source: md5: 8985c9411fdb2178b89d3348da9a06b0 build: - number: 1 + number: 2 skip: True # [win] requirements: build: - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/dependencies/libblitz/meta.yaml b/dependencies/libblitz/meta.yaml index 1c685b433b9e48917ab80660aa35f574501b5fc1..fa07093fde79721b24cbd239c7b3469114bdbc80 100644 --- a/dependencies/libblitz/meta.yaml +++ b/dependencies/libblitz/meta.yaml @@ -10,16 +10,16 @@ source: md5: 66268b92bda923735f2e3afc87dcb58a build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/dependencies/libmatio/meta.yaml b/dependencies/libmatio/meta.yaml index ca10030768ba6a036a11a9637eff870335af1ce2..bf6ec7cbae106df0c2cc8d4d5d6070243adc0c7d 100644 --- a/dependencies/libmatio/meta.yaml +++ b/dependencies/libmatio/meta.yaml @@ -9,21 +9,21 @@ source: md5: bb53fd06f7ebb74589e9dd684b1b66a6 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - hdf5 1.8.17|1.8.17.* - zlib 1.2.8 - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - hdf5 1.8.17|1.8.17.* - zlib >=1.2.8,<1.3 - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/dependencies/libsvm/meta.yaml b/dependencies/libsvm/meta.yaml index 23d439e95e08ed3de91da905da60f625d0eba432..d45bb5f46dd46e2ebaa3b472e63f35ccee9f967b 100644 --- a/dependencies/libsvm/meta.yaml +++ b/dependencies/libsvm/meta.yaml @@ -14,7 +14,7 @@ source: - win32.patch # [win32] build: - number: 1 + number: 2 features: - vc9 # [win and py27] - vc10 # [win and py34] @@ -22,13 +22,13 @@ build: requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python # [win] - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/dependencies/menpo/meta.yaml b/dependencies/menpo/meta.yaml index fface4310a004b31e865e14cc796dc8da976db9a..05e7c143db18c9e0a43b29e1e2e8f337f119bf53 100644 --- a/dependencies/menpo/meta.yaml +++ b/dependencies/menpo/meta.yaml @@ -12,14 +12,14 @@ source: - no-matplotlib-pin.patch build: - number: 2 + number: 3 script: python setup.py install --single-version-externally-managed --record=record.txt requirements: build: - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] - python - setuptools - numpy x.x @@ -29,7 +29,7 @@ requirements: - python - pathlib 1.0 # [py2k] - numpy x.x - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] # Scientific Python Stack - scipy diff --git a/dependencies/menpofit/meta.yaml b/dependencies/menpofit/meta.yaml index 5d4eb898445be9b93168558dc91f42be64f88f08..23fa1f478871c1aa61b52457c913522c67002b2e 100644 --- a/dependencies/menpofit/meta.yaml +++ b/dependencies/menpofit/meta.yaml @@ -9,7 +9,7 @@ source: git_url: https://github.com/menpo/menpofit.git build: - number: 0 + number: 1 script: python setup.py install --single-version-externally-managed --record=record.txt requirements: diff --git a/dependencies/opencv/meta.yaml b/dependencies/opencv/meta.yaml index eb0b463640a9f1d39b6cff621e444edf1ba4352a..82323514def9cfb7929c2c0c27f8f2626b1261d7 100644 --- a/dependencies/opencv/meta.yaml +++ b/dependencies/opencv/meta.yaml @@ -14,13 +14,13 @@ source: - cap_mpjpeg_decoder.patch # [win] build: - number: 2 + number: 3 skip: true # [linux] requirements: build: - python - - toolchain 2.1.0 + - toolchain 2.2.0 # For sha256 comparisons of opencv_contrib - openssl 1.0.* # [unix] # For downloading opencv_contrib @@ -36,8 +36,8 @@ requirements: - libtiff 4.0.6 - libpng 1.6.27 - msinttypes # [win and py<35] - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -47,7 +47,7 @@ requirements: - libpng >=1.6.27,<1.7 - jpeg 9b - libtiff >=4.0.6,<5 - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/dependencies/pyedflib/meta.yaml b/dependencies/pyedflib/meta.yaml index 39cfc760c14dc80d63b3ac282f5855978d196dbc..4da68d698dcdd84ccd1643bb5a1d550769d37173 100644 --- a/dependencies/pyedflib/meta.yaml +++ b/dependencies/pyedflib/meta.yaml @@ -9,14 +9,14 @@ source: md5: 1a71a66b016a02c721b5ae59c830bd4f build: - number: 0 + number: 1 script: python setup.py install --single-version-externally-managed --record=record.txt requirements: build: - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] - python - setuptools - numpy x.x @@ -25,7 +25,7 @@ requirements: run: - python - numpy x.x - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/dependencies/sox/meta.yaml b/dependencies/sox/meta.yaml index 114f627857b88a87a34fc4e6309c2e7235a8ddcb..b2590e6106de9178f871f5b6e2b85b797ffb78b1 100644 --- a/dependencies/sox/meta.yaml +++ b/dependencies/sox/meta.yaml @@ -10,24 +10,24 @@ source: md5: d04fba2d9245e661f245de0577f48a33 build: - number: 3 + number: 4 detect_binary_files_with_prefix: true skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - libpng 1.6.27 - zlib 1.2.8 - xz 5.2.2 - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - libpng >=1.6.27,<1.7 - zlib >=1.2.8,<1.3 - xz >=5.2.2,<6.0 - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/dependencies/vlfeat/meta.yaml b/dependencies/vlfeat/meta.yaml index 7311174845df636815700606bed4672fe4f408fc..d8041367bf6548c9a8fcbcf6723e660da55d77b7 100644 --- a/dependencies/vlfeat/meta.yaml +++ b/dependencies/vlfeat/meta.yaml @@ -16,7 +16,7 @@ source: - vs2010_path.patch # [win64 and py34] build: - number: 1 + number: 2 features: - vc9 # [win and py27] - vc10 # [win and py34] @@ -24,13 +24,8 @@ build: requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python # [win] - - gcc 4.8.5 # [osx] - - libgcc 4.8.5 # [osx] - - run: - - libgcc >=4.8.5 # [osx] test: requires: diff --git a/dependencies/x264/meta.yaml b/dependencies/x264/meta.yaml index d7803e024d0e1b8c27139d7c006833ddb48a549b..e8d67894dee3cc8dd9503da348c7526aacb3e9c5 100644 --- a/dependencies/x264/meta.yaml +++ b/dependencies/x264/meta.yaml @@ -10,18 +10,13 @@ source: md5: cfd27222c7aa9983259ddb10f7f570a6 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - yasm - - gcc 4.8.5 # [osx] - - libgcc 4.8.5 # [osx] - - run: - - libgcc >=4.8.5 # [osx] test: commands: diff --git a/dependencies/yasm/meta.yaml b/dependencies/yasm/meta.yaml index eea58eb929846e592d3867c9a963554c265883a6..477c5b351b370fd0fe9248d81d9496850b784fd0 100644 --- a/dependencies/yasm/meta.yaml +++ b/dependencies/yasm/meta.yaml @@ -15,17 +15,12 @@ source: sha1: f7872c6db3b4d93fd5a51717364d438108473149 # [win64] build: - number: 1 + number: 2 requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python # [unix] - - gcc 4.8.5 # [osx] - - libgcc 4.8.5 # [osx] - - run: - - libgcc >=4.8.5 # [osx] test: commands: diff --git a/recipes/bob.ap/meta.yaml b/recipes/bob.ap/meta.yaml index bb3748ffe0e79e6a711ff79c32a096d061ed8157..7e72e9c47a66fc1c9c7cd2e4e31b9e718c35b22a 100644 --- a/recipes/bob.ap/meta.yaml +++ b/recipes/bob.ap/meta.yaml @@ -10,12 +10,12 @@ source: md5: ca260ad6e655d48d6d4f4cbd386a905d build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -27,8 +27,8 @@ requirements: - scipy - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -39,7 +39,7 @@ requirements: - libblitz 0.10|0.10.* - numpy - scipy - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/recipes/bob.blitz/meta.yaml b/recipes/bob.blitz/meta.yaml index 8142a670c2e68d5fd34468a205b9a6fbcc6b6de3..df289f2ca34a1792e27f56e28c4cedd46fe98920 100644 --- a/recipes/bob.blitz/meta.yaml +++ b/recipes/bob.blitz/meta.yaml @@ -10,12 +10,12 @@ source: md5: 585f810562651177e7e36dc15df4f156 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -24,8 +24,8 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - cmake - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -33,7 +33,7 @@ requirements: - numpy x.x - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/recipes/bob.core/meta.yaml b/recipes/bob.core/meta.yaml index 716a93909197d1da6a637c97018a18dfb238f6d1..a40f89797fb81782a261d6f577d275fcdd73c758 100644 --- a/recipes/bob.core/meta.yaml +++ b/recipes/bob.core/meta.yaml @@ -10,12 +10,12 @@ source: md5: 954e71c130b4e4d77a0ec2a5f13e8bb6 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - cmake @@ -23,15 +23,15 @@ requirements: - bob.blitz - libblitz 0.10|0.10.* - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python - bob.blitz - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/recipes/bob.db.atnt/meta.yaml b/recipes/bob.db.atnt/meta.yaml index 1db9512c9f60ea65dc006079af22e197af2c1acf..a07b10664e51715c0f04aa1d864073183dbe5b91 100644 --- a/recipes/bob.db.atnt/meta.yaml +++ b/recipes/bob.db.atnt/meta.yaml @@ -10,13 +10,13 @@ source: url: https://pypi.io/packages/source/b/bob.db.atnt/bob.db.atnt-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] script: python -B setup.py install --single-version-externally-managed --record record.txt requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.db.base diff --git a/recipes/bob.db.base/meta.yaml b/recipes/bob.db.base/meta.yaml index bf866a622f9bad89dc2709932193a9b895247dda..ac931bab673a63ebf7edb16a10bcfe2ded0b926e 100644 --- a/recipes/bob.db.base/meta.yaml +++ b/recipes/bob.db.base/meta.yaml @@ -18,7 +18,6 @@ build: requirements: build: - - toolchain 2.1.0 - python - setuptools - bob.extension diff --git a/recipes/bob.db.iris/meta.yaml b/recipes/bob.db.iris/meta.yaml index d3fe6fe051b5b7b2b4bee5dac91ba9812d08e6d4..700abb55e953ccf56f70169be6af444d36c8ecf2 100644 --- a/recipes/bob.db.iris/meta.yaml +++ b/recipes/bob.db.iris/meta.yaml @@ -18,7 +18,6 @@ build: requirements: build: - - toolchain 2.1.0 - python - setuptools - bob.io.base diff --git a/recipes/bob.db.mnist/meta.yaml b/recipes/bob.db.mnist/meta.yaml index e240c33c066fb00a9a896f57b3d67e3ea4327045..62b7bffc9c3d77e895110df08c669792efbb2999 100644 --- a/recipes/bob.db.mnist/meta.yaml +++ b/recipes/bob.db.mnist/meta.yaml @@ -16,7 +16,6 @@ build: requirements: build: - - toolchain 2.1.0 - python - setuptools - bob.db.base diff --git a/recipes/bob.db.wine/meta.yaml b/recipes/bob.db.wine/meta.yaml index be3e2defa38eb3c646974daf8859d5c275592b04..7ea109dd5700ba026076038751892807c099a2cd 100644 --- a/recipes/bob.db.wine/meta.yaml +++ b/recipes/bob.db.wine/meta.yaml @@ -16,7 +16,6 @@ build: requirements: build: - - toolchain 2.1.0 - python - setuptools - bob.db.base diff --git a/recipes/bob.extension/meta.yaml b/recipes/bob.extension/meta.yaml index b55751b8bce8741dcdd942e4d9995e87a708c938..69ef92a2ed4fe49453f0415a4efa1a9695a3cf7f 100644 --- a/recipes/bob.extension/meta.yaml +++ b/recipes/bob.extension/meta.yaml @@ -18,7 +18,6 @@ build: requirements: build: - - toolchain 2.1.0 - python - setuptools @@ -37,9 +36,9 @@ test: - numpy - sphinx_rtd_theme - sphinx - - toolchain 2.1.0 - - gcc 4.8.5 - - libgcc 4.8.5 + - toolchain 2.2.0 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] imports: - bob diff --git a/recipes/bob.io.audio/meta.yaml b/recipes/bob.io.audio/meta.yaml index 192fc0eac8b855a9339484297f1d700eabc4db7f..41309cfaae316c70811a990dbc869ae70621bd28 100644 --- a/recipes/bob.io.audio/meta.yaml +++ b/recipes/bob.io.audio/meta.yaml @@ -10,12 +10,12 @@ source: md5: 6cc45a3d835492ab058b11b0e16fa160 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - scipy @@ -28,8 +28,8 @@ requirements: - boost 1.61.* - sox 14.4.2 - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -42,7 +42,7 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - sox 14.4.2 - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/recipes/bob.io.base/meta.yaml b/recipes/bob.io.base/meta.yaml index 8b136dc7ac36fca8fddf0bd5fa307bf43eed15f1..4d35a58ffcd7255d422c147e07f9b573db9a48fb 100644 --- a/recipes/bob.io.base/meta.yaml +++ b/recipes/bob.io.base/meta.yaml @@ -10,12 +10,12 @@ source: md5: 1ad904bf9d5a689638fd978fc912967b build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -26,8 +26,8 @@ requirements: - cmake - pkg-config - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -37,7 +37,7 @@ requirements: - libblitz 0.10|0.10.* - hdf5 1.8.17|1.8.17.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/recipes/bob.io.image/meta.yaml b/recipes/bob.io.image/meta.yaml index 8c2a85f1816ec59e2883e4abeecb952224d17ae9..6fe173387f57800422a409130c714b8ce44792ea 100644 --- a/recipes/bob.io.image/meta.yaml +++ b/recipes/bob.io.image/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.io.image/bob.io.image-{{ version }}.zip build: - number: 2 + number: 3 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -31,8 +31,8 @@ requirements: - boost 1.61.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -47,7 +47,7 @@ requirements: - jpeg 9b - libtiff >=4.0.6,<5 - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.io.matlab/meta.yaml b/recipes/bob.io.matlab/meta.yaml index b5569d9181e5d1d523fd8330f6ac6a2d852fa2e5..3bd65968232549973a8677c11d5997bbcb78ff81 100644 --- a/recipes/bob.io.matlab/meta.yaml +++ b/recipes/bob.io.matlab/meta.yaml @@ -10,12 +10,12 @@ source: md5: ae93565327b168aad1e681477cc9e1f1 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -26,8 +26,8 @@ requirements: - libmatio 1.5.* - pkg-config - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -38,7 +38,7 @@ requirements: - libblitz 0.10|0.10.* - libmatio 1.5.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/recipes/bob.io.video/meta.yaml b/recipes/bob.io.video/meta.yaml index bbe4fecbf513a84c01fbbd2e6817cb40305ac47b..7556cbf0bb73f1bf0e1c518cc30d094dc3479851 100644 --- a/recipes/bob.io.video/meta.yaml +++ b/recipes/bob.io.video/meta.yaml @@ -12,12 +12,12 @@ source: build: entry_points: - bob_video_test.py = bob.io.video.script.video_test:main - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - pillow @@ -30,8 +30,8 @@ requirements: - boost 1.61.* - pkg-config - olefile - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -43,7 +43,7 @@ requirements: - libblitz 0.10|0.10.* - ffmpeg >=2.8.10,<2.9 - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.base/meta.yaml b/recipes/bob.ip.base/meta.yaml index 3a94462ee336c273ed0bd477d6fe6c8ced9cda55..b8af47a9e518cc1bf5bc624b5b9f33f2005006ce 100644 --- a/recipes/bob.ip.base/meta.yaml +++ b/recipes/bob.ip.base/meta.yaml @@ -10,12 +10,12 @@ source: md5: b2aa2cfd0ee9801f4190501f5c34b871 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - matplotlib @@ -30,8 +30,8 @@ requirements: - boost 1.61.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -45,7 +45,7 @@ requirements: - libblitz 0.10|0.10.* - vlfeat 0.9.20 - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.color/meta.yaml b/recipes/bob.ip.color/meta.yaml index aa3d230f4f0ff1fb6af733480f29f7ce66ea4890..db4c747a0339237cfcf0c02071c09dda35b2c47c 100644 --- a/recipes/bob.ip.color/meta.yaml +++ b/recipes/bob.ip.color/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.ip.color/bob.ip.color-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -26,8 +26,8 @@ requirements: - cmake - pkg-config - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -37,7 +37,7 @@ requirements: - bob.io.base - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.draw/meta.yaml b/recipes/bob.ip.draw/meta.yaml index cad36172ecdcc695bec1547c76d21340571ba10e..642abcbe557dbe9ca4c18c075fedd0893d4c4e3b 100644 --- a/recipes/bob.ip.draw/meta.yaml +++ b/recipes/bob.ip.draw/meta.yaml @@ -10,27 +10,27 @@ source: url: https://pypi.io/packages/source/b/bob.ip.draw/bob.ip.draw-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension >2.0.4 - bob.blitz - libblitz 0.10|0.10.* - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python - bob.extension >2.0.4 - bob.blitz - libblitz 0.10|0.10.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.facedetect/meta.yaml b/recipes/bob.ip.facedetect/meta.yaml index a452c290177d4cbc61f83cf7523bb2eb8652b1c5..6d8753b6e9a2bf54d68b085d63bc59032021174c 100644 --- a/recipes/bob.ip.facedetect/meta.yaml +++ b/recipes/bob.ip.facedetect/meta.yaml @@ -18,12 +18,12 @@ build: - detect_faces.py = bob.ip.facedetect.script.detect_faces:main - evaluate_detections.py = bob.ip.facedetect.script.evaluate:main - plot_froc.py = bob.ip.facedetect.script.plot_froc:main - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.learn.boosting @@ -34,8 +34,8 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -46,7 +46,7 @@ requirements: - bob.io.image - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.flandmark/meta.yaml b/recipes/bob.ip.flandmark/meta.yaml index 6d60260813af48fb15ae273a4563cc8371f0f6c8..ee17266d6a19f87619c4d152887cc5603b762ca7 100644 --- a/recipes/bob.ip.flandmark/meta.yaml +++ b/recipes/bob.ip.flandmark/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.ip.flandmark/bob.ip.flandmark-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -30,8 +30,8 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -46,7 +46,7 @@ requirements: - matplotlib - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.gabor/meta.yaml b/recipes/bob.ip.gabor/meta.yaml index c4ea61a18607a0b82a3adfb5faadba1ee3f9f67f..ce9b439bf8feffe3608f225ec0b365531829f479 100644 --- a/recipes/bob.ip.gabor/meta.yaml +++ b/recipes/bob.ip.gabor/meta.yaml @@ -10,12 +10,12 @@ source: md5: 412844eccbc36c8a493f3846b6b8d736 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - matplotlib @@ -28,8 +28,8 @@ requirements: - pkg-config - libblitz 0.10|0.10.* - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -41,7 +41,7 @@ requirements: - bob.sp - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.optflow.hornschunck/meta.yaml b/recipes/bob.ip.optflow.hornschunck/meta.yaml index d7cdd686d1882052fdb67d51ca0c2f6fb338b588..fb23372e3e36d9366f35080354d95243b07f9929 100644 --- a/recipes/bob.ip.optflow.hornschunck/meta.yaml +++ b/recipes/bob.ip.optflow.hornschunck/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.ip.optflow.hornschunck/bob.ip.optflow.hornschunck-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -27,8 +27,8 @@ requirements: - scipy - libblitz 0.10|0.10.* - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -40,7 +40,7 @@ requirements: - bob.ip.color - scipy - libblitz 0.10|0.10.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.ip.optflow.liu/meta.yaml b/recipes/bob.ip.optflow.liu/meta.yaml index d5eafb0cdd0df0ab462020cedf79e895bbef7621..934d2a051aececf91f7b098811eaf00a85507884 100644 --- a/recipes/bob.ip.optflow.liu/meta.yaml +++ b/recipes/bob.ip.optflow.liu/meta.yaml @@ -12,12 +12,12 @@ source: build: entry_points: - bob_of_liu.py = bob.ip.optflow.liu.script.flow:main - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -28,8 +28,8 @@ requirements: - bob.ip.color - libblitz 0.10|0.10.* - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -40,7 +40,7 @@ requirements: - bob.io.video - bob.ip.color - libblitz 0.10|0.10.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.activation/meta.yaml b/recipes/bob.learn.activation/meta.yaml index 0e7c6b8cdf881076fa23dc4ec35cab79bd0732e9..57842a4eb57569755199a7983dacc9a53bb1e50d 100644 --- a/recipes/bob.learn.activation/meta.yaml +++ b/recipes/bob.learn.activation/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.learn.activation/bob.learn.activation-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension >2.0.4 @@ -26,8 +26,8 @@ requirements: - boost 1.61.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -37,7 +37,7 @@ requirements: - bob.io.base - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.boosting/meta.yaml b/recipes/bob.learn.boosting/meta.yaml index 8a31e087b81ece4f28d675cc204e28ab721681b5..0cedd00464abf3dcdd70770ba1c930b57afaef29 100644 --- a/recipes/bob.learn.boosting/meta.yaml +++ b/recipes/bob.learn.boosting/meta.yaml @@ -12,12 +12,12 @@ source: build: entry_points: - boosting_example.py = bob.learn.boosting.examples.mnist:main - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - numpy @@ -30,8 +30,8 @@ requirements: - boost 1.61.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -43,7 +43,7 @@ requirements: - bob.io.base - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.em/meta.yaml b/recipes/bob.learn.em/meta.yaml index 04b9b4484fe905ee09d6c00549f1c4b279c2b3da..90f29dc244c2ad9f1582695ce08c88524c9a7632 100644 --- a/recipes/bob.learn.em/meta.yaml +++ b/recipes/bob.learn.em/meta.yaml @@ -10,12 +10,12 @@ source: md5: 8e772b4f4c3f7e3b3ad28fc760f2a8b2 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -30,8 +30,8 @@ requirements: - pkg-config - libblitz 0.10|0.10.* - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -45,7 +45,7 @@ requirements: - bob.learn.linear - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.libsvm/meta.yaml b/recipes/bob.learn.libsvm/meta.yaml index 7214ae03492c5ed1c5008580eb25f21a7cadf550..3fcf8edf3eb49ec8a19656acf4ecffbb539bd854 100644 --- a/recipes/bob.learn.libsvm/meta.yaml +++ b/recipes/bob.learn.libsvm/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.learn.libsvm/bob.learn.libsvm-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -27,8 +27,8 @@ requirements: - boost 1.61.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -39,7 +39,7 @@ requirements: - libblitz 0.10|0.10.* - libsvm 3.21|3.21.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.linear/meta.yaml b/recipes/bob.learn.linear/meta.yaml index 639fd48263f283ce56bdab03e30c17625c4f607d..8db03dfd87995f6121879080a9ca4f5cf6f977d9 100644 --- a/recipes/bob.learn.linear/meta.yaml +++ b/recipes/bob.learn.linear/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.learn.linear/bob.learn.linear-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension >2.0.4 @@ -28,8 +28,8 @@ requirements: - pkg-config - libblitz 0.10|0.10.* - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -41,7 +41,7 @@ requirements: - bob.learn.activation - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.learn.mlp/meta.yaml b/recipes/bob.learn.mlp/meta.yaml index e827d1ef06bcd710d6993627fcf667bcb327d702..d3189a822c0146a50197badc97e89c2edf21cb96 100644 --- a/recipes/bob.learn.mlp/meta.yaml +++ b/recipes/bob.learn.mlp/meta.yaml @@ -10,12 +10,12 @@ source: url: https://pypi.io/packages/source/b/bob.learn.mlp/bob.learn.mlp-{{ version }}.zip build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension >2.0.4 @@ -28,8 +28,8 @@ requirements: - pkg-config - libblitz 0.10|0.10.* - boost 1.61.* - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -41,7 +41,7 @@ requirements: - bob.learn.activation - libblitz 0.10|0.10.* - boost 1.61.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.math/meta.yaml b/recipes/bob.math/meta.yaml index aa31988acd85ddd6e6071fbd2799875d4dc8d22a..1d94987253efa96b626b12f8daa7d565a5677d90 100644 --- a/recipes/bob.math/meta.yaml +++ b/recipes/bob.math/meta.yaml @@ -10,12 +10,12 @@ source: md5: 02f27258a95220858bd16755359e4d15 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.core @@ -25,8 +25,8 @@ requirements: - numpy x.x - mkl - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -35,7 +35,7 @@ requirements: - boost 1.61.* - numpy x.x - mkl - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: requires: diff --git a/recipes/bob.measure/meta.yaml b/recipes/bob.measure/meta.yaml index 776b91c299e95e76c676171c83e00754b26fa453..05458afca9a748109d7e5173bc4b79f8cd066268 100644 --- a/recipes/bob.measure/meta.yaml +++ b/recipes/bob.measure/meta.yaml @@ -15,12 +15,12 @@ build: - bob_eval_threshold.py = bob.measure.script.eval_threshold:main - bob_apply_threshold.py = bob.measure.script.apply_threshold:main - bob_plot_cmc.py = bob.measure.script.plot_cmc:main - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension @@ -33,8 +33,8 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - docopt - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -47,7 +47,7 @@ requirements: - libblitz 0.10|0.10.* - boost 1.61.* - docopt - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: commands: diff --git a/recipes/bob.sp/meta.yaml b/recipes/bob.sp/meta.yaml index 4d7d71d026ccf3b904d989f17de2576e5ec3ccc4..7e1fd5d1c5a5b531ac39ece2a93d98fe9fde85d7 100644 --- a/recipes/bob.sp/meta.yaml +++ b/recipes/bob.sp/meta.yaml @@ -10,12 +10,12 @@ source: md5: 6ea7680028dcb01f386044aa130fac94 build: - number: 1 + number: 2 skip: true # [win] requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension >2.0.4 @@ -24,8 +24,8 @@ requirements: - libblitz 0.10|0.10.* - cmake - pkg-config - - gcc 4.8.5 - - libgcc 4.8.5 + - gcc 4.8.5 # [linux] + - libgcc 4.8.5 # [linux] run: - python @@ -33,7 +33,7 @@ requirements: - bob.blitz - bob.core - libblitz 0.10|0.10.* - - libgcc >=4.8.5 + - libgcc >=4.8.5 # [linux] test: imports: diff --git a/recipes/bob/meta.yaml b/recipes/bob/meta.yaml index 091e1943edc003a8d821225de8ebed28ed8694ec..624258c9123e8b5dd0f2c092bea845aa2d00bcbc 100644 --- a/recipes/bob/meta.yaml +++ b/recipes/bob/meta.yaml @@ -10,13 +10,13 @@ source: md5: 997a1eeb86c524078ff3af504abb5754 build: - number: 1 + number: 2 skip: true # [win] script: python -B setup.py install --single-version-externally-managed --record record.txt requirements: build: - - toolchain 2.1.0 + - toolchain 2.2.0 - python - setuptools - bob.extension ==2.3.3 @@ -105,7 +105,7 @@ test: - pkg-config - freetype - sphinx - - toolchain 2.1.0 + - toolchain 2.2.0 about: home: https://www.idiap.ch/software/bob/