Skip to content

import OrderedDict from git.odict rather than directly from collections, to pix Py2.6 compatibility #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 26, 2016
Merged

import OrderedDict from git.odict rather than directly from collections, to pix Py2.6 compatibility #443

merged 1 commit into from
May 26, 2016

Conversation

boegel
Copy link
Contributor

@boegel boegel commented May 26, 2016

cfr. https://github.com/gitpython-developers/GitPython/pull/431/files/89ade7bfff534ae799d7dd693b206931d5ed3d4f#r64649040

cc @Byron

I tested this in my fork on Travis; I'm running into one failing test, but it seems unrelated to this change.
Am I missing something to make the tests pass?

======================================================================
ERROR: test_init_repo_object (git.test.test_docs.Tutorials)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/boegel/GitPython/git/ext/gitdb/gitdb/test/lib.py", line 87, in wrapper
    return func(self, path)
  File "/home/travis/build/boegel/GitPython/git/test/test_docs.py", line 68, in test_init_repo_object
    assert repo.refs['origin/master'] == repo.remotes.origin.refs.master  # ... remotes ...
  File "/home/travis/build/boegel/GitPython/git/util.py", line 684, in __getitem__
    raise IndexError("No item found with id %r" % (self._prefix + index))
IndexError: No item found with id 'origin/master'

@Byron Byron added this to the v2.0.4 - Bugfixes milestone May 26, 2016
@Byron Byron self-assigned this May 26, 2016
@Byron
Copy link
Member

Byron commented May 26, 2016

The unit-tests are not perfectly isolated, and being on a branch makes some of them fail. It's a known issue, also one that I am not proud of :).
Travis is happy, here you go, thanks for your contribution !

@Byron Byron merged commit 8486f2d into gitpython-developers:master May 26, 2016
@boegel
Copy link
Contributor Author

boegel commented May 26, 2016

Thanks @Byron!

@boegel boegel deleted the fix_ordereddict branch May 26, 2016 07:14
@andy-maier andy-maier mentioned this pull request May 30, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Byron Byron

Labels
None yet
Milestone
v2.0.4 - Bugfixes
Development

Successfully merging this pull request may close these issues.
2 participants
@boegel @Byron