From e4654ca3a17832a7d479e5d8e3296f004c632183 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 10 Feb 2014 19:37:33 +0100 Subject: Adjusted required versions of pre-requisites, now the majority of the tests work --- .gitmodules | 2 +- README.rst | 6 ++++-- git/test/lib/helper.py | 2 +- git/test/performance/lib.py | 4 ++-- git/test/test_git.py | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3236ec75..533fc59f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "gitdb"] path = git/ext/gitdb - url = http://github.com/gitpython-developers/gitdb.git + url = http://github.com/gitpython-developers/gitdb.git diff --git a/README.rst b/README.rst index 0e50b50b..fdb50942 100644 --- a/README.rst +++ b/README.rst @@ -11,9 +11,11 @@ The object database implementation is optimized for handling large quantities of REQUIREMENTS ============ -* Git ( tested with 1.7.3.2 ) +* Git ( tested with 1.8.3.4 ) * Python Nose - used for running the tests -* Mock by Michael Foord used for tests. Requires 0.5 + * Tested with nose 1.3.0 +* Mock by Michael Foord used for tests + * Tested with 1.0.1 INSTALL ======= diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index adada6d4..2634ecdb 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -227,7 +227,7 @@ class TestBase(TestCase): """ @classmethod - def setUpAll(cls): + def setUp(cls): """ Dynamically add a read-only repository to our actual type. This way each test type has its own repository diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index 778a6c7d..89105334 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -51,7 +51,7 @@ class TestBigRepoR(TestBase): #} END invariants @classmethod - def setUpAll(cls): + def setUp(cls): super(TestBigRepoR, cls).setUpAll() repo_path = resolve_or_fail(k_env_git_repo) cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB) @@ -64,7 +64,7 @@ class TestBigRepoRW(TestBigRepoR): Provides ``self.gitrwrepo`` and ``self.puregitrwrepo``""" @classmethod - def setUpAll(cls): + def setUp(cls): super(TestBigRepoRW, cls).setUpAll() dirname = tempfile.mktemp() os.mkdir(dirname) diff --git a/git/test/test_git.py b/git/test/test_git.py index 42ad784f..5b0cbfee 100644 --- a/git/test/test_git.py +++ b/git/test/test_git.py @@ -19,7 +19,7 @@ from git import Git, GitCommandError class TestGit(TestBase): @classmethod - def setUpAll(cls): + def setUp(cls): super(TestGit, cls).setUpAll() cls.git = Git(cls.rorepo.working_dir) -- cgit v1.2.3