resolve merge conflict

.binstar.yml

@@ -1,31 +1,28 @@
-## The package attribure specifies a binstar package namespace to build the package to.
-## This can be specified here or on the command line
 package: conda-build
-
-## You can also specify the account to upload to,
-## you must be an admin of that account, this
-## defaults to your user account
-# user: USERNAME
+user: conda-team
 
 #===============================================================================
 # Build Matrix Options
-# Thes options may be a single item, a list or empty
-# The resulting number of builds is [platform * engine * env]
+# These options may be a single item, a list or empty
+# The resulting number of builds is [platform * engine * envvars]
 #===============================================================================
 
 ## The platforms to build on.
 ## platform defaults to linux-64
 platform:
-  - win-64
+  - linux-32
+  - linux-64
+  - osx-64
   - win-32
+  - win-64
 ## The engine are the inital conda packages you want to run with
 engine:
-  - python=2
   - python=3
-## The env param is an environment variable list
-# env:
-#  - MY_ENV=A CC=gcc
-#  - MY_ENV=B
+## The envvars param is an environment variable list
+env:
+  - PYTHON_VERSION=2.7
+  - PYTHON_VERSION=3.4
+  - PYTHON_VERSION=3.5
 
 #===============================================================================
 # Script options
@@ -34,39 +31,18 @@ engine:
 #===============================================================================
 
 ## Run before the script
-# before_script:
-#   - echo "before_script!"
+before_script:
+  - python -c "from platform import system as s; import sys; sys.exit(int(s()!='Windows'))" || export SOURCE_DIR=$SOURCE_DIR
 ## Put your main computations here!
-
-install:
-  # Use the provided conda and Python to run the install script. The order of these commands matters.
-  - conda install requests jinja2
-  - set "CONDA_DEFAULT_ENV="
-  - python tests\install_miniconda.py
-
-test:
-  - cd tests\test-recipes\metadata
-  # This will be effectively a no-op for recipes without bld.bat
-  - for /D %%f in (*) do (C:\Users\binstar\conda-build-miniconda\Scripts\conda-build.exe --no-binstar-upload %%~nf)
-
-# script:
-#   - echo "This is my binstar build!"
-
-## This will run after the script regardless of the result of script
-## BINSTAR_BUILD_RESULT=[succcess|failure]
-# after_script:
-#   - echo "The build was a $BINSTAR_BUILD_RESULT" | tee artifact1.txt
-## This will be run only after a successfull build
-# after_success:
-#   - echo "after_success!"
-## This will be run only after a build failure
-# after_failure:
-#   - echo "after_failure!"
+script:
+  # - echo 4.1.0.rc1 > conda/.version
+  - python -c "from platform import system as s; import sys; sys.exit(int(s()!='Windows'))" || conda build conda.recipe --python $PYTHON_VERSION
+  - python -c "from platform import system as s; import sys; sys.exit(int(s()=='Windows'))" || conda build conda.recipe --python %PYTHON_VERSION%
 
 #===============================================================================
 # Build Results
 # Build results are split into two categories: artifacts and targets
-# You may omit either key and stiff have a successfull build
+# You may omit either key and stiff have a successful build
 # They may be a string, list and contain any bash glob
 #===============================================================================
 
@@ -75,5 +51,5 @@ test:
 ## The special build targets 'conda' and 'pypi' may be used to
 ## upload conda builds
 ## e.g. conda is an alias for /opt/anaconda/conda-bld/<os-arch>/*.tar.bz2
-# build_targets:
-#   - conda
+build_targets:
+  - conda

.gitignore

@@ -6,3 +6,6 @@ dist/
 docs/build
 tags
 .idea/
+MANIFEST
+ve
+venv

.travis.yml

@@ -2,34 +2,32 @@ language: python
 python:
   # We don't actually use the system Python but this keeps it organized.
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
 env:
   -
 install:
   # TODO: Use a "latest" url
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda-3.5.2-Linux-x86_64.sh -O miniconda.sh;
-    elif [[ "$TRAVIS_PYTHON_VERSION" == "3.3" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda3-3.0.0-Linux-x86_64.sh -O miniconda.sh;
+      wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
     else
-      wget http://repo.continuum.io/miniconda/Miniconda3-3.5.2-Linux-x86_64.sh -O miniconda.sh;
+      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
     fi
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
   - conda config --set always_yes yes
-  - conda install --force --no-deps conda requests
-  - conda install pytest requests jinja2 patchelf pyflakes python=$TRAVIS_PYTHON_VERSION
+  - conda update -q --all
+  - conda install -q --force --no-deps conda requests
+  - conda install -q pip pytest requests jinja2 patchelf flake8 python=$TRAVIS_PYTHON_VERSION pyflakes=1.1
+  - conda install -q anaconda-client conda-build
+  - pip install pytest-cov
   - python setup.py install
   - conda info -a
 
 script:
-  - pyflakes conda_build tests bin/* bdist_conda.py setup.py example_packages
-  - py.test tests
-  - tests/test-recipes/build_recipes.sh
-  - tests/test-skeleton/test-skeleton.sh
+  - flake8 .
+  - py.test --cov conda_build --cov-report xml tests
   - conda build --help
 
 notifications:
@@ -39,3 +37,7 @@ git:
   depth: 10000
 
 sudo: false
+
+after_success:
+  - pip install codecov
+  - codecov --env TRAVIS_PYTHON_VERSION

CHANGELOG.txt

@@ -1,11 +1,99 @@
-2016-XX-XX   1.19.1:
+2016-05-13 1.20.3:
+------------------
+Features:
+ * use posix metapackage for cran skeleton packaging (#956)
+
+Bug fixes:
+ * fix output of package paths (extra output was breaking tools).  Add tests. (#950)
+ * change default of no_download_source in build.py (for compatibility with conda-build-all) (#950)
+ * fix regression in [] being confused for selectors (#957)
+
+2016-05-13 1.20.2:
+------------------
+Features:
+ * added --token and --user flags to pass corresponding information to anaconda upload (#921)
+ * added conda render command that outputs a fully-rendered meta.yaml to either stdout, or to file (with --file) (#908)
+ * support source checkout tools specified in meta.yaml. If source checkout fails at the rendering phase, source checkout and rendering are re-done after the build environment is created. (#843, #946)
+ * fn is now optional when a URL specifies a filename. (#942)
+ * CRAN skeleton generator now uses MSYS2 for Windows support (#942)
+ * conda build & conda render both recursively look for meta.yaml (support conda-forge feedstock submodules) (#908)
+ * Whitelist MAKEFLAGS environment variable. Setting this outside conda build should take effect in your build. Parallelize on *nix by adding -j here, instead of -j${CPU_COUNT} in your build.sh. This helps on CI's, where CPU_COUNT is not always well-behaved. (#917)
+ * Run python_d executable on windows when debug feature is active (#724)
+ * add conda build flag --keep-old-work that temporarily moves your last build, then moves it back after completion. For debugging, when more than one package is involved. (#833)
+ * Allow selectors in imported jinja templates (#739)
+
+Bug fixes:
+ * fixed several instances wherein --skip-existing did not work (#897, #945)
+ * Fully render recipe before outputting build string  * fixes empty spots where GIT_* info should have been (#923)
+ * Add MSYS2 path conversion filters to avoid issues with Win 7.1 SDK (#900)
+ * Address PyPI's change of URL format (#922,
+ * Fix invalid gcc "-m 32" flag (#916)
+ * Fix empty section (due to selectors) handling regression (#919)
+ * Fix regression in handling of VS2008 Pro (not Express + VC for Python 2.7). It is important to at least try to run vcvarsall.bat. (#913)
+ * Fix CPAN skeleton generator (handle missing sections better) (#912)
+ * Make test/requires versions match build/requires without additional pinning (#907)
+ * Remove hard-coded CYGWIN path from conda-build's custom PATH (#903)
+ * Source is downloaded before testing, fixing an issue where if build machine and some other test machine had different source, strange things happened. (#946)
+ * Fix regression with Python 3.x fixing shebangs (#892)
+ * Fix conda inspect crashes by using conda-meta info rather than filenames or dist names for package info (#947)
+
+Miscellany:
+ * restore AppVeyor testing for Windows builds (#864)
+ * Build py3.5 on Appveyor (#938)
+ * PEP8 cleanup; use flake8 rather than pyflakes (#938)
+ * limited scope of project locking to avoid lock conflicts between build and rendering (#923)
+ * set up anaconda.org build infrastructure (#924)
+ * on Windows, environment variables are written to the temporary bld.bat in the source work folder. (#933)
+
+
+2016-04-21   1.20.1:
+--------------------
+  * fix source/path and GIT_* issues, #801
+  * fix invalid assertion, #855
+  * environ.py refactor/clenup, #856
+  * Better messaging for yaml parsing errors, #862
+  * fix typo, #863
+  * make CONDA_PY and CONDA_NPY available in build.sh, #837
+  * execute source fetchers (e.g., git, hg) in the _build environment, #843
+  * use memory map rather than read() to reduce memory usage, #866
+  * fix svn url on Windows in checkout tool test, #867
+  * fix empty files bug, #869
+  * improve Visual Studio logic, #861
+  * add files in order of increasing size to improve access times to tar, #870
+  * VS_YEAR, VS_VERSION, VS_MAJOR and CMAKE_GENERATOR environment variables, #872
+
+
+2016-03-25   1.20.0:
+--------------------
+  * support for Lua as a built-in language (Alex Wiltschko), #719
+  * allow additional keys in "about" section, #831
+  * fix Examples directory in noarch_python, #838
+  * revert OS X SIP fix, part of #808, #844
+  * fixed race condition between removal and creation of tmp_dir on win, #847
+
+
+2016-03-10   1.19.2:
+--------------------
+  * silence some errors when subprocessing git #790
+  * fixes conda skeleton cran under python3 #817
+  * fixes some bugs introduced with the #808 otools refactor, #821, #825
+  * fixes #818 conda-build 1.19.1 breaks C compilation, #825
+  * actually fix #807 recurisive builds after conda 4.0 release, #826
+  * fixes #820 crash when building from a git repo on Windows, #824
+
+
+2016-03-09   1.19.1:
 --------------------
   * Environment variables defined in the 'script_env' build section of
     the meta.yaml file were previously assigned the value '<UNDEFINED>'
     if not found in the environment. Now they are left unset and a
     warning is raised instead, #763.
   * fix printing of NumPy 1.10 in help message, #776
   * add -m32 to CFLAGS and CXXFLAGS for multilib gcc, #775
+  * fixes CYGWIN_PREFIX for drive letters other than C:, #788
+  * fixes for noarch package building on Windows, #799
+  * work-arounds for System Integrity Protection on OS X El Capitan, #808
+  * fix recurisive builds after conda 4.0 release, #813
 
 
 2016-01-29   1.19.0:

README.rst

@@ -5,6 +5,19 @@ conda-build
 .. image:: https://travis-ci.org/conda/conda-build.svg?branch=master
                :target: https://travis-ci.org/conda/conda-build
 
+.. image:: https://ci.appveyor.com/api/projects/status/wdis0rkcfdoeql3x?svg=true
+               :target: https://ci.appveyor.com/project/ContinuumAnalytics/conda-build
+
+.. image:: https://anaconda.org/conda-team/conda-build/badges/build.svg
+               :target: https://anaconda.org/conda-team/conda-build/
+
+.. image:: https://www.quantifiedcode.com/api/v1/project/1960a96404aa431bab5d834edff1cf85/badge.svg
+  :target: https://www.quantifiedcode.com/app/project/1960a96404aa431bab5d834edff1cf85
+  :alt: Code issues
+
+.. image:: https://codecov.io/gh/conda/conda-build/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/conda/conda-build
+
 
 Installation
 --------------

appveyor.yml

@@ -0,0 +1,89 @@
+environment:
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\tools\\appveyor\\run_with_env.cmd"
+
+  matrix:
+    - PYTHON: "C:\\Python35_64"
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python27_64"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python34_64"
+      PYTHON_VERSION: "3.4"
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python27_32"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python35_32"
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python34_32"
+      PYTHON_VERSION: "3.4"
+      PYTHON_ARCH: "32"
+
+init:
+  - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH% %HOME%
+
+
+install:
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+      https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+      Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
+  # these correspond to folder naming of miniconda installs on appveyor.  See
+  # https://www.appveyor.com/docs/installed-software#python
+  - if "%PYTHON_VERSION%" == "3.4" set "BASE_PYTHON_VERSION=3"
+  - if "%PYTHON_VERSION%" == "3.5" set "BASE_PYTHON_VERSION=35"
+  - if "%PYTHON_ARCH%" == "64" set "ARCH_LABEL=-x64"
+  # These are already installed on appveyor.  Update them.
+  - set "CONDA_ROOT=C:\Miniconda%BASE_PYTHON_VERSION%%ARCH_LABEL%"
+  - set "PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%CONDA_ROOT%\Library\bin;%PATH%"
+  - conda config --set always_yes yes
+  - conda update -q conda
+  - git clone https://github.com/conda/conda
+  - cd conda
+  - git checkout 4.0.8
+  - python setup.py install
+  - cd ../
+  - conda info
+  - conda update -q --all
+  - python -c "import sys; print(sys.version)"
+  - python -c "import sys; print(sys.executable)"
+  - python -c "import sys; print(sys.prefix)"
+  - conda install -q pytest pytest-cov git anaconda-client
+  # this is to ensure dependencies
+  - conda install -q conda-build
+  - python --version
+  - python -c "import struct; print(struct.calcsize('P') * 8)"
+  - python setup.py install
+  - set PATH
+  - conda build --version
+  - call appveyor\setup_x64.bat
+  - copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
+
+
+# Not a .NET project, we build package in the install step instead
+build: false
+
+test_script:
+  - set "PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%CONDA_ROOT%\Library\bin;%PATH%"
+  - set PATH
+  - py.test --cov conda_build --cov-report xml tests
+
+on_success:
+  - pip install codecov
+  - codecov --env PYTHON_VERSION

appveyor/setup_x64.bat

@@ -0,0 +1,13 @@
+regedit /s x64\VC_OBJECTS_PLATFORM_INFO.reg
+
+regedit /s x64\600dd186-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\600dd187-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\600dd188-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\600dd189-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\656d875f-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\656d8760-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\656d8763-2429-11d7-8bf6-00b0d03daa06.reg
+regedit /s x64\656d8766-2429-11d7-8bf6-00b0d03daa06.reg
+
+copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\AMD64.VCPlatform.config" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\AMD64.VCPlatform.Express.config"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\Itanium.VCPlatform.config" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\Itanium.VCPlatform.Express.config"