setup.py instead

This commit is contained in:
Anthony Scopatz 2018-12-05 19:45:58 -05:00
parent 2279365b7b
commit 7754c3b7b1
4 changed files with 6 additions and 5 deletions

View file

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

View file

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

View file

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

View file

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