Skip to content

Commit

Permalink
Merge 2fb0a9a into 6094175
Browse files Browse the repository at this point in the history
  • Loading branch information
james7132 committed Jun 11, 2017
2 parents 6094175 + 2fb0a9a commit 98179f2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .appveyor.yml
Expand Up @@ -48,10 +48,8 @@ install:
# Set InnoSetup path here, because Cython complained about it.
- set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
- iscc /Q install/setup.iss

# Deploy results
deploy_script:
- cmd: ./scripts/deploy_win.bat

# Not a project with an msbuild file, build done at install.
build: off
artifacts:
Expand Down
14 changes: 6 additions & 8 deletions .travis.yml
Expand Up @@ -20,29 +20,27 @@ matrix:
- virtualenv venv -p python3
- source venv/bin/activate
- which pip
- pip install six wheel
- pip install six wheel nose
env:
global:
- PYTHONPATH="$TRAVIS_BUILD_DIR/src"
- PYTHONPATH="$TRAVIS_BUILD_DIR/src;$TRAVIS_BUILD_DIR/test"
# Perform the manual steps on osx to install python3 and activate venv
install:
- python --version
- echo $PYTHONPATH
# install dependencies
- pip install -r requirements.txt
# Test dev version of PyInstaller
- pip install https://github.com/pyinstaller/pyinstaller/archive/develop.zip
# install testing tools
- pip install coverage
- pip install coveralls
- pip install pep8
- pip install coverage coveralls pep8
script:
# PEP8 Style Checks
- pep8 --show-source src/ test/
# Run tests and collect coverage information
- coverage run --source=src/ -m unittest discover -v -s test
- nosetests --with-coverage --cover-package=src --cover-html
# Run PyInstaller build
- pyinstaller specs/launcher.spec --name launcher --onefile --log-level=DEBUG
after_success:
coveralls
deploy:
- provider: script
script: curl -i -X POST $DEPLOY_BASE_URL/$TRAVIS_BRANCH/$TRAVIS_OS_NAME?token=$TOKEN
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -4,6 +4,8 @@
status](https://ci.appveyor.com/api/projects/status/jxlwb36kfc8s05ff?svg=true)](https://ci.appveyor.com/project/james7132/hourailauncher)
[![Travis Build
Status](https://travis-ci.org/HouraiTeahouse/HouraiLauncher.svg?branch=master)](https://travis-ci.org/HouraiTeahouse/HouraiLauncher)
[![Coverage
Status](https://coveralls.io/repos/github/HouraiTeahouse/HouraiLauncher/badge.svg?branch=master)](https://coveralls.io/github/HouraiTeahouse/HouraiLauncher?branch=master)
[![Discord](https://discordapp.com/api/guilds/151219753434742784/widget.png)](https://discord.gg/VuZhs9V)

A cross platform game launcher/patcher.
Expand Down

0 comments on commit 98179f2

Please sign in to comment.