| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,9 +7,6 @@ environment: | |||
| 7 | 7 | matrix: | |
| 8 | 8 | ## MINGW | |
| 9 | 9 | # | |
| 10 | - - PYTHON: "C:\\Python26" | ||
| 11 | - PYTHON_VERSION: "2.6" | ||
| 12 | - GIT_PATH: "%GIT_DAEMON_PATH%" | ||
| 13 | 10 | - PYTHON: "C:\\Python27" | |
| 14 | 11 | PYTHON_VERSION: "2.7" | |
| 15 | 12 | GIT_PATH: "%GIT_DAEMON_PATH%" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,5 @@ | |||
| 1 | 1 | language: python | |
| 2 | 2 | python: | |
| 3 | - - "2.6" | ||
| 4 | 3 | - "2.7" | |
| 5 | 4 | - "3.3" | |
| 6 | 5 | - "3.4" | |
@@ -12,7 +11,6 @@ python: | |||
| 12 | 11 | # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details) | |
| 13 | 12 | matrix: | |
| 14 | 13 | allow_failures: | |
| 15 | - - python: "2.6" | ||
| 16 | 14 | - python: "3.6-dev" | |
| 17 | 15 | - python: "3.7-dev" | |
| 18 | 16 | - python: "nightly" | |
@@ -26,7 +24,6 @@ install: | |||
| 26 | 24 | - git fetch --tags | |
| 27 | 25 | - pip install -r test-requirements.txt | |
| 28 | 26 | - pip install codecov sphinx | |
| 29 | - - if [ "$TRAVIS_PYTHON_VERSION" == '2.6' ]; then pip install unittest2; fi | ||
| 30 | 27 | ||
| 31 | 28 | # generate some reflog as git-python tests need it (in master) | |
| 32 | 29 | - ./init-tests-after-clone.sh | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting | |||
| 19 | 19 | the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable. | |
| 20 | 20 | ||
| 21 | 21 | * Git (1.7.x or newer) | |
| 22 | - * Python 2.7 to 3.6, while python 2.6 is supported on a *best-effort basis*. | ||
| 22 | + * Python 2.7 to 3.6. | ||
| 23 | 23 | ||
| 24 | 24 | The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`. | |
| 25 | 25 | The installer takes care of installing them for you. | |
@@ -68,10 +68,6 @@ For *Windows*, we do regularly test it on [Appveyor CI](https://www.appveyor.com | |||
| 68 | 68 | but not all test-cases pass - you may help improve them by exploring | |
| 69 | 69 | [Issue #525](https://github.com/gitpython-developers/GitPython/issues/525). | |
| 70 | 70 | ||
| 71 | - #### Python 2.6 | ||
| 72 | - | ||
| 73 | - Python 2.6 is supported on best-effort basis; which means that it is likely to deteriorate over time. | ||
| 74 | - | ||
| 75 | 71 | ### RUNNING TESTS | |
| 76 | 72 | ||
| 77 | 73 | *Important*: Right after cloning this repository, please be sure to have executed | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,8 +14,6 @@ Requirements | |||
| 14 | 14 | ============ | |
| 15 | 15 | ||
| 16 | 16 | * `Python`_ 2.7 or newer | |
| 17 | - Since GitPython 2.0.0. Please note that python 2.6 is still reasonably well supported, but might | ||
| 18 | - deteriorate over time. Support is provided on a best-effort basis only. | ||
| 19 | 17 | * `Git`_ 1.7.0 or newer | |
| 20 | 18 | It should also work with older versions, but it may be that some operations | |
| 21 | 19 | involving remotes will not work as expected. | |
@@ -75,12 +73,6 @@ codebase for `__del__` implementations and call these yourself when you see fit. | |||
| 75 | 73 | Another way assure proper cleanup of resources is to factor out GitPython into a | |
| 76 | 74 | separate process which can be dropped periodically. | |
| 77 | 75 | ||
| 78 | - Best-effort for Python 2.6 and Windows support | ||
| 79 | - ---------------------------------------------- | ||
| 80 | - | ||
| 81 | - This means that support for these platforms is likely to worsen over time | ||
| 82 | - as they are kept alive solely by their users, or not. | ||
| 83 | - | ||
| 84 | 76 | Getting Started | |
| 85 | 77 | =============== | |
| 86 | 78 | ||
@@ -124,7 +116,7 @@ http://stackoverflow.com/questions/tagged/gitpython | |||
| 124 | 116 | ||
| 125 | 117 | Issue Tracker | |
| 126 | 118 | ============= | |
| 127 | - The issue tracker is hosted by github: | ||
| 119 | + The issue tracker is hosted by GitHub: | ||
| 128 | 120 | ||
| 129 | 121 | https://github.com/gitpython-developers/GitPython/issues | |
| 130 | 122 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,6 +17,7 @@ | |||
| 17 | 17 | import subprocess | |
| 18 | 18 | import sys | |
| 19 | 19 | import threading | |
| 20 | + from collections import OrderedDict | ||
| 20 | 21 | from textwrap import dedent | |
| 21 | 22 | ||
| 22 | 23 | from git.compat import ( | |
@@ -31,7 +32,6 @@ | |||
| 31 | 32 | is_win, | |
| 32 | 33 | ) | |
| 33 | 34 | from git.exc import CommandError | |
| 34 | - from git.odict import OrderedDict | ||
| 35 | 35 | from git.util import is_cygwin_git, cygpath, expand_path | |
| 36 | 36 | ||
| 37 | 37 | from .exc import ( | |
@@ -143,8 +143,7 @@ def dict_to_slots_and__excluded_are_none(self, d, excluded=()): | |||
| 143 | 143 | ## CREATE_NEW_PROCESS_GROUP is needed to allow killing it afterwards, | |
| 144 | 144 | # see https://docs.python.org/3/library/subprocess.html#subprocess.Popen.send_signal | |
| 145 | 145 | PROC_CREATIONFLAGS = (CREATE_NO_WINDOW | subprocess.CREATE_NEW_PROCESS_GROUP | |
| 146 | - if is_win and sys.version_info >= (2, 7) | ||
| 147 | - else 0) | ||
| 146 | + if is_win else 0) | ||
| 148 | 147 | ||
| 149 | 148 | ||
| 150 | 149 | class Git(LazyMixin): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,6 +12,7 @@ | |||
| 12 | 12 | import logging | |
| 13 | 13 | import os | |
| 14 | 14 | import re | |
| 15 | + from collections import OrderedDict | ||
| 15 | 16 | ||
| 16 | 17 | from git.compat import ( | |
| 17 | 18 | string_types, | |
@@ -21,7 +22,6 @@ | |||
| 21 | 22 | with_metaclass, | |
| 22 | 23 | PY3 | |
| 23 | 24 | ) | |
| 24 | - from git.odict import OrderedDict | ||
| 25 | 25 | from git.util import LockFile | |
| 26 | 26 | ||
| 27 | 27 | import os.path as osp | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,10 +3,7 @@ | |||
| 3 | 3 | import logging | |
| 4 | 4 | import os | |
| 5 | 5 | import stat | |
| 6 | - try: | ||
| 7 | - from unittest import SkipTest | ||
| 8 | - except ImportError: | ||
| 9 | - from unittest2 import SkipTest | ||
| 6 | + from unittest import SkipTest | ||
| 10 | 7 | import uuid | |
| 11 | 8 | ||
| 12 | 9 | import git | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -15,6 +15,7 @@ | |||
| 15 | 15 | import tempfile | |
| 16 | 16 | import textwrap | |
| 17 | 17 | import time | |
| 18 | + import unittest | ||
| 18 | 19 | ||
| 19 | 20 | from git.compat import string_types, is_win | |
| 20 | 21 | from git.util import rmtree, cwd | |
@@ -23,11 +24,6 @@ | |||
| 23 | 24 | import os.path as osp | |
| 24 | 25 | ||
| 25 | 26 | ||
| 26 | - if sys.version_info[0:2] == (2, 6): | ||
| 27 | - import unittest2 as unittest | ||
| 28 | - else: | ||
| 29 | - import unittest | ||
| 30 | - | ||
| 31 | 27 | TestCase = unittest.TestCase | |
| 32 | 28 | SkipTest = unittest.SkipTest | |
| 33 | 29 | skipIf = unittest.skipIf | |
@@ -348,7 +344,6 @@ class TestBase(TestCase): | |||
| 348 | 344 | of the project history ( to assure tests don't fail for others ). | |
| 349 | 345 | """ | |
| 350 | 346 | ||
| 351 | - # On py26, unittest2 has assertRaisesRegex | ||
| 352 | 347 | # On py3, unittest has assertRaisesRegex | |
| 353 | 348 | # On py27, we use unittest, which names it differently: | |
| 354 | 349 | if sys.version_info[0:2] == (2, 7): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,10 +7,7 @@ | |||
| 7 | 7 | import os | |
| 8 | 8 | import sys | |
| 9 | 9 | import tempfile | |
| 10 | - try: | ||
| 11 | - from unittest import SkipTest, skipIf | ||
| 12 | - except ImportError: | ||
| 13 | - from unittest2 import SkipTest, skipIf | ||
| 10 | + from unittest import SkipTest, skipIf | ||
| 14 | 11 | ||
| 15 | 12 | from git import ( | |
| 16 | 13 | Blob, | |
| Back | FazBrowse Home | New Git URL |
0 commit comments