Skip to content

Commit

Permalink
Update AUTHORS and changelog for git submodules.
Browse files Browse the repository at this point in the history
  • Loading branch information
carljm committed Jun 14, 2012
1 parent 558d174 commit c670678
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Luke Macken
Masklinn
Marc Abramowitz
Marcus Smith
Markus Hametner
Matt Maker
Nick Stenning
Nowell Strite
Expand Down
3 changes: 3 additions & 0 deletions docs/news.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ Beta and final releases planned for the second half of 2012.
develop (unreleased)
-------------------

* Pull in submodules for git editable checkouts. Fixes #289 and #421. Thanks
Hsiaoming Yang and Markus Hametner.

* Use a temporary directory as the default build location outside of a
virtualenv. Fixes issues #339 and #381. Thanks TC01.

Expand Down
16 changes: 9 additions & 7 deletions tests/test_vcs_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
from pip.vcs.git import Git
from tests.test_pip import (reset_env, run_pip,
_create_test_package,)
from tests.git_submodule_helpers import _create_test_package_submodule, _change_test_package_submodule, _pull_in_submodule_changes_to_module, _create_test_package_with_submodule
from tests.git_submodule_helpers import (
_change_test_package_submodule,
_pull_in_submodule_changes_to_module,
_create_test_package_with_submodule,
)


def test_get_tag_revs_should_return_tag_name_and_commit_pair():
Expand Down Expand Up @@ -78,13 +82,10 @@ def test_check_rev_options_should_handle_ambiguous_commit(branches_revs_mock,
assert result == ['123456'], result






def test_check_submodule_addition():
"""
Test if submodules will be pulled in on install, and updated on upgrade
Submodules are pulled in on install and updated on upgrade.
"""
env = reset_env()
module_path, submodule_path = _create_test_package_with_submodule(env)
Expand All @@ -95,7 +96,8 @@ def test_check_submodule_addition():
_change_test_package_submodule(env, submodule_path)
_pull_in_submodule_changes_to_module(env, module_path)

update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade', expect_error=True) # expect error because git writes to stdout in some weird cases
# expect error because git may write to stderr
update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade', expect_error=True)

assert env.venv/'src/version-pkg/testpkg/static/testfile2' in update_result.files_created

0 comments on commit c670678

Please sign in to comment.