diff options
| author | Vincent Driessen <me@nvie.com> | 2016-04-19 21:35:30 +0200 |
|---|---|---|
| committer | Vincent Driessen <me@nvie.com> | 2016-04-19 21:35:30 +0200 |
| commit | 3297fe50067da728eb6f3f47764efb223e0d6ea4 (patch) | |
| tree | e7cf8a66b178baf8fa4fcfddc46f2134c48042ab | |
| parent | 722473e86e64405ac5eb9cb43133f8953d6c65d0 (diff) | |
| parent | 76e19e4221684f24ef881415ec6ccb6bab6eb8e8 (diff) | |
| download | gitpython-3297fe50067da728eb6f3f47764efb223e0d6ea4.tar.gz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | doc/source/changes.rst | 2 | ||||
| -rwxr-xr-x | setup.py | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 4e367fff..2c720821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.6" - "2.7" - "3.3" - "3.4" diff --git a/doc/source/changes.rst b/doc/source/changes.rst index dfd0a4a4..4fdf39ca 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -7,7 +7,7 @@ Changelog * `Commit.diff()` now supports diffing the root commit via `Commit.diff(NULL_TREE)`. * `Repo.blame()` now respects `incremental=True`, supporting incremental blames. Incremental blames are slightly faster since they don't include the file's contents in them. - +* IMPORTANT: This release drops support for python 2.6, which is officially deprecated by the python maintainers. 1.0.2 - Fixes ============= @@ -110,7 +110,6 @@ GitPython is a python library used to interact with Git repositories""", "Operating System :: MacOS :: MacOS X", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", |