[Python-modules-commits] [python-qtpy] 01/03: Import python-qtpy_1.2.1.orig.tar.gz

Sun Jan 22 08:30:57 UTC 2017

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-qtpy.

commit 21689c4408297582989335d363a382a449e1c076
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Jan 22 08:07:52 2017 +0000

    Import python-qtpy_1.2.1.orig.tar.gz
---
 .travis.yml      | 51 ---------------------------------------------------
 CHANGELOG.md     | 16 ++++++++++++++++
 MANIFEST.in      |  3 ++-
 README.md        |  3 +--
 circle.yml       |  4 ++++
 qtpy/_version.py |  2 +-
 6 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1557337..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.
-language: c
-
-sudo: false
-
-branches:
-  only:
-    - master
-
-os:
-  - osx
-
-env:
-  global:
-    - SETUP_XVFB=True
-    - CONDA_CHANNELS="conda-forge"
-    - 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
-    - PYTHON_VERSION=2.7 USE_QT_API=PySide
-    - PYTHON_VERSION=3.4 USE_QT_API=PyQt4
-    - PYTHON_VERSION=3.5 USE_QT_API=PyQt4
-    - PYTHON_VERSION=3.5 USE_QT_API=PyQt5
-
-before_install:
-  # Test environments for different Qt bindings
-  - if [[ "$USE_QT_API" == "PyQt5" ]]; then
-      export CONDA_DEPENDENCIES='qt=5.* pyqt=5.* '$CONDA_DEPENDENCIES;
-    elif [[ "$USE_QT_API" == "PyQt4" ]]; then
-      export CONDA_DEPENDENCIES='qt=4.* pyqt=4.* '$CONDA_DEPENDENCIES;
-    elif [[ "$USE_QT_API" == "PySide" ]]; then
-      export CONDA_DEPENDENCIES='qt=4.* pyside '$CONDA_DEPENDENCIES;
-    fi
-
-install:
-  - git clone git://github.com/astropy/ci-helpers.git
-  - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
-  - python setup.py develop
-
-script:
-  - python qtpy/tests/runtests.py
-
-after_success:
-  - coveralls
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d6c00e..5dea58c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # History of changes
 
+## Version 1.2.1 (2017/01/21)
+
+### Bugs fixed
+
+**Pull requests**
+
+* [PR 98](https://github.com/spyder-ide/qtpy/pull/98) - PR: Don't use Travis to test macOS because it slows down the entire spyder-ide organization
+* [PR 97](https://github.com/spyder-ide/qtpy/pull/97) - PR: Update Appveyor badge in Readme because of moving to an org account
+* [PR 94](https://github.com/spyder-ide/qtpy/pull/94) - PR: Include test suite in sdist
+
+In this release 3 pull requests were merged
+
+
+----
+
+
 ## Version 1.2 (2017/01/08)
 
 ### New features
diff --git a/MANIFEST.in b/MANIFEST.in
index f753229..5d615b9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include AUTHORS.md
 include CHANGELOG.md
 include LICENSE.txt
-include README.md
\ No newline at end of file
+include README.md
+recursive-include qtpy/tests *
diff --git a/README.md b/README.md
index fefb604..731d3b9 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,7 @@ Copyright © 2009- The Spyder Development Team.
 [![Join the chat at https://gitter.im/spyder-ide/public](https://badges.gitter.im/spyder-ide/spyder.svg)](https://gitter.im/spyder-ide/public)
 
 ## Build status
-[![Travis status](https://travis-ci.org/spyder-ide/qtpy.svg?branch=master)](https://travis-ci.org/spyder-ide/qtpy)
-[![Build status](https://ci.appveyor.com/api/projects/status/ab01a09cbx3m0ao9?svg=true)](https://ci.appveyor.com/project/goanpeca/qtpy)
+[![Build status](https://ci.appveyor.com/api/projects/status/62y6i02vhn4hefg0/branch/master?svg=true)](https://ci.appveyor.com/project/spyder-ide/qtpy/branch/master)
 [![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)
diff --git a/circle.yml b/circle.yml
index 1633226..441f3f3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,6 +5,8 @@ machine:
     TEST_CI: "True"
     # Python versions to test (Maximum of 4 different versions for now)
     PY_VERSIONS: "3.5 3.4 2.7"
+    # For Coveralls
+    COVERALLS_REPO_TOKEN: xh75EzxFFMoTEyNPo3wXxXv8OVkul3eE5
     # Used by astropy-ci helpers
     TRAVIS_OS_NAME: "linux"
     PIP_DEPENDENCIES: "coveralls"
@@ -37,6 +39,8 @@ test:
     # Check PyQt4
     - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda install -q qt=4.* pyqt=4.* && python qtpy/tests/runtests.py: # note the colon
         parallel: true
+    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && coveralls: # note the colon
+        parallel: true
     # Check Pyside
     #- export PATH="$HOME/miniconda/bin:$PATH" && source activate test && conda remove -q qt pyqt && conda install -c conda-forge qt=4.* pyside && python qtpy/tests/runtests.py: # note the colon
     #    parallel: true
diff --git a/qtpy/_version.py b/qtpy/_version.py
index d1115f8..13489dc 100644
--- a/qtpy/_version.py
+++ b/qtpy/_version.py
@@ -1,2 +1,2 @@
-version_info = (1, 2, 0)
+version_info = (1, 2, 1)
 __version__ = '.'.join(map(str, version_info))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qtpy.git

