From 7754c3b7b1794c8bfd5d7bf09f41b0c996988838 Mon Sep 17 00:00:00 2001
From: Anthony Scopatz <scopatz@gmail.com>
Date: Wed, 5 Dec 2018 19:45:58 -0500
Subject: [PATCH] setup.py instead

---
 .appveyor_install.cmd | 4 ++--
 .appveyor_test.cmd    | 4 ++--
 .travis.yml           | 2 +-
 news/execalias.rst    | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.appveyor_install.cmd b/.appveyor_install.cmd
index 008e6ddbe..bbe146e8c 100644
--- a/.appveyor_install.cmd
+++ b/.appveyor_install.cmd
@@ -5,9 +5,9 @@ IF "%XONSH_TEST_ENV%" == "MSYS2" (
     %MSYS2_PATH%\usr\bin\pacman.exe -Syu --noconfirm
     %MSYS2_PATH%\usr\bin\pacman.exe -S --noconfirm python3 python3-pip
     %MSYS2_PATH%\usr\bin\bash.exe -c "/usr/bin/pip install -r requirements-tests.txt"
-    %MSYS2_PATH%\usr\bin\bash.exe -c "/usr/bin/pip install . --no-deps"
+    %MSYS2_PATH%\usr\bin\bash.exe -c "/usr/bin/python setup.py install"
 ) ELSE (
     echo "Windows Environment"
     %PYTHON%\Scripts\pip install -r requirements-tests.txt --upgrade --upgrade-strategy eager
-    %PYTHON%\Scripts\pip install . --no-deps
+    %PYTHON%\Scripts\python setup.py install
 )
diff --git a/.appveyor_test.cmd b/.appveyor_test.cmd
index 660672d1b..05d005f2e 100644
--- a/.appveyor_test.cmd
+++ b/.appveyor_test.cmd
@@ -5,10 +5,10 @@ IF "%XONSH_TEST_ENV%" == "MSYS2" (
     REM We monkey path `py._path.local.PosixPath` here such that it does not
     REM allow to create symlinks which are not supported by MSYS2 anyway. As a
     REM result the other pytest code uses a workaround.
-    SET PATH=%MSYS2_PATH%\usr\bin;%PATH%
+    SET "PATH=%MSYS2_PATH%\usr\bin;%PATH%"
     call bash.exe -c "/usr/bin/xonsh run-tests.xsh" || EXIT 1
 ) ELSE (
     echo "Windows Environment"
-    SET PATH=%PYTHON%\Scripts;%PATH%
+    SET "PATH=%PYTHON%\Scripts;%PATH%"
     call xonsh run-tests.xsh || EXIT 1
 )
diff --git a/.travis.yml b/.travis.yml
index d75afcfaf..b00d812a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ install:
       python setup.py install;
     else
       pip install --upgrade -r requirements-tests.txt;
-      pip install .;
+      python setup.py install;
     fi
 
 before_script:
diff --git a/news/execalias.rst b/news/execalias.rst
index 6b5d19161..cd6356cc4 100644
--- a/news/execalias.rst
+++ b/news/execalias.rst
@@ -3,6 +3,7 @@
 * New ``xonsh.aliases.ExecAlias`` class enables multi-statement aliases.
 * New ``xonsh.ast.isexpression()`` function will return a boolean of whether
   code is a simple xonsh expression or not.
+* Added top-level ``run-tests.xsh`` script for safely running the test suite.
 
 **Changed:**