[Biopython-dev] Status of SearchIO

[Kai Blin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2012-10-26 11:33, Wibowo Arindrarto wrote:

Hi Bow, Peter,

> For the merge conflict, which branch are you using? Can you point
> to specific commits that cause the conflicts? I haven't tried
> merging / rebasing my own branch to the current master myself ~ so
> knowing this should help the process as well.

Disregarding the namespace discussion, I needed to get a reasonable
branch to get my HMMer2 parser up-to-date in. As I said last week I
tried rebasing Bow's searchio branch and had a bunch of merge conflicts.

I've retried the rebase today, and most of the merge conflicts are
actually pretty trivial and mostly around the question where the code
gets it's OrderedDict from for python versions < 2.7.

I've pushed the rebased patchset to
https://github.com/kblin/biopython/tree/searchio-rebase if anybody
wants to have a look. With the last patch fixing an error I seem to
have introduced during merge conflict resolution, the SearchIO tests
pass on that branch.

Cheers,
Kai

- -- 
Dipl.-Inform. Kai Blin         kai.blin at biotech.uni-tuebingen.de
Institute for Microbiology and Infection Medicine
Division of Microbiology/Biotechnology
Eberhard-Karls-Universität Tübingen
Auf der Morgenstelle 28                 Phone : ++49 7071 29-78841
D-72076 Tübingen                        Fax :   ++49 7071 29-5979
Germany
Homepage: http://www.mikrobio.uni-tuebingen.de/ag_wohlleben
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQjlm7AAoJEKM5lwBiwTTPFe8IAMMLmM2kQmb9vOSCuNjbcIfJ
HqzzvLaw8Eo44uEb0zmxhuJwPoPZpdZIWCNM1t3LpynaE3mHawLcrYJTT/R1YxkS
udBHvMlU6h76J93NITWCzFZ7HHlMMrbzyPel7rifWXbv5xpG2BREpmr1V7lKmbH7
XbInPsVP0PjySFlCQb3219M+IZ4fA+ViYSBlQeXs91G1YzMVo6nkDcs+FkDG8mJt
Qg2u4Bhrxaf3qQKNuQzb2AHJ4KpnEkYsTI2FUJfHaulNfN6w9HwsEgyvM6hVqONP
4aIYlsbSlLjbGG3sdliibPJy5A+8AnkNSFlAHydL+FgBVmPqo3Xe0O5buTdz3Vs=
=prZo
-----END PGP SIGNATURE-----