Revert "Merge pull request conda#3175 from njalerikson/master"

This reverts commit 4fd10dd, reversing
changes made to 31097f3.

.travis.yml

@@ -5,18 +5,10 @@ env:
     - PYTHONUNBUFFERED=yes
     - secure: "TyC3F7uBmd4iWLpUyhIDkpRfbhPUmRqFeFhr12VSHfzODQfeLBqB9hHMhhjVLlk1gsQwIXzNDY2X82U83d4gG0X+SEPDUpTimuWc/GJoJLQL4+uyfpS8seQWnxa7ZXkZrUdKb2owHtx+0ESzZwfOg+pd0OxoMenK9bcGo3hZtkk="
 
-# apt-get is only available to the Ubuntu tests (os: linux)
-# the other tests (os: osx) uses Homebrew to install shell
-# dependencies and is done in ./utils/travis-install.sh
 addons:
   apt:
     packages:
       - zsh
-      - csh
-      - tcsh
-      - posh
-      - ksh
-
 
 matrix:
   include:
@@ -50,10 +42,12 @@ matrix:
       language: python
 
 install:
-  - source ./utils/travis-install.sh
+  - which -a python
+  - env | sort
+  - source ./utils/travis-run-install.sh
 
 script:
-  - source ./utils/travis-script.sh
+  - source ./utils/travis-run-script.sh
 
 sudo: false
 

README.rst

@@ -188,6 +188,6 @@ separate instance of `Miniconda <http://conda.pydata.org/miniconda.html>`_ and
 work off it. This is also the only way to test conda in both Python 2 and
 Python 3, as conda can only be installed into a root environment.
 
-Run the conda tests by ``conda install pytest pytest-cov pytest-timeout mock responses``
-and then running ``py.test`` in the conda directory. The tests are also run by Travis
-CI when you make a pull request.
+Run the conda tests by ``conda install pytest pytest-cov pytest-timeout mock responses`` and then running ``py.test``
+in the conda directory. The tests are also run by Travis CI when you make a
+pull request.

appveyor.yml

@@ -8,34 +8,73 @@ environment:
     secure: ZaE7K9EHorv40AjYhSuWtQeRAsMN1+QqPf7u8rOlvEY50kdaHj87Mh5GIDZgJBzj
 
   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:\\Python35_64"
+
+    - PYTHON: "C:\\Python35_32"
       PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
+      PYTHON_ARCH: "32"
+
     # - PYTHON: "C:\\Python27_32"
     #   PYTHON_VERSION: "2.7"
     #   PYTHON_ARCH: "32"
-    - PYTHON: "C:\\Python35_32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
 
 init:
-  - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH% %HOMEDRIVE%%HOMEPATH%
+  - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH% %HOME%
 
 install:
-  - powershell .\utils\appveyor-killold.ps1
-  - call .\utils\appveyor-install.bat
+  # 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." }
+  # - utils/win_build_env.cmd
+  - powershell ./utils/install.ps1
+  # set PATH for current shell
+  - set "ANACONDA_PATH=%PYTHON%;%PYTHON%/Scripts;%$PYTHON%/Library/bin;%$PYTHON%/Library/usr/bin;%$PYTHON%/Library/mingw-64/bin"
+  - setx ANACONDA_PATH "%ANACONDA_PATH%"
+  - set "PATH=%ANACONDA_PATH%;%PATH%"
+  # this one is user-local, and affects new shells
+  - setx PATH "%ANACONDA_PATH%"
+  - conda info
+  - conda config --set always_yes yes
+  - conda update conda
+  - conda install -q psutil ruamel_yaml requests
+  # - conda info python
+  - python -c "import sys; print(sys.version)"
+  - python -c "import sys; print(sys.executable)"
+  - python -c "import sys; print(sys.prefix)"
+  - conda install -q python=%PYTHON_VERSION%
+  - conda install -q pytest requests mock
+  - conda install -q pycrypto pyflakes pycosat
+  - conda install -q git menuinst
+  - conda install -q ruamel_yaml
+  - conda install -q anaconda-client
+  - conda install -q nbformat
+  - conda install -q enum34 || WHOAMI
+  - pip install flake8 pytest-cov pytest-timeout responses
+  - python --version
+  - python -c "import struct; print(struct.calcsize('P') * 8)"
+  - python setup.py install
 
 # Not a .NET project, we build scikit-image in the install step instead
 build: false
 
 test_script:
-  - call .\utils\appveyor-script.bat
+  - py.test --cov-report xml tests --shell=cmd.exe --shell=bash.exe
 
 on_success:
   - pip install codecov coveralls scrutinizer-ocular

conda.recipe/meta.yaml

@@ -12,24 +12,13 @@ build:
   # so we have to exempt them from the list of initial files
   # for conda-build to realize they should be included.
   always_include_files:
-    - bin/conda                   [unix]
-    - bin/activate                [unix]
-    - bin/activate.sh             [unix]
-    - bin/activate.csh            [unix]
-    - bin/deactivate              [unix]
-    - bin/deactivate.sh           [unix]
-    - bin/deactivate.csh          [unix]
-    - bin/whichshell_args.bash    [unix]
-    - bin/whichshell_ps.bash      [unix]
-    - bin/whichshell.awk          [unix]
-    - bin/envvar_cleanup.bash     [unix]
-    - Scripts/activate.bat        [win]
-    - Scripts/activate.ps1        [win]
-    - Scripts/deactivate.ps1      [win]
-    - Scripts/deactivate.bat      [win]
-    - Scripts/envvar_cleanup.bat  [win]
-    - Scripts/activate            [win]
-    - Scripts/deactivate          [win]
+    - bin/conda                 [unix]
+    - bin/activate              [unix]
+    - bin/deactivate            [unix]
+    - Scripts/activate.bat      [win]
+    - Scripts/deactivate.bat    [win]
+    - Scripts/activate          [win]
+    - Scripts/deactivate        [win]
   entry_points:
     - conda = conda.cli:main
     - conda-env = conda_env.cli.main:main