diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 00000000..eab06c44 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,3 @@ +service_name: travis-ci +parallel: true + diff --git a/.travis.yml b/.travis.yml index 41c06bd2..bc3c5323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +# https://travis-ci.org/spyder-ide/qtpy/ + # We set the language to c because python isn't supported on the MacOS X nodes # on Travis. However, the language ends up being irrelevant anyway, since we # install Python ourselves using conda. @@ -5,6 +7,10 @@ language: c sudo: false +branches: + only: + - master + os: - linux - osx @@ -12,7 +18,10 @@ os: env: global: - SETUP_XVFB=True - - CONDA_DEPENDENCIES='pytest' + - CONDA_CHANNELS="qttesting" + - CONDA_DEPENDENCIES="pytest pytest-cov" + - PIP_DEPENDENCIES="coveralls" + matrix: - PYTHON_VERSION=2.7 USE_QT_API=PyQt5 - PYTHON_VERSION=2.7 USE_QT_API=PyQt4 @@ -24,12 +33,11 @@ env: before_install: # Test environments for different Qt bindings - if [[ "$USE_QT_API" == "PyQt5" ]]; then - export CONDA_DEPENDENCIES='qt5 pyqt5 '$CONDA_DEPENDENCIES; - export CONDA_CHANNELS='spyder-ide'; + export CONDA_DEPENDENCIES='qt=5.* pyqt=5.* '$CONDA_DEPENDENCIES; elif [[ "$USE_QT_API" == "PyQt4" ]]; then - export CONDA_DEPENDENCIES='qt pyqt '$CONDA_DEPENDENCIES; + export CONDA_DEPENDENCIES='qt=4.* pyqt=4.* '$CONDA_DEPENDENCIES; elif [[ "$USE_QT_API" == "PySide" ]]; then - export CONDA_DEPENDENCIES='qt pyside '$CONDA_DEPENDENCIES; + export CONDA_DEPENDENCIES='qt=4.* pyside '$CONDA_DEPENDENCIES; fi install: diff --git a/README.md b/README.md index e1e7b96f..4585fcb1 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,11 @@ Copyright © 2009- The Spyder Development Team. ## Build status [![Travis status](https://travis-ci.org/spyder-ide/qtpy.svg?branch=master)](https://travis-ci.org/spyder-ide/qtpy) -[![AppVeyor status](https://ci.appveyor.com/api/projects/status/awb92if4tl555fuy/branch/master?svg=true)](https://ci.appveyor.com/project/ccordoba12/qtpy/branch/master) +[![Build status](https://ci.appveyor.com/api/projects/status/ab01a09cbx3m0ao9?svg=true)](https://ci.appveyor.com/project/goanpeca/qtpy) [![CircleCI](https://circleci.com/gh/spyder-ide/qtpy.svg?style=shield)](https://circleci.com/gh/spyder-ide/qtpy) [![Coverage Status](https://coveralls.io/repos/github/spyder-ide/qtpy/badge.svg?branch=master)](https://coveralls.io/github/spyder-ide/qtpy?branch=master) [![Code Issues](https://www.quantifiedcode.com/api/v1/project/c769241c7d7f4463b1e6f67863dabace/badge.svg)](https://www.quantifiedcode.com/app/project/c769241c7d7f4463b1e6f67863dabace) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spyder-ide/qtpy/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spyder-ide/qtpy/?branch=master) ## Description diff --git a/appveyor.yml b/appveyor.yml index 4c7df5c0..52ce588e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,26 +1,34 @@ -environment: +# https://ci.appveyor.com/project/goanpeca/qtpy + +branches: + only: + - master +environment: global: PYTHON: "C:\\conda" CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd" PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix # of 32 bit and 64 bit builds are needed, move this # to the matrix section. + # Used by atropy ci-helpers + CONDA_CHANNELS: "spyder-ide qttesting" matrix: - - # - PYTHON_VERSION: "2.7" - # CONDA_CHANNELS: "msarahan" - # CONDA_DEPENDENCIES: "pytest qt5 pyqt5" + # Qt4 + - PYTHON_VERSION: "2.7" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyside" - PYTHON_VERSION: "2.7" - CONDA_DEPENDENCIES: "pytest qt pyqt" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*" + - PYTHON_VERSION: "3.4" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*" + - PYTHON_VERSION: "3.5" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=4.* pyqt=4.*" + # Qt5 - PYTHON_VERSION: "2.7" - CONDA_DEPENDENCIES: "pytest qt pyside" - # - PYTHON_VERSION: "3.5" - # CONDA_CHANNELS: "msarahan" - # CONDA_DEPENDENCIES: "pytest qt5 pyqt5" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=5.* pyqt=5.*" - PYTHON_VERSION: "3.5" - CONDA_DEPENDENCIES: "pytest qt pyqt" + CONDA_DEPENDENCIES: "pytest pytest-cov qt=5.* pyqt=5.*" platform: -x64 @@ -30,6 +38,7 @@ install: - "powershell ci-helpers/appveyor/install-miniconda.ps1" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - "activate test" + - "python setup.py install" # Not a .NET project, we build in the install step instead build: false