summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-26 09:24:53 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-26 09:24:53 +0200
commitb9a7dc5fe98e1aa666445bc240055b21ed809824 (patch)
tree5d51a44be51db05e2b597dc123e21b17b59a86c2
parentb40d4b54e09a546dd9514b63c0cb141c64d80384 (diff)
downloadgitpython-b9a7dc5fe98e1aa666445bc240055b21ed809824.tar.gz
chore(compat): another attempt to get travis right
-rw-r--r--.travis.yml2
-rw-r--r--doc/source/intro.rst3
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 17c34104..99ecd4aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
# - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
matrix:
allow_failures:
- python: "2.6"
+ - python: "2.6"
git:
# a higher depth is needed for most of the tests - must be high enough to not actually be shallow
# as we clone our own repository in the process
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index 647323c4..6c4e50f5 100644
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -14,7 +14,8 @@ Requirements
============
* `Python`_ 2.7 or newer
- Since GitPython 2.0.0
+ Since GitPython 2.0.0. Please note that python 2.6 is still reasonably well supported, but might
+ deteriorate over time.
* `Git`_ 1.7.0 or newer
It should also work with older versions, but it may be that some operations
involving remotes will not work as expected.