Drop support for python 2.6.

dysosmus · Apr 3, 2016 · e680479 · e680479
1 parent 3004c89
commit e680479
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 1,002 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,6 @@ env:
   global: TEST_RUNNER=unittest PYTHONHASHSEED=random
 matrix:
   include:
-    - python: "2.6"
-      env: TEST_RUNNER=unittest2.__main__ TEST_REQUIRE="gevent geventhttpclient fastimport unittest2"
     - python: "2.7"
       env: TEST_REQUIRE="gevent geventhttpclient fastimport"
     - python: "pypy"

diff --git a/Makefile b/Makefile
@@ -3,11 +3,7 @@ PYFLAKES = pyflakes
 PEP8 = pep8
 SETUP = $(PYTHON) setup.py
 PYDOCTOR ?= pydoctor
-ifeq ($(shell $(PYTHON) -c "import sys; print(sys.version_info >= (2, 7))"),True)
 TESTRUNNER ?= unittest
-else
-TESTRUNNER ?= unittest2.__main__
-endif
 RUNTEST = PYTHONHASHSEED=random PYTHONPATH=.:$(PYTHONPATH) $(PYTHON) -m $(TESTRUNNER) $(TEST_OPTIONS)
 
 DESTDIR=/

diff --git a/NEWS b/NEWS
@@ -1,4 +1,4 @@
-0.12.1	UNRELEASED
+0.13.0	UNRELEASED
 
  IMPROVEMENTS
 
@@ -11,6 +11,10 @@
   * Fix `dulwich.porcelain.status` when used in empty trees.
     (Jelmer Vernooij, #415)
 
+ CHANGES
+
+  * Drop support for Python 2.6.
+
 0.12.0	2015-12-13
 
  IMPROVEMENTS

diff --git a/dulwich/__init__.py b/dulwich/__init__.py
@@ -21,4 +21,4 @@
 
 """Python implementation of the Git file formats and protocols."""
 
-__version__ = (0, 12, 1)
+__version__ = (0, 13, 0)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,4 @@

		"""Python implementation of the Git file formats and protocols."""

		__version__ = (0, 12, 1)
		__version__ = (0, 13, 0)