This patch fixes two test failures. It was downloaded from: https://github.com/jeetsukumaran/DendroPy/commit/93f984bba7a6c588a28ca87f4e557ce283809453 From 93f984bba7a6c588a28ca87f4e557ce283809453 Mon Sep 17 00:00:00 2001 From: jeetsukumaran Date: Tue, 21 Feb 2017 16:41:01 -0500 Subject: [PATCH] Update to Python 3 container and iteration semantics --- dendropy/dataio/newickreader.py | 3 ++- dendropy/datamodel/treemodel.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dendropy/dataio/newickreader.py b/dendropy/dataio/newickreader.py index 6dcf3c5..f978729 100644 --- a/dendropy/dataio/newickreader.py +++ b/dendropy/dataio/newickreader.py @@ -303,7 +303,8 @@ def tree_iter(self, taxon_symbol_map_fn=taxon_symbol_mapper.require_taxon_for_symbol) yield tree if tree is None: - raise StopIteration + # raise StopIteration + return def _read(self, stream, diff --git a/dendropy/datamodel/treemodel.py b/dendropy/datamodel/treemodel.py index 0ecfe31..73146f0 100644 --- a/dendropy/datamodel/treemodel.py +++ b/dendropy/datamodel/treemodel.py @@ -772,6 +772,9 @@ def __hash__(self): def __eq__(self, other): return self is other + def __lt__(self, other): + return id(self) < id(other) + ########################################################################### ### Basic Structure ='form'>
path: root/tests/grafts.scm
ne.scm?id=a1d7920861a8d6c6774149eaf939eb2636942090'>machine: Remove unnecessary record self-referencing bindings....'this-machine' and 'this-machine-ssh-configuration' were useless given that there are no thunked fields. * gnu/machine.scm (<machine>)[this-machine]: Remove. * gnu/machine/ssh.scm (<machine-ssh-configuration>) [this-machine-ssh-configuration]: Remove.
AgeCommit message (Expand)Author
2019-06-27Merge branch 'master' into core-updatesLudovic Courtès
2019-06-27derivations: Add 'derivation-input'....* guix/derivations.scm (derivation-input): New procedure. * tests/grafts.scm (make-derivation-input): Remove. ("graft-derivation, unused outputs not depended on"): Use 'derivation-input'. Ludovic Courtès
2019-06-14packages: Remove 'search-bootstrap-binary'....* gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary): Remove. * gnu/packages/bootstrap.scm (bootstrap-executable): Export. * guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary): Export. * tests/derivations.scm: Remove (gnu packages) import. * tests/grafts.scm: Likewise. * tests/guix-daemon.sh: Likewise. Ludovic Courtès
2018-11-28grafts: Record metadata as derivation properties....* guix/grafts.scm (graft-derivation/shallow): Pass #:properties to 'build-expression->derivation'. * tests/grafts.scm ("graft-derivation, grafted item is a direct dependency"): Check the value returned by 'derivation-properties'. Ludovic Courtès
Ludovic Courtès
2019-12-07machine: Add provenance tracking to each machine operating system....* gnu/machine.scm (<machine>): Rename accessor to '%machine-operating-system'. (machine-operating-system): New procedure. * doc/guix.texi (Service Reference): Mention it. Ludovic Courtès
2019-08-15machine: Implement 'roll-back-machine'....* gnu/machine.scm (roll-back-machine, &deploy-error, deploy-error?) (deploy-error-should-roll-back) (deploy-error-captured-args): New variable. * gnu/machine/ssh.scm (roll-back-managed-host): New variable. * guix/scripts/deploy.scm (guix-deploy): Roll-back systems when a deployment fails. Jakob L. Kreuze
2019-08-06machine: Rename 'system' field....* gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. All callers changed. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. Jakob L. Kreuze
2019-07-06gnu: Add machine type for deployment specifications....* gnu/machine.scm: New file. * gnu/machine/ssh.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Jakob L. Kreuze