Skip to content

Commit

Permalink
Merge branch 'master' of github.com:benbaror/scRRpy
Browse files Browse the repository at this point in the history
  • Loading branch information
benbaror committed Feb 14, 2018
2 parents 69874ac + e450526 commit 33f3af6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 30 deletions.
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ Overview
:target: https://readthedocs.org/projects/scrrpy
:alt: Documentation Status

.. |travis| image:: https://travis-ci.org/benbaror/scrrpy.svg?branch=master
.. |travis| image:: https://travis-ci.org/benbaror/scRRpy.svg?branch=master
:alt: Travis-CI Build Status
:target: https://travis-ci.org/benbaror/scrrpy
:target: https://travis-ci.org/benbaror/scRRpy

.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/benbaror/scrrpy?branch=master&svg=true
:alt: AppVeyor Build Status
:target: https://ci.appveyor.com/project/benbaror/scrrpy

.. |requires| image:: https://requires.io/github/benbaror/scrrpy/requirements.svg?branch=master
.. |requires| image:: https://requires.io/github/benbaror/scRRpy/requirements.svg?branch=master
:alt: Requirements Status
:target: https://requires.io/github/benbaror/scrrpy/requirements/?branch=master
:target: https://requires.io/github/benbaror/scRRpy/requirements/?branch=master

.. |codecov| image:: https://codecov.io/github/benbaror/scrrpy/coverage.svg?branch=master
:alt: Coverage Status
Expand Down
34 changes: 8 additions & 26 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,17 @@ environment:
global:
WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
matrix:
- TOXENV: check
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
- TOXENV: 'py36,codecov'
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '2.6'
PYTHON_ARCH: '32'

- TOXENV: 'py27,codecov'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'

- TOXENV: 'py27,codecov'
TOXPYTHON: C:\Python27-x64\python.exe
- TOXENV: 'py36,codecov'
TOXPYTHON: C:\Python36-x64\python.exe
WINDOWS_SDK_VERSION: v7.0
PYTHON_HOME: C:\Python27-x64
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '64'

- TOXENV: 'py34,codecov'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'

- TOXENV: 'py34,codecov'
TOXPYTHON: C:\Python34-x64\python.exe
WINDOWS_SDK_VERSION: v7.1
PYTHON_HOME: C:\Python34-x64
PYTHON_VERSION: '3.4'
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'

- TOXENV: 'py35,codecov'
Expand Down

0 comments on commit 33f3af6

Please sign in to comment.