Changeset 5442

Timestamp:

Dec 20, 2022 3:17:16 PM (3 months ago)

Author:

toby

Message:

finish off Py3.10 updates

Files:

• fullrmc-pkg (deleted)
• install/build_scripts/Pi_OSnotes.txt (added)
• trunk/GSASIIctrlGUI.py (modified) (4 diffs)
• trunk/GSASIIdataGUI.py (modified) (5 diffs)
• trunk/docs/source/packages.rst (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -5458 +5458 @@
         '''Check if the GSAS-II repository has an update for the current source files
         and perform that update if requested.
-        '''            
+        '''
         if not GSASIIpath.whichsvn():
             dlg = wx.MessageDialog(self.frame,
@@ -5494 +5494 @@
             dlg.Destroy()
             return
+        errmsg,warnmsg = G2gd.TestOldVersions()
+        if (errmsg or warnmsg):
+            msg = 'Based on the age of Python or an installed Python package (see below)'
+            msg += ' you are recommended to'
+            if GSASIIpath.condaTest():
+                msg += ' either use conda to update (see https://bit.ly/G2pkgs for version recommendations) and then update GSAS-II. Or'
+            msg += ' reinstall GSAS-II (see https://bit.ly/G2install), which will update both.\n\n'
+            if errmsg:
+                opt = wx.YES_NO|wx.ICON_QUESTION|wx.CANCEL|wx.NO_DEFAULT
+                msg += 'Error(s):\n\t'+errmsg
+            else:
+                opt = wx.YES_NO|wx.ICON_QUESTION|wx.CANCEL|wx.YES_DEFAULT
+            if warnmsg:
+                if errmsg: msg += '\n\nWarning(s):\n\t'
+                msg += warnmsg
+
+            msg += '\n\nContinue to update GSAS-II?'
+            dlg = wx.MessageDialog(self.frame, msg,'Confirm update',opt)
+            result = wx.ID_NO
+            try:
+                result = dlg.ShowModal()
+            finally:
+                dlg.Destroy()
+            if result != wx.ID_YES: return
         print ('GSAS-II version on server: '+repos)
         if local == repos:
@@ -5536 +5560 @@
                                    'conflicts arise, local changes will be '
                                    'discarded. It is also possible that the '
-                                   'local changes may prevent GSAS-II from running. '
+                                   'merge may prevent GSAS-II from running. '
                                    '\n\nPress OK to start an update if this is acceptable:',
                                    'Local GSAS-II Mods',
@@ -5603 +5627 @@
                                    'if merging is not possible, your local changes will be '
                                    'discarded. It is also possible that the '
-                                   'local changes my prevent GSAS-II from running. '
+                                   'merge may prevent GSAS-II from running. '
                                    'Press OK to continue anyway.',
                                    'Local GSAS-II Mods',

trunk/GSASIIdataGUI.py

@@ -390 +390 @@
   versions that are known to have bugs. One should select an older or 
   newer version of the package. 
+* ``versionDict['tooNewUntested']`` is a dict with module versions that have 
+  not been tested but there is no reason to expect problems
 * ``versionDict['tooNewWarn']`` is a dict with module versions that have not 
-  been tested but raise concerns that problems may occur. 
+  been tested but there are concerns that problems may occur. 
 
 **Packages/versions to be avoided**
@@ -427 +429 @@
 '''
 # add comments above when changing anything below
-versionDict['tooOld'] = {'matplotlib': '1.'}
+versionDict['tooOld'] = {'matplotlib': '1.', 'Python':'2.7'}
 'modules that will certainly fail'
-versionDict['tooOldWarn'] = {'wx': '2.'}
-'modules that may fail but should be updated'
+versionDict['tooOldWarn'] = {'wx': '2.','Python':'3.6'}
+'modules that may fail and should be updated'
 versionDict['badVersionWarn'] = {'numpy':['1.16.0'],
-                                 'matplotlib': ['3.1','3.2']}
+                                 'matplotlib': ['3.1','3.2'],
+                                 'wx':['4.2.0']}
 'versions of modules that are known to have bugs'
-versionDict['tooNewWarn'] = {'wx':'4.2','python':'3.10'}
+versionDict['tooNewWarn'] = {'wx':'4.2'}
 'module versions newer than what we have tested & where problems are suspected'
+versionDict['tooNewUntested'] = {'Python':'3.11'}
+'module versions newer than what we have tested & no problems are suspected'
 
 def ShowVersions():
@@ -446 +451 @@
     import OpenGL as ogl
     import GSASIIpath
-    # print (versions)
-    print ("Python module versions loaded:")
-    print ("  Python:     {} from {}".format(sys.version.split()[0],sys.executable))
-    if compareVersions(platform.python_version(),
-                        versionDict['tooNewWarn']['python']) >= 0:
-        print (22*' '+"-- We are anticipating significant problems with this new version of Python. Please report them.")
+    print ("Python/module versions loaded:")
     version = '?'
     versionDict['errors'] = ''
     warn = False
-    for s,m in [('wx',wx), ('matplotlib', mpl), ('numpy',np),
+    for s,m in [('Python',None), ('wx',wx), ('matplotlib', mpl), ('numpy',np),
                     ('scipy',sp), ('OpenGL',ogl)]:
         msg = ''
+        if s == 'Python':
+            pkgver = platform.python_version()
+            prefix = ''
+            msg = "from {}. ".format(sys.executable)
+        else:
+            pkgver = m.__version__
+            prefix = 'Package '
         if s in versionDict['tooOld']:
-            match = compareVersions(m.__version__,versionDict['tooOld'][s])
+            match = compareVersions(pkgver,versionDict['tooOld'][s])
             if match <= 0:
-                msg = "version will cause problems"
+                if msg: msg += ' -- '
+                msg += "Too old, problems are likely"
                 warn = True
                 if versionDict['errors']: versionDict['errors'] += '\n'
-                versionDict['errors'] += 'Package {} version {} is too old for GSAS-II. An update is required'.format(s,m.__version__)
+                versionDict['errors'] += prefix + '{} version {} is too old for GSAS-II. An update is required. '.format(s,pkgver)
         if s in versionDict['tooOldWarn']:
-            match = compareVersions(m.__version__,versionDict['tooOldWarn'][s])
+            match = compareVersions(pkgver,versionDict['tooOldWarn'][s])
             if match <= 0:
-                msg = "version can cause problems"
-                warn = True
-        if s in versionDict['tooNewWarn']:
-            match = compareVersions(m.__version__,versionDict['tooNewWarn'][s])
-            if match >= 0:
-                msg = "version is too new and has not been tested"
+                msg += "Version can cause problems"
                 warn = True
         if s in versionDict['badVersionWarn']:
             for v in versionDict['badVersionWarn'][s]:
-                if compareVersions(m.__version__,v) == 0:
-                    msg = "version is known to be buggy"
+                if compareVersions(pkgver,v) == 0:
+                    msg += "Version is known to be buggy"
                     warn = True
                     break
-        print("  {:12s}{}  {}".format(s+':',m.__version__,msg))
+        if s in versionDict['tooNewWarn'] and not warn:
+            match = compareVersions(pkgver,versionDict['tooNewWarn'][s])
+            if match >= 0:
+                msg += "Problems are anticipated with this version (not tested)"
+                warn = True
+        if s in versionDict['tooNewUntested'] and not warn:
+            match = compareVersions(pkgver,versionDict['tooNewUntested'][s])
+            if match >= 0:
+                msg += "New version not tested; please keep us posted"
+                warn = True
+        print("  {:12s}{}  {}".format(s+':',pkgver,msg))
+
     Image = None
     try:
@@ -513 +527 @@
     else:
         rev = "SVN version {}".format(rev)
-    print ("Latest GSAS-II revision (from .py files): {} ({})\n".format(
+    print ("Latest GSAS-II revision (from .py files): {} ({})".format(
         GSASIIpath.GetVersionNumber(),rev))
     # patch 11/2020: warn if GSASII path has not been updated past v4576.
@@ -525 +539 @@
         print('Warning GSAS-II incompletely updated. Please contact toby@anl.gov')
     # end patch
+    prog = 'convcell'
+    if sys.platform.startswith('win'): prog += '.exe'
+    if not os.path.exists(os.path.join(GSASIIpath.binaryPath,prog)):
+        versionDict['errors'] += 'Installed binary files need an update. If you built them, rerun scons'
+        warn = True
+    elif GSASIIpath.GetConfigValue('debug'):
+        print('N.B. current binaries have been updated')
     if warn:
         print('You are suggested to install a new version of GSAS-II.\nSee https://bit.ly/G2install',
               '\n\nFor information on packages see\nhttps://gsas-ii.readthedocs.io/en/latest/packages.html and',
               '\nhttps://gsas-ii.readthedocs.io/en/latest/GSASIIGUI.html#GSASIIdataGUI.versionDict')
-
+    print()
+
+def TestOldVersions():
+    '''Test the versions of required Python packages, etc.
+    Returns a non-empty text string if there are problems.
+    '''
+    import numpy as np
+    import scipy as sp
+    import wx
+    import matplotlib as mpl
+    import OpenGL as ogl
+    warnmsg = ''
+    errmsg = ''
+    for s,m in [('Python',None), ('wx',wx), ('matplotlib', mpl), ('numpy',np),
+                    ('scipy',sp), ('OpenGL',ogl)]:
+        if s == 'Python':
+            pkgver = platform.python_version()
+            prefix = ''
+        else:
+            pkgver = m.__version__
+            prefix = 'Package '+s
+        if s in versionDict['tooOld']:
+            match = compareVersions(pkgver,versionDict['tooOld'][s])
+            if match <= 0:
+                if errmsg: errmsg += '\n'
+                errmsg += prefix + '{} version {} is too old to run GSAS-II.'.format(s,pkgver)
+        if s in versionDict['tooOldWarn']:
+            match = compareVersions(pkgver,versionDict['tooOldWarn'][s])
+            if match <= 0:
+                if warnmsg: warnmsg += '\n'
+                warnmsg += prefix + '{} version {} is likely too old for GSAS-II.'.format(s,pkgver)
+        if s in versionDict['badVersionWarn']:
+            for v in versionDict['badVersionWarn'][s]:
+                if compareVersions(pkgver,v) == 0:
+                    if errmsg: errmsg += '\n'
+                    errmsg += prefix + '{} version {} causes problems with GSAS-II.'.format(s,pkgver)
+                    break
+    return errmsg,warnmsg
+        
 #### GUI creation #############################################################
 def GSASIImain(application):

trunk/docs/source/packages.rst

@@ -45 +45 @@
 * PyOpenGL (http://pyopengl.sourceforge.net/documentation). Note: a copy of this is distributed with GSAS-II (at present) and will be installed if the Python setuptools package is present. 
 
-Several packages are used in sections of the code, but are not
+Several Python packages are used in sections of the code, but are not
 required. If these packages are not present, warning messages may be
 generated if they would be needed, but the vast bulk of GSAS-II will function normally. 
@@ -57 +57 @@
   warning message appears on GSAS-II startup. 
 * imageio is used to make movies. 
-* svn: When using Anaconda we also encourage installation of the
-  svn (subversion) conda package. This is not actually part of Python
-  and can be installed directly into your system's configuration. It is used by
-  GSAS-II to download updates to our code. This can be skipped if svn
-  is installed directly (easy Linux, but a bit harder on MacOS and
-  Windows). In conda-forge this package is called subversion, but at
-  present is only available for Linux.
-* pywin32 (windows only): this provides the win32com module that is
+* requests: this package simplifies http access
+  (https://requests.readthedocs.io/). It is used for access to
+  webpages such as ISODISTORT and for some internal software downloads.
+* win32com (windows only): this module is
   used to install GSAS-II on windows machines. GSAS-II can be used on
   Windows without this, but the installation will offer less
-  integration into Windows. 
+  integration into Windows. Conda provides this under the name pywin32.
 * conda: the conda package allows access to conda features from
-  inside Python. It will be used inceasingly by GSAS-II to
+  inside Python. It will be used increasingly by GSAS-II to
   self-install software. The conda package is installed by default in
   miniconda and anaconda but if you create an environment for GSAS-II
   (`conda create -n <env> package-list...`), it will not be added
   unless you request it specifically.  
-* requests: this package simplifies http access
-  (https://requests.readthedocs.io/). It is used for access to
-  webpages such as ISODISTORT and for some internal software downloads.
+
+The following are conda package is used in GSAS-II but is not
+actually a Python package.
+  
+* svn (or subversion): the GSAS-II code works much better when
+  subversion is available to install and update the GSAS-II
+  code. Technically it is optional, but is not easy to bypass. The
+  Anaconda distribution once provided this, but does this no longer. With
+  the conda-forge repository we now use, it is only available for
+  Linux (where it really is not needed since it is easy to install
+  there) and the package is called subversion. For MacOS and Windows, the GSAS-II
+  self-installer now provides binaries for the svn program. 
   
 *Conda command*: