[Python-modules-commits] [ipdb] 11/14: Update pip and setuptools in the CI, and add constraints for python 2.6 and 3.0 to 3.2.

[Andrey Rahmatullin]

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

wrar pushed a commit to annotated tag 0.10.3
in repository ipdb.

commit 03421044b4541d6b2edc3c5c0a761847c0645d1d
Author: Vincent Philippon <sindaewoh at gmail.com>
Date:   Thu Apr 20 15:58:19 2017 -0400

    Update pip and setuptools in the CI, and add constraints for python 2.6 and 3.0 to 3.2.
---
 .travis.yml | 15 +++++----------
 HISTORY.txt |  3 ++-
 setup.py    |  4 +++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0de162..b07fa28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,17 +11,12 @@ python:
   - "3.7-dev"
   - "nightly"
   - "pypy"
-env:
-  - IPYTHON_VERSION=">1.0,<2.0"
-  - IPYTHON_VERSION=">2.0"
+before_install:
+  # Update pip and setuptools to the latest.
+  - pip install --upgrade pip setuptools
 install:
-  - pip install ipython$IPYTHON_VERSION
+  # Install ipdb, which will install the right IPython version for the current python.
+  - pip install -e .
 script: 
   - python setup.py test
-matrix:
-  exclude:
-    - python: "2.6"
-      env: IPYTHON_VERSION=">2.0"
-    - python: "3.2"
-      env: IPYTHON_VERSION=">2.0"
 sudo: false
diff --git a/HISTORY.txt b/HISTORY.txt
index 0bc193e..98e1c53 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -4,7 +4,8 @@ Changelog
 0.10.3 (unreleased)
 -------------------
 
-- For users using python < 3.3, do not install IPython >= 6.0.0.
+- For users using python 2.6 or 3.0 to 3.2, do not install IPython >= 2.0.0.
+  And for users using python 2.7, do not install IPython >= 6.0.0.
   [vphilippon]
 - Command line usage consistent with pdb - Add argument commands
   [zvodd]
diff --git a/setup.py b/setup.py
index 6bdf115..22f4304 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,9 @@ setup(name='ipdb',
           'setuptools'
       ],
       extras_require={
-          ':python_version < "3.3"': ['ipython >= 0.10.2, < 6.0.0'],
+          ':python_version == "2.6"': ['ipython >= 0.10.2, < 2.0.0'],
+          ':python_version == "2.7"': ['ipython >= 0.10.2, < 6.0.0'],
+          ':python_version >= "3.0" and python_version < "3.3"': ['ipython >= 0.10.2, < 2.0.0'],
           ':python_version >= "3.3"': ['ipython >= 0.10.2'],
       },
       entry_points={

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