MAJOR UPDATE. Use the gcc that comes from osx

ec31ef8e · Amir Mohammadi · 85709e94 · ec31ef8e · ec31ef8e · ec31ef8e
Commit ec31ef8e authored Feb 09, 2017 by Amir Mohammadi
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-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
--- 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

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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: