conda · msarahan · Sep 16, 2016 · Sep 27, 2016 · Sep 28, 2016 · Sep 28, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,11 @@ matrix:
     #   env: CANARY=true
     #   os: linux
     - python: '3.5'
-      env: FLAKE8=true
+      env: CONDA=4.1
+      os: linux
+    - python: '3.5'
+      env:
+        - FLAKE8=true
       os: linux
 
 install:
@@ -22,20 +26,24 @@ install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
   - conda config --set always_yes yes
+  - conda config --set auto_update_conda False
   - conda update -q --all
   - if [[ "$CANARY" == "true" ]]; then
       conda install -y -q -c conda-canary conda;
       conda config --set always_yes yes;
+    else
+      if [ -n "$CONDA" ]; then
+        conda install -y --no-deps conda=${CONDA};
+      fi
     fi
-  - conda install -q --force --no-deps conda requests
-  - conda install -q anaconda-client requests filelock jinja2 patchelf python=$TRAVIS_PYTHON_VERSION pyflakes=1.1
+
+  - conda install -q anaconda-client requests=2.11.1 filelock contextlib2 jinja2 patchelf python=$TRAVIS_PYTHON_VERSION pyflakes=1.1 conda-verify
   - pip install pkginfo
   - if [[ "$FLAKE8" == "true" ]]; then
       conda install -q flake8;
     else
       conda install -c conda-forge -q perl;
       conda install -q pytest pip pytest-cov numpy mock;
-      conda update -q --all;
       $HOME/miniconda/bin/pip install pytest-xdist pytest-capturelog;
       pushd .. && git clone https://github.com/conda/conda_build_test_recipe && popd;
     fi

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,236 @@
+2016-12-12 2.0.12:
+
+Enhancements:
+-------------
+
+* Whitelist, rather than hardcode, MACOSX_DEPLOYMENT_TARGET.  Default to 10.7  #1561
+* Allow local relative paths to be passed as channel arguments #1565
+
+Bug fixes:
+----------
+
+* Keep CONDA_PATH_BACKUP as allowed variable in build/test env activation.  Necessary to make deactivation work correctly.  #1560
+* Define nomkl selector when FEATURE_NOMKL environment variable is not set #1562
+* Move test removal of packaged recipe until after test completes #1563
+* Allow source_files in recognized meta.yaml fields #1572
+
+Contributors:
+-------------
+
+* @jakirkham
+* @mingwandroid
+* @msarahan
+
+
+2016-11-28 2.0.11:
+------------------
+
+Enhancements:
+-------------
+
+* Further develop and update files.json #1501
+* New command line option: ``--output-folder`` allows moving artifact after build (to facilitate CI) #1538
+* support globs in `ignore_prefix_files`, `has_prefix_files`, `always_include_files`, `binary_has_prefix_files` #1554
+* decouple `ignore_prefix_files` from `binary_relocation`; make `binary_relocation` also accept a list of files or globs #1555
+
+Bug fixes:
+----------
+
+* rename `short_path` key in files.json to `path` #1501
+* allow `!` in package version (used in epoch) #1542
+* don't compute SHA256 for folders #1544
+* fix merge check for dst starting with src #1546
+* use normpath when comparing utils.relative (fixes git clone issue) #1547
+* disallow softlinks for conda (>=v.4.2) in conda-build created environments #1548
+
+Contributors:
+-------------
+
+* @mingwandroid
+* @msarahan
+* @soapy1
+
+2016-11-14 2.0.10:
+------------------
+
+Bug fixes:
+----------
+
+* Fix backwards incompatibility with conda 4.1 #1528
+
+Contributors:
+-------------
+
+* @msarahan
+
+
+2016-11-11 2.0.9:
+-----------------
+
+Enhancements:
+-------------
+
+* break build string construction out into standalone function for external usage (Concourse CI project) #1513
+* add conda-verify support.  Defaults to enabled.  Adds conda-verify as runtime requirement.
+*
+
+Bug fixes:
+----------
+
+* handle creation of intermediate folders when filenames provided as build/source_files arguments #1511
+* Fix passing of version argument to pypi skeleton arguments #1516
+* break symlinks and copy files if symlinks point to executable outside of same path (fix RPATH misbehavior on linux/mac, because ld.so follows symlinks) #1521
+* specify conda executable name more specifically when getting about.json info.  It was not being found in some cases without the file extension.  #1525
+
+Contributors:
+-------------
+
+* @jhprinz
+* @msarahan
+* @soapy1
+
+
+2016-11-03 2.0.8:
+-----------------
+
+Enhancements:
+-------------
+
+* Support otool -h changes in MacOS 10.12 #1479
+* Fix lists of empty strings created by ensure_list (patches failing due to empty patch list) #1493
+* Improved logic to guess the appropriate license_family to add to package's index. This improves filtering. #1495 #1503
+* Logic for the license_family is now shared between open-source conda-build, and proprietary cas-mirror packages. #1495 #1503
+
+Bug fixes:
+----------
+
+* Centralize locks in memory to avoid lock timeouts within a single process #1496
+* fix overly broad regex in detecting whether a recipe uses version control systems #1498
+* clarify error message when extracting egg fails due to overlapping file names #1500
+* fix regression where subdir was not respecting non-x86 arch (values other than 32 or 64) #1506
+
+Contributors:
+-------------
+
+* @caseyclements
+* @minrk
+* @msarahan
+
+
+2016-10-24 2.0.7:
+-----------------
+
+Enhancements:
+-------------
+
+* populate SHLIB_EXT environment variable.  For example, .so, .dll, .dylib file extensions use this for their native ending.  #1478
+
+Bug fixes:
+----------
+
+* fix metapackage not going through api, thus not showing output file path.  #1470
+* restore script exe creation on Windows.  These are for standalone scripts installed by distutils or setuptools in setup.py.  #1471
+* fix noarch value propagation from meta.yaml to config.  Was causing noarch to not be respected in some cases.  #1472
+* fix calls to subprocess not converting unicode to str  #1473
+* restore detect_binary_files_with_prefix behavior - in particular, respect it when false.  # 1477
+
+Contributors:
+-------------
+
+* @jschueller
+* @mingwandroid
+* @msarahan
+
+
+2016-10-13 2.0.6:
+-----------------
+
+Bug fixes:
+----------
+
+* fix erroneous import that was only compatible with conda 4.2.x #1460
+
+Contributors:
+-------------
+
+* @msarahan
+
+
+2016-10-13 2.0.5:
+-----------------
+
+Enhancements:
+-------------
+
+* Add new jinja function for extracting information from files with regular expressions #1443
+
+Bug fixes:
+----------
+
+* Quote paths in activation of build and test envs #1448
+* Fix source re-copy (leading to IOError) with test as a separate step #1452
+* Call conda with an absolute path when gathering metadata for package about.json #1455
+* Don't strictly require conda-env to be present for about.json data #1455
+* Fix version argument to skeletons not being respected #1456
+* Fix infinite recursion when missing dependency is either r or python #1458
+
+Contributors:
+-------------
+
+* @bryanwweber
+* @msarahan
+
+
+2016-10-07 2.0.4:
+-----------------
+
+Enhancements:
+-------------
+
+* Add build/skip_compile_pyc meta.yaml option.  Use to skip compilation on pyc files listed therein.  #1169
+* Add build environment metadata to about.json (conda, conda-build versions, channels, root pkgs) #1407
+* Make subdir member of config a derived property, so that setting platform or bits is more direct #1427
+* Use subprocess call to windows del function to clear .trash folder, rather than conda.  Big speedup. #1438
+
+Bug fixes:
+----------
+
+* fix regression regarding 'config' in pypi skeleton for recipes with entry points #1430
+* don't load setup.py data when considering entry points (use only info from meta.yaml) #1431
+* fall back to trying to copy files without attributes or metadata if those fail #1436
+* Fix permissions on packaged files to be user and group writable, and other readable. #1437
+* fix conda develop not respecting python version of target environment #1440
+
+Contributors:
+-------------
+
+* @mingwandroid
+* @msarahan
+
+
+2016-09-27 2.0.3:
+-----------------
+
+Enhancements:
+-------------
+
+* add support for noarch: python #1366
+
+Bug fixes:
+----------
+
+* convert popen args to bytestrings if unicode #1413
+* Fix perl file access error on win skeleton cpan #1414
+* Catch patchelf failures in post #1418
+* fix path walking in get_ext_files #1422
+
+Contributors:
+-------------
+
+* @mingwandroid
+* @msarahan
+* @soapy1
+
 2016-09-27 2.0.2:
 -----------------
 

diff --git a/README.rst b/README.rst
@@ -95,9 +95,15 @@ Testing
 -------
 
 Running our test suite requires cloning one other repo at the same level as conda-build:
-https://github.com/conda/conda_build_test_repo - this is necessary for relative path tests
+https://github.com/conda/conda_build_test_recipe - this is necessary for relative path tests
 outside of conda build's build tree.
 
+Additionally, you need to install a few extra packages:
+
+.. code-block:: bash
+
+  conda install pytest pytest-cov mock
+
 The test suite runs with py.test. Some useful commands to run select tests,
 assuming you are in the conda-build root folder:
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -50,10 +50,10 @@ install:
   - python -c "import sys; print(sys.version)"
   - python -c "import sys; print(sys.executable)"
   - python -c "import sys; print(sys.prefix)"
-  - conda install -q pip pytest pytest-cov jinja2 patch flake8 mock requests
-  - conda install -q pyflakes=1.1 pycrypto posix m2-git anaconda-client numpy
-  - conda install -c conda-forge -q perl
   - conda update -q --all
+  - conda install -q pip pytest pytest-cov jinja2 patch flake8 mock requests=2.11.1 contextlib2
+  - conda install -q pyflakes=1.1 pycrypto posix m2-git anaconda-client numpy conda-verify
+  - conda install -c conda-forge -q perl
   # this is to ensure dependencies
   - python --version
   - python -c "import struct; print(struct.calcsize('P') * 8)"
@@ -66,7 +66,6 @@ install:
   # This is an extra repo that we clone for relative path entries
   - cmd: pushd .. && git clone https://github.com/conda/conda_build_test_recipe && popd
 
-
 # Not a .NET project, we build package in the install step instead
 build: false
 
@@ -75,18 +74,6 @@ test_script:
   - set PATH
   - mkdir C:\cbtmp
   - py.test -v --cov conda_build --cov-report xml tests --basetemp C:\cbtmp -n 2
-  # create a package (this build is done with conda-build from source, and does not test entry points)
-  - conda build conda.recipe --no-anaconda-upload -c conda-forge
-  # Create a new environment (with underscore, so that conda can be installed), to test entry points
-  - conda create -n _cbtest python=%PYTHON_VERSION%
-  - activate _cbtest
-  - conda render --output conda.recipe > tmpFile
-  - SET /p fn= < tmpFile
-  - DEL tmpFile
-  - conda install %fn%
-  - pip install filelock
-  # this build should be done using actual entry points from the package we built above.
-  - conda build conda.recipe --no-anaconda-upload -c conda-forge
 
 on_failure:
   - 7z.exe a cbtmp.7z C:\cbtmp

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -22,14 +22,17 @@ requirements:
   build:
     - python
   run:
+    - conda-verify
     - conda  >=4.1
+    - contextlib2   [py<34]
     - filelock
     - jinja2
     - patchelf      [linux]
     - pycrypto
     - python
     - pyyaml
     - pkginfo
+    - enum34        [py<34]
 
 test:
   requires:

diff --git a/conda_build/_link.py b/conda_build/_link.py
@@ -82,7 +82,7 @@ def create_script(fn):
         with open(dst, 'w') as fo:
             fo.write('#!%s\n' % normpath(sys.executable))
             fo.write(data)
-        os.chmod(dst, 0o755)
+        os.chmod(dst, 0o775)
         FILES.append('bin/%s' % fn)