Hi,
It doesn't matter. Everything is reversible and fixable in SVN. And
it was in your branch so it has no downstream effects. It was a good
effort though, 429 errors in the unit tests. So funny, I don't think
I could beat that one! Actually, that's not true. I just got 816
failures by the following change:
Index: data/__init__.py
===================================================================
--- data/__init__.py (revision 4656)
+++ data/__init__.py (working copy)
@@ -127,4 +127,4 @@
# Rebind the name Data with an instance to prevent accidental creation
# of multiple instances of the Data class
-Data = Data2()
+Data = Data2
You'll have to try better next time ;)
As for importing 'exists_mol_res_spin_data' and 'spin_loop', I was
about to get to that change but you beat me to it. You will need to
import these to have access to them. So r4656 was not necessary.
Maybe you could revert that revision to get the import back (reverting
the reversion). But the problem is a circular import issue. I'll
look into what is causing this and hopefully have the answer today.
This can be a difficult problem to solve in a large program.
Regards,
Edward
On Jan 11, 2008 9:07 PM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
Hi Ed,
Sorry for that. Sometimes I go too fast... I should have checked everything
before commiting the change.
Concerning that, do I need to import 'exists_mol_res_spin_data' and
'spin_loop' in specific_fns/consistency_tests.py or are they imported
elsewhere ?
If I import them in that file, then the file generic_fns/selection.py can't
import 'pipes' anymore... This is why I had made the two changes (r4653 and
r4654) thinking it would solve the problem...
Anyway, I reverted both changes.
Thanks.
Séb
Edward d'Auvergne wrote:
You may want to check what happened to the test suite with that change ;)
Regards,
Edward
On Jan 11, 2008 8:57 PM, <sebastien.morin.1@xxxxxxxxx> wrote:
Author: semor
Date: Fri Jan 11 20:57:14 2008
New Revision: 4654
URL: http://svn.gna.org/viewcvs/relax?rev=4654&view=rev
Log:
Fixed the importation of the 'pipes' module.
Modified:
branches/consistency_tests_1.3/generic_fns/selection.py
Modified: branches/consistency_tests_1.3/generic_fns/selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/selection.py?rev=4654&r1=4653&r2=4654&view=diff
==============================================================================
--- branches/consistency_tests_1.3/generic_fns/selection.py (original)
+++ branches/consistency_tests_1.3/generic_fns/selection.py Fri Jan 11
20:57:14 2008
@@ -30,7 +30,7 @@
from data import Data as relax_data_store
from data.mol_res_spin import MoleculeContainer, ResidueContainer,
SpinContainer
from relax_errors import RelaxError, RelaxNoPipeError,
RelaxNoSequenceError, RelaxRegExpError, RelaxResSelectDisallowError,
RelaxSpinSelectDisallowError
-from generic_fns import pipes
+from generic_fns.pipes import *
id_string_doc = """
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
--
Sebastien Morin
Etudiant au PhD en biochimie
Laboratoire de resonance magnetique nucleaire
Dr Stephane Gagne
CREFSIP (Universite Laval, Quebec, CANADA)
1-418-656-2131 #4530
Re: r4654 - /branches/consistency_tests_1.3/generic_fns/selection.py