diff --git a/appveyor.yml b/appveyor.yml index c18df5c..b671429 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,44 +2,33 @@ version: '{branch}-{build}' build: off cache: - '%LOCALAPPDATA%\pip\Cache' -matrix: - fast_finish: true environment: matrix: - - TOXPYTHON: C:\Python34\python.exe - PYTHON_HOME: C:\Python34 + - PYTHON_HOME: C:\Python34 PYTHON_VERSION: '3.4' PYTHON_ARCH: '32' - - TOXPYTHON: C:\Python34-x64\python.exe - WINDOWS_SDK_VERSION: v7.1 + - WINDOWS_SDK_VERSION: v7.1 PYTHON_HOME: C:\Python34-x64 PYTHON_VERSION: '3.4' PYTHON_ARCH: '64' - - TOXPYTHON: C:\Python35\python.exe - PYTHON_HOME: C:\Python35 + - PYTHON_HOME: C:\Python35 PYTHON_VERSION: '3.5' PYTHON_ARCH: '32' - - TOXPYTHON: C:\Python35-x64\python.exe - PYTHON_HOME: C:\Python35-x64 + - PYTHON_HOME: C:\Python35-x64 PYTHON_VERSION: '3.5' PYTHON_ARCH: '64' - - TOXPYTHON: C:\Python36\python.exe - PYTHON_HOME: C:\Python36 + - PYTHON_HOME: C:\Python36 PYTHON_VERSION: '3.6' PYTHON_ARCH: '32' - - TOXPYTHON: C:\Python36-x64\python.exe - PYTHON_HOME: C:\Python36-x64 + - PYTHON_HOME: C:\Python36-x64 PYTHON_VERSION: '3.6' PYTHON_ARCH: '64' - - TOXPYTHON: C:\Python36-x64\python.exe - PYTHON_HOME: C:\Python36-x64 + - PYTHON_HOME: C:\Python36-x64 PYTHON_VERSION: '3.6' PYTHON_ARCH: '64' init: - ps: ls C:\Python* - set PATH=%PYTHON_HOME%;%PYTHON_HOME%\Scripts;%PATH% - - set CRAMSHELL=bash - - git config --global core.autocrlf true install: - '%PYTHON_HOME%\python -m pip install -U pip setuptools virtualenv' - '%PYTHON_HOME%\Scripts\virtualenv --version' @@ -48,9 +37,7 @@ install: - '%PYTHON_HOME%\Scripts\pip install -r requirements_dev.txt' - '%PYTHON_HOME%\python setup.py install' - ps: ls $env:PYTHON_HOME\Scripts +before_test: + - ps: dir "env:" test_script: - py.test - -### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker): -# on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/requirements_dev.txt b/requirements_dev.txt index e0c54d4..4e4eb25 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,6 @@ flake8 pypandoc pytest -pytest-cram pytest-flake8 tox twine diff --git a/tests/help.t b/tests/help.t deleted file mode 100644 index cbb083b..0000000 --- a/tests/help.t +++ /dev/null @@ -1,50 +0,0 @@ --- Setting up ------------------------------------------------------------------------------------ - $ export CLIKRAKEN_SETTINGS_BASEPATH="$CRAMTMP/.config/clikraken" - $ export CLIKRAKEN_USER_SETTINGS_PATH="$CLIKRAKEN_SETTINGS_BASEPATH/settings.ini" - $ export CLIKRAKEN_API_KEYFILE="$CLIKRAKEN_SETTINGS_BASEPATH/kraken.key" - $ mkdir -p $CLIKRAKEN_SETTINGS_BASEPATH - $ echo -e "dummy\nkey" > $CLIKRAKEN_API_KEYFILE - $ cat $TESTDIR/settings_examples/settings.ini.generated > $CLIKRAKEN_USER_SETTINGS_PATH - --- Test ------------------------------------------------------------------------------------ - $ clikraken -h - usage: clikraken [-h] [-V] [--raw] [--cron] - {generate_settings,ticker,t,depth,d,last_trades,lt,balance,bal,place,p,cancel,x,olist,ol,clist,cl} - ... - - clikraken - Command line client for the Kraken exchange - - positional arguments: - {generate_settings,ticker,t,depth,d,last_trades,lt,balance,bal,place,p,cancel,x,olist,ol,clist,cl} - available subcommands - generate_settings [clikraken] Print default settings.ini to stdout - ticker (t) [public] Get the Ticker - depth (d) [public] Get the current market depth data - last_trades (lt) [public] Get the last trades - balance (bal) [private] Get your current balance - place (p) [private] Place an order - cancel (x) [private] Cancel orders - olist (ol) [private] Get a list of your open orders - clist (cl) [private] Get a list of your closed orders - - optional arguments: - -h, --help show this help message and exit - -V, --version show program version - --raw output raw json results from the API - --cron activate cron mode (tone down errors due to timeouts - or unavailable Kraken service) - - To get help about a subcommand use: clikraken SUBCOMMAND --help - For example: - clikraken place --help - - Current default currency pair: XETHZEUR. - - Create or edit the setting file *settings.ini to change it. (glob) - If the setting file doesn't exist yet, you can create one by doing: - clikraken generate_settings > *settings.ini (glob) - - You can also set the CLIKRAKEN_DEFAULT_PAIR environment variable - which has precedence over the settings from the settings file. diff --git a/tests/version.t b/tests/version.t deleted file mode 100644 index a71e7f2..0000000 --- a/tests/version.t +++ /dev/null @@ -1,13 +0,0 @@ --- Setting up ------------------------------------------------------------------------------------ - $ export CLIKRAKEN_SETTINGS_BASEPATH="$CRAMTMP/.config/clikraken" - $ export CLIKRAKEN_USER_SETTINGS_PATH="$CLIKRAKEN_SETTINGS_BASEPATH/settings.ini" - $ export CLIKRAKEN_API_KEYFILE="$CLIKRAKEN_SETTINGS_BASEPATH/kraken.key" - $ mkdir -p $CLIKRAKEN_SETTINGS_BASEPATH - $ echo -e "dummy\nkey" > $CLIKRAKEN_API_KEYFILE - $ cat $TESTDIR/settings_examples/settings.ini.generated > $CLIKRAKEN_USER_SETTINGS_PATH - --- Test ------------------------------------------------------------------------------------ - $ clikraken -V - clikraken version: .+ (re) diff --git a/tox.ini b/tox.ini index ea77dd7..63d5f0b 100644 --- a/tox.ini +++ b/tox.ini @@ -17,9 +17,6 @@ deps = commands = py.test --basetemp={envtmpdir} -[testenv:pywin] -basepython = {env:PYTHON_HOME:}\python.exe - [testenv:flake8] deps = -r{toxinidir}/requirements_dev.txt