diff options
| author | Andreas Maier <maiera@de.ibm.com> | 2016-10-21 11:11:22 +0200 |
|---|---|---|
| committer | Andreas Maier <maiera@de.ibm.com> | 2016-10-24 16:02:31 +0200 |
| commit | f3d5df2ce3addd9e9e1863f4f33665a16b415b71 (patch) | |
| tree | c22a1d74ed859e6eaca9903fa8600ec51c3b44db /.appveyor.yml | |
| parent | 5149c807ec5f396c1114851ffbd0f88d65d4c84f (diff) | |
| download | gitpython-f3d5df2ce3addd9e9e1863f4f33665a16b415b71.tar.gz | |
Fixes to support Python 2.6 again.
Details:
- Added Python 2.6 again to .travis.yml (it was removed in commit 4486bcb).
- Replaced the use of dictionary comprehensions in `git/cmd.py` around
line 800 with the code before that change (in commit 25a2ebf).
Reason: dict comprehensions were introduced only in Python 2.7.
- Changed the import source for `SkipTest` and `skipIf` from `unittest.case`
to first trying `unittest` and upon ImportError from `unittest2`.
This was done in `git/util.py` and in several testcases.
Reason: `SkipTest` and `skipIf` were introduced to unittest only
in Python 2.7, and `unittest2` is a backport of `unittest` additions
to Python 2.6.
- In git/test/lib/helper.py, fixed the definition of `assertRaisesRegex`
to work on py26.
- For Python 2.6, added the `unittest2` dependency to `requirements.txt`
and changed `.travis.yml` to install `unittest2`. Because git/util.py
uses SkipTest from unittest/unittest2, the dependency could not be added
to `test-requirements.txt`.
- Fixed an assertion in `git/test/test_index.py` to also allow
a Python 2.6 specific exception message.
- In `is_cygwin_git()` in `git/util.py`, replaced `check_output()` with
`Popen()`. It was added in Python 2.7.
- Enabled Python 2.6 for Windows:
- Added Python 2.6 for MINGW in .appveyor.yml.
- When defining `PROC_CREATIONFLAGS` in `git/cmd.py`, made use of certain
win32 and subprocess flags that were introduced in Python 2.7, dependent
on whether we run on Python 2.7 or higher.
- In `AutoInterrupt.__del__()` in `git/cmd.py`, allowed for `os` not having
`kill()`. `os.kill()` was added for Windows in Python 2.7 (For Linux, it
existed in Python 2.6 already).
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 701fc4ac..69b7fe56 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,9 @@ environment: matrix: ## MINGW # + - PYTHON: "C:\\Python26" + PYTHON_VERSION: "2.6" + GIT_PATH: "%GIT_DAEMON_PATH%" - PYTHON: "C:\\Python27" PYTHON_VERSION: "2.7" GIT_PATH: "%GIT_DAEMON_PATH%" |