"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "info.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.

info.py  (relax-4.1.3.src.tar.bz2):info.py  (relax-5.0.0.src.tar.bz2)
skipping to change at line 50 skipping to change at line 50
from os import environ, pathsep, waitpid from os import environ, pathsep, waitpid
import platform import platform
from re import search, sub from re import search, sub
PIPE, Popen = None, None PIPE, Popen = None, None
if dep_check.subprocess_module: if dep_check.subprocess_module:
from subprocess import PIPE, Popen from subprocess import PIPE, Popen
import sys import sys
from textwrap import wrap from textwrap import wrap
# relax module imports. # relax module imports.
from lib.compat import linux_distribution
from status import Status; status = Status() from status import Status; status = Status()
from version import repo_head, repo_type, repo_url, version, version_full from version import repo_head, repo_type, repo_url, version, version_full
def print_sys_info(): def print_sys_info():
"""Print out the system information.""" """Print out the system information."""
# Initialise the info box. # Initialise the info box.
info = Info_box() info = Info_box()
# Print all info. # Print all info.
skipping to change at line 94 skipping to change at line 95
# The relax website. # The relax website.
self.website = "http://www.nmr-relax.com" self.website = "http://www.nmr-relax.com"
# Program description. # Program description.
self.desc = "Molecular dynamics by NMR data analysis" self.desc = "Molecular dynamics by NMR data analysis"
# Long description # Long description
self.desc_long = "The program relax is designed for the study of the dyn amics of proteins or other macromolecules though the analysis of experimental NM R data. It is a community driven project created by NMR spectroscopists for NMR spectroscopists. It supports exponential curve fitting for the calculation of th e R1 and R2 relaxation rates, calculation of the NOE, reduced spectral density m apping, and the Lipari and Szabo model-free analysis." self.desc_long = "The program relax is designed for the study of the dyn amics of proteins or other macromolecules though the analysis of experimental NM R data. It is a community driven project created by NMR spectroscopists for NMR spectroscopists. It supports exponential curve fitting for the calculation of th e R1 and R2 relaxation rates, calculation of the NOE, reduced spectral density m apping, and the Lipari and Szabo model-free analysis."
# Copyright printout. # Copyright printout.
self.copyright_final_year = 2019 self.copyright_final_year = 2020
self.copyright = [] self.copyright = []
self.copyright.append("Copyright (C) 2001-2006 Edward d'Auvergne") self.copyright.append("Copyright (C) 2001-2006 Edward d'Auvergne")
self.copyright.append("Copyright (C) 2006-%s the relax development team" % self.copyright_final_year) self.copyright.append("Copyright (C) 2006-%s the relax development team" % self.copyright_final_year)
self.copyright_short = "Copyright (C) 2001-%s the relax development team " % self.copyright_final_year self.copyright_short = "Copyright (C) 2001-%s the relax development team " % self.copyright_final_year
self.copyright_latex = "Copyright \copyright\ 2001-%s the relax developm ent team" % self.copyright_final_year self.copyright_latex = "Copyright \copyright\ 2001-%s the relax developm ent team" % self.copyright_final_year
# Program licence and help. # Program licence and help.
self.licence = "This is free software which you are welcome to modify an d redistribute under the conditions of the GNU General Public License (GPL), Ver sion 3 or any later version published by the Free Software Foundation. This pro gram, including all modules, is licensed under the GPL and comes with absolutely no warranty. For details type 'GPL' within the relax prompt." self.licence = "This is free software which you are welcome to modify an d redistribute under the conditions of the GNU General Public License (GPL), Ver sion 3 or any later version published by the Free Software Foundation. This pro gram, including all modules, is licensed under the GPL and comes with absolutely no warranty. For details type 'GPL' within the relax prompt."
# ImportErrors, if any. # ImportErrors, if any.
skipping to change at line 237 skipping to change at line 238
elif arch == ['Mach-O dynamically linked shared library i386', 'Mach -O dynamically linked shared library ppc']: elif arch == ['Mach-O dynamically linked shared library i386', 'Mach -O dynamically linked shared library ppc']:
file_type = '2-way lib (i386, ppc)' file_type = '2-way lib (i386, ppc)'
elif arch == ['Mach-O object i386', 'Mach-O object ppc']: elif arch == ['Mach-O object i386', 'Mach-O object ppc']:
file_type = '2-way obj (i386, ppc)' file_type = '2-way obj (i386, ppc)'
else: else:
file_type = '2-way %s' % arch file_type = '2-way %s' % arch
# Default to all info. # Default to all info.
else: else:
file_type = data[0][:-1] file_type = data[0][:-1]
if hasattr(file_type, 'decode'):
file_type = file_type.decode()
for i in range(1, len(data)): for i in range(1, len(data)):
row = data[i].split('\t') row = data[i].split('\t')
arch[i] = row[1][:-1] arch[i] = row[1][:-1]
file_type += " %s" % arch file_type += " %s" % arch
# Return a string value. # Return a string value.
if file_type == None: if file_type == None:
return '' return ''
return file_type return file_type
skipping to change at line 262 skipping to change at line 265
@return: The maximum width of the elements in the list. @return: The maximum width of the elements in the list.
@rtype: int @rtype: int
""" """
# Init. # Init.
width = 0 width = 0
# Loop over the data. # Loop over the data.
for i in range(len(data)): for i in range(len(data)):
# The string representation size. # The string representation size.
size = len(repr(data[i])) size = len(str(data[i]))
# Find the max size. # Find the max size.
if size > width: if size > width:
width = size width = size
# Return the max width. # Return the max width.
return width return width
def intro_text(self): def intro_text(self):
"""Create the introductory string for STDOUT printing. """Create the introductory string for STDOUT printing.
skipping to change at line 531 skipping to change at line 534
status.append(False) status.append(False)
try: try:
path.append(xml.dom.minidom.__file__) path.append(xml.dom.minidom.__file__)
except: except:
path.append('') path.append('')
# Format the data. # Format the data.
fmt_package = "%%-%ss" % (self.format_max_width(package) + 2) fmt_package = "%%-%ss" % (self.format_max_width(package) + 2)
fmt_status = "%%-%ss" % (self.format_max_width(status) + 2) fmt_status = "%%-%ss" % (self.format_max_width(status) + 2)
fmt_version = "%%-%ss" % (self.format_max_width(version) + 2) fmt_version = "%%-%ss" % (self.format_max_width(version) + 2)
fmt_path = "%%-%ss" % (self.format_max_width(path) + 2) fmt_path = "%%-%ss" % (self.format_max_width(path))
# Add the text. # Add the text.
for i in range(len(package)): for i in range(len(package)):
text += fmt_package % package[i] text += fmt_package % package[i]
text += fmt_status % status[i] text += fmt_status % status[i]
text += fmt_version % version[i] text += fmt_version % version[i]
text += fmt_path % path[i] text += fmt_path % path[i]
text += '\n' text += '\n'
# Return the info string. # Return the info string.
skipping to change at line 806 skipping to change at line 809
# OS info. # OS info.
text = text + ("\nOperating system information:\n") text = text + ("\nOperating system information:\n")
if hasattr(platform, 'system'): if hasattr(platform, 'system'):
text = text + (format % ("System: ", platform.system())) text = text + (format % ("System: ", platform.system()))
if hasattr(platform, 'release'): if hasattr(platform, 'release'):
text = text + (format % ("Release: ", platform.release())) text = text + (format % ("Release: ", platform.release()))
if hasattr(platform, 'version'): if hasattr(platform, 'version'):
text = text + (format % ("Version: ", platform.version())) text = text + (format % ("Version: ", platform.version()))
if hasattr(platform, 'win32_ver') and platform.win32_ver()[0]: if hasattr(platform, 'win32_ver') and platform.win32_ver()[0]:
text = text + (format % ("Win32 version: ", (platform.win32_ver()[0] + " " + platform.win32_ver()[1] + " " + platform.win32_ver()[2] + " " + platfor m.win32_ver()[3]))) text = text + (format % ("Win32 version: ", (platform.win32_ver()[0] + " " + platform.win32_ver()[1] + " " + platform.win32_ver()[2] + " " + platfor m.win32_ver()[3])))
if hasattr(platform, 'linux_distribution') and platform.linux_distributi if linux_distribution()[0]:
on()[0]: text = text + (format % ("GNU/Linux version: ", (linux_distribution(
text = text + (format % ("GNU/Linux version: ", (platform.linux_dist )[0] + " " + linux_distribution()[1] + " " + linux_distribution()[2])))
ribution()[0] + " " + platform.linux_distribution()[1] + " " + platform.linux_di
stribution()[2])))
if hasattr(platform, 'mac_ver') and platform.mac_ver()[0]: if hasattr(platform, 'mac_ver') and platform.mac_ver()[0]:
text = text + (format % ("Mac version: ", (platform.mac_ver()[0] + " (" + platform.mac_ver()[1][0] + ", " + platform.mac_ver()[1][1] + ", " + platfo rm.mac_ver()[1][2] + ") " + platform.mac_ver()[2]))) text = text + (format % ("Mac version: ", (platform.mac_ver()[0] + " (" + platform.mac_ver()[1][0] + ", " + platform.mac_ver()[1][1] + ", " + platfo rm.mac_ver()[1][2] + ") " + platform.mac_ver()[2])))
if hasattr(platform, 'dist'): if hasattr(platform, 'dist'):
text = text + (format % ("Distribution: ", (platform.dist()[0] + " " + platform.dist()[1] + " " + platform.dist()[2]))) text = text + (format % ("Distribution: ", (platform.dist()[0] + " " + platform.dist()[1] + " " + platform.dist()[2])))
if hasattr(platform, 'platform'): if hasattr(platform, 'platform'):
text = text + (format % ("Full platform string: ", (platform.platfor m()))) text = text + (format % ("Full platform string: ", (platform.platfor m())))
if hasattr(ctypes, 'windll'): if hasattr(ctypes, 'windll'):
text = text + (format % ("Windows architecture: ", (self.win_arch()) )) text = text + (format % ("Windows architecture: ", (self.win_arch()) ))
# Python info. # Python info.
 End of changes. 6 change blocks. 
8 lines changed or deleted 9 lines changed or added

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