Merge pull request #40 from kif/meson

Use meson-python to package GSAS-II and prototype pixi to manage development environment

Author: tacaswell

.gitignore

@@ -29,4 +29,14 @@ __pycache__
 GSASII/bindist
 
 # Local dev env files
-.vscode
+.vscode
+
+
+dist
+build
+
+#
+*.gpx
+*.lst
+
+*~

GSASII/Absorb.py

@@ -13,10 +13,10 @@
 import numpy as np
 import sys
 import matplotlib as mpl
-import GSASIIpath
-import GSASIIElem as G2elem
-import GSASIIElemGUI as G2elemGUI
-import GSASIIctrlGUI as G2G
+from . import GSASIIpath
+from . import GSASIIElem as G2elem
+from . import GSASIIElemGUI as G2elemGUI
+from . import GSASIIctrlGUI as G2G
 
 try:
     wx.NewIdRef

GSASII/CifFile/meson.build

@@ -0,0 +1,15 @@
+py.install_sources([
+  'CifFile.py',
+  'StarFile.py',
+  'TypeContentsParser.py',
+  'YappsStarParser_1_0.py',
+  'YappsStarParser_1_1.py',
+  'YappsStarParser_2_0.py',
+  'YappsStarParser_STAR2.py',
+  '__init__.py',
+  'parsetab.py',
+  'yapps3_compiled_rt.py'
+],
+  pure: false,    # Will be installed next to binaries
+  subdir: 'GSASII/CifFile'  # Folder relative to site-packages to install to
+)

GSASII/G2compare.py

@@ -32,12 +32,12 @@
     pass
 import scipy as sp
 
-import GSASIIpath
-import GSASIIfiles as G2fil
-import GSASIIplot as G2plt
-import GSASIIdataGUI as G2gd
-import GSASIIctrlGUI as G2G
-import GSASIIobj as G2obj
+from . import GSASIIpath
+from . import GSASIIfiles as G2fil
+from . import GSASIIplot as G2plt
+from . import GSASIIdataGUI as G2gd
+from . import GSASIIctrlGUI as G2G
+from . import GSASIIobj as G2obj
 
 __version__ = '0.0.1'
 

GSASII/GSASII.py

@@ -2,61 +2,61 @@
 # -*- coding: utf-8 -*-
 #GSASII
 '''
-A single class, :class:`G2App`, is defined here to create 
-an wxPython application. This is only used on 
-MacOS. For other platforms ``wx.App()`` is called directly. 
+A single class, :class:`G2App`, is defined here to create
+an wxPython application. This is only used on
+MacOS. For other platforms ``wx.App()`` is called directly.
 '''
 
 import sys
-#import platform
-import scipy.optimize # loading here addresses problem with build for wx on Pi
+
+from . import GSASIIpath
+
+__version__ = '2.0.0'
 try:
+    from . import git_verinfo
+    __version__ = git_verinfo.git_tags[0]
+except ImportError:
+    pass
+
+
+def main():
+    import scipy.optimize # loading here addresses problem with build for wx on Pi
     import wx
     # the next line removes the need for pythonw. Thanks to Matt Newville!
     # appears unneeded from wx 4.2.1 on
-    if sys.platform.lower() == 'darwin': wx.PyApp.IsDisplayAvailable = lambda _: True
-# importing the following wx modules at the same time as wx seems to eliminate 
-# the "Debug: Adding duplicate image handler for 'Windows bitmap file'"
-# error message
+    if sys.platform.lower() == 'darwin':
+        wx.PyApp.IsDisplayAvailable = lambda _: True
+    # importing the following wx modules at the same time as wx seems to
+    # eliminate the "Debug: Adding duplicate image handler for 'Windows bitmap
+    # file'" error message
     import wx.grid as wg
     import wx.aui
     import wx.lib.scrolledpanel as wxscroll
     import wx.lib.mixins.listctrl  as  listmix
     import wx.richtext as wxrt
     import wx.lib.filebrowsebutton as wxfilebrowse
     wg,wx.aui,wxscroll,listmix,wxrt,wxfilebrowse,scipy.optimize # avoid unused warning
-except ImportError:
-    pass
-import GSASIIpath
 
-__version__ = '2.0.0'
-try:
-    import git_verinfo
-    __version__ = git_verinfo.git_tags[0]
-except:
-    pass
-    
-class G2App(wx.App):
-    '''Used to create a wx python application for the GUI for Mac.
-    Customized to implement drop of GPX files onto app.
-    '''
-    startupMode = True
-    def ClearStartup(self):
-        '''Call this after app startup complete because a Drop event is posted 
-        when GSAS-II is initially started.
-        '''
-        self.startupMode = False        
-    def MacOpenFiles(self, filenames):
-        if self.startupMode:
-            return
-        import GSASIIfiles
-        for project in filenames:
-            #print("Start GSAS-II with project file "+str(project))
-            #GSASIIpath.MacStartGSASII(__file__,project)
-            GSASIIfiles.openInNewTerm(project)
+    if sys.platform == "darwin":
+        class G2App(wx.App):
+            '''Used to create a wx python application for the GUI for Mac.
+            Customized to implement drop of GPX files onto app.
+            '''
+            startupMode = True
+            def ClearStartup(self):
+                '''Call this after app startup complete because a Drop event is posted
+                when GSAS-II is initially started.
+                '''
+                self.startupMode = False
+            def MacOpenFiles(self, filenames):
+                if self.startupMode:
+                    return
+                from . import GSASIIfiles
+                for project in filenames:
+                    #print("Start GSAS-II with project file "+str(project))
+                    #GSASIIpath.MacStartGSASII(__file__,project)
+                    GSASIIfiles.openInNewTerm(project)
 
-if __name__ == '__main__':
-    if sys.platform == "darwin": 
         application = G2App(0) # create the GUI framework
     else:
         application = wx.App(0) # create the GUI framework
@@ -71,10 +71,10 @@ def MacOpenFiles(self, filenames):
         sys.exit()
         # print('Unable to run with current setup, do you want to update to the')
         # try:
-        #     if '2' in platform.python_version_tuple()[0]:            
+        #     if '2' in platform.python_version_tuple()[0]:
         #         ans = raw_input("latest GSAS-II version? Update ([Yes]/no): ")
         #     else:
-        #         ans = input("latest GSAS-II version? Update ([Yes]/no): ")                
+        #         ans = input("latest GSAS-II version? Update ([Yes]/no): ")
         # except:
         #     ans = 'no'
         # if ans.strip().lower() == "no":
@@ -89,9 +89,12 @@ def MacOpenFiles(self, filenames):
         # elif GSASIIpath.HowIsG2Installed().startswith('svn'):
         #     svnCheckUpdates(None)
         # else:
-    import GSASIIdataGUI as G2gd
+    from . import GSASIIdataGUI as G2gd
     G2gd.GSASIImain(application) # start the GUI
-    if sys.platform == "darwin": 
+    if sys.platform == "darwin":
         wx.CallLater(50,application.ClearStartup)
     GSASIIpath.InvokeDebugOpts()
     application.MainLoop()
+
+if __name__ == '__main__':
+    main()