black not available on 3.5

This commit is contained in:
Anthony Scopatz 2019-07-19 17:30:34 -04:00
parent ec3d2ca8ad
commit 88d239d976
7 changed files with 16 additions and 6 deletions

View file

@ -4,11 +4,11 @@ IF "%XONSH_TEST_ENV%" == "MSYS2" (
echo "MSYS2 Environment" echo "MSYS2 Environment"
%MSYS2_PATH%\usr\bin\pacman.exe -Syu --noconfirm %MSYS2_PATH%\usr\bin\pacman.exe -Syu --noconfirm
%MSYS2_PATH%\usr\bin\pacman.exe -S --noconfirm python3 python3-pip %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 -r requirements/tests-35.txt"
%MSYS2_PATH%\usr\bin\bash.exe -c "/usr/bin/python setup.py install" %MSYS2_PATH%\usr\bin\bash.exe -c "/usr/bin/python setup.py install"
) ELSE ( ) ELSE (
echo "Windows Environment" echo "Windows Environment"
%PYTHON%\Scripts\pip install -r requirements-tests.txt --upgrade --upgrade-strategy eager %PYTHON%\Scripts\pip install -r requirements\\tests-35.txt --upgrade --upgrade-strategy eager
%PYTHON%\python.exe --version %PYTHON%\python.exe --version
%PYTHON%\python.exe setup.py install %PYTHON%\python.exe setup.py install
) )

View file

@ -193,7 +193,7 @@ Dependencies
Prep your environment for running the tests:: Prep your environment for running the tests::
$ pip install -r requirements-tests.txt $ pip install -r requirements/tests.txt
---------------------------------- ----------------------------------

View file

@ -24,4 +24,4 @@ In addition, xonsh integrates with Jupyter, an in-browser REPL, enabling the use
Development Dependencies Development Dependencies
------------------------ ------------------------
If you want to develop xonsh, it is extremely recommended to install the dependencies listed in `requirements-docs.txt <https://github.com/xonsh/xonsh/blob/master/requirements-docs.txt>`_ (to generate documentation) and `requirements-tests.txt <https://github.com/xonsh/xonsh/blob/master/requirements-tests.txt>`_ (to run the test suite). If you want to develop xonsh, it is extremely recommended to install the dependencies listed in `requirements/docs.txt <https://github.com/xonsh/xonsh/blob/master/requirements/docs.txt>`_ (to generate documentation) and `requirements/tests.txt <https://github.com/xonsh/xonsh/blob/master/requirements/tests.txt>`_ (to run the test suite).

10
requirements/tests-35.txt Normal file
View file

@ -0,0 +1,10 @@
py
pytest
flake8
pytest-flake8
pytest-cov
pytest-timeout
prompt-toolkit
pygments>=2.2
codecov
coverage

View file

@ -22,9 +22,9 @@ $TAG_TARGET = 'master'
$GHPAGES_REPO = 'git@github.com:xonsh/xonsh-docs.git' $GHPAGES_REPO = 'git@github.com:xonsh/xonsh-docs.git'
$DOCKER_APT_DEPS = ['man'] $DOCKER_APT_DEPS = ['man']
with open('requirements-tests.txt') as f: with open('requirements/tests.txt') as f:
conda_deps = f.read().split() conda_deps = f.read().split()
with open('requirements-docs.txt') as f: with open('requirements/docs.txt') as f:
conda_deps += f.read().split() conda_deps += f.read().split()
for delimiter in '=<>': for delimiter in '=<>':
conda_deps = {d.lower().split(delimiter)[0] for d in conda_deps} conda_deps = {d.lower().split(delimiter)[0] for d in conda_deps}