"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "test_suite/system_tests/model_free.py" between
relax-4.1.3.src.tar.bz2 and relax-5.0.0.src.tar.bz2

About: relax allows the study of molecular dynamics through the analysis of experimental NMR data. Organic molecules, proteins, RNA, DNA, sugars, and other biomolecules are all supported.

model_free.py  (relax-4.1.3.src.tar.bz2):model_free.py  (relax-5.0.0.src.tar.bz2)
############################################################################### ###############################################################################
# # # #
# Copyright (C) 2006-2015,2017 Edward d'Auvergne # # Copyright (C) 2006-2015,2017,2019 Edward d'Auvergne #
# # # #
# This file is part of the program relax (http://www.nmr-relax.com). # # This file is part of the program relax (http://www.nmr-relax.com). #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or # # the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. # # (at your option) any later version. #
# # # #
# This program is distributed in the hope that it will be useful, # # This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
skipping to change at line 35 skipping to change at line 35
import numpy import numpy
from os import path, sep, walk from os import path, sep, walk
from re import search from re import search
import sys import sys
from tempfile import mkdtemp, mkstemp from tempfile import mkdtemp, mkstemp
# relax module imports. # relax module imports.
from auto_analyses.dauvergne_protocol import dAuvergne_protocol from auto_analyses.dauvergne_protocol import dAuvergne_protocol
from data_store import Relax_data_store; ds = Relax_data_store() from data_store import Relax_data_store; ds = Relax_data_store()
import dep_check import dep_check
from lib.compat import linux_distribution
from pipe_control import pipes from pipe_control import pipes
from pipe_control.interatomic import interatomic_loop from pipe_control.interatomic import interatomic_loop
from pipe_control.mol_res_spin import spin_loop from pipe_control.mol_res_spin import spin_loop
from lib.errors import RelaxError, RelaxMultiSpinIDError from lib.errors import RelaxError, RelaxMultiSpinIDError
from lib.physical_constants import N15_CSA from lib.physical_constants import N15_CSA
from lib.io import DummyFileObject, open_read_file from lib.io import DummyFileObject, open_read_file
from status import Status; status = Status() from status import Status; status = Status()
from test_suite.system_tests.base_classes import SystemTestCase from test_suite.system_tests.base_classes import SystemTestCase
# Get the platform/version information. # Get the platform/version information.
SYSTEM = platform.system() SYSTEM = platform.system()
RELEASE = platform.release() RELEASE = platform.release()
VERSION = platform.version() VERSION = platform.version()
WIN32_VER = platform.win32_ver() WIN32_VER = platform.win32_ver()
DIST = platform.dist() DIST = linux_distribution()
ARCH = platform.architecture() ARCH = platform.architecture()
MACH = platform.machine() MACH = platform.machine()
PROC = platform.processor() PROC = platform.processor()
PY_VER = platform.python_version() PY_VER = platform.python_version()
NUMPY_VER = numpy.__version__ NUMPY_VER = numpy.__version__
LIBC_VER = platform.libc_ver() LIBC_VER = platform.libc_ver()
# Windows system name pain. # Windows system name pain.
if SYSTEM == 'Windows' or SYSTEM == 'Microsoft': if SYSTEM == 'Windows' or SYSTEM == 'Microsoft':
# Set the system to 'Windows' no matter what. # Set the system to 'Windows' no matter what.
SYSTEM = 'Windows' SYSTEM = 'Windows'
class Mf(SystemTestCase): class Mf(SystemTestCase):
"""TestCase class for the functional tests of model-free analysis.""" """TestCase class for the functional tests of model-free analysis."""
def __init__(self, methodName='runTest'):
"""Skip some tests if bmrblib is not installed.
@keyword methodName: The name of the test.
@type methodName: str
"""
# Execute the base class method.
super(Mf, self).__init__(methodName)
# Missing module.
if not dep_check.bmrblib_module and methodName in ['test_bug_24131_bmrb_
deposition', 'test_bug_24131_missing_interaction']:
# Store in the status object.
status.skipped_tests.append([methodName, 'Bmrblib', self._skip_type]
)
def setUp(self): def setUp(self):
"""Set up for all the functional tests.""" """Set up for all the functional tests."""
# Create the data pipe. # Create the data pipe.
self.interpreter.pipe.create('mf', 'mf') self.interpreter.pipe.create('mf', 'mf')
def check_read_results_1_3(self): def check_read_results_1_3(self):
"""Common code for the test_read_results_1_3*() tests.""" """Common code for the test_read_results_1_3*() tests."""
# Path of the files. # Path of the files.
 End of changes. 4 change blocks. 
2 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)