Changeset 3922

Timestamp:

Apr 23, 2019 11:49:09 AM (5 years ago)

Author:

toby

Message:

more debugging of OSX packaging

File:

• install/g2complete/src/bootstrap.py (modified) (2 diffs)

install/g2complete/src/bootstrap.py

@@ -213 +213 @@
         missing.append(pkg)
 
-if missing:
+if missing and not skipInstallSteps:
     msg = """Sorry, this version of Python cannot be used
 for GSAS-II. It is missing the following package(s):
@@ -221 +221 @@
     print("\nPlease install these package(s) and try running this again.")
     print("Showing first error: ")
-    for pkg in ['numpy','scipy','matplotlib','wx',]:
+    for pkg in ['numpy','scipy','matplotlib','wx','OpenGL',]:
         exec('import '+pkg)
     sys.exit()
-# try:
-#     import OpenGL
-#     install_with_easyinstall = None 
-# except:
-#     try:               
-#           from setuptools.command import easy_install                  
-#     except ImportError:
-#         print('You are missing the OpenGL Python package. This can be ')
-#         print('installed by this script if the setuptools package is installed')
-#         print('Please install either OpenGL (pyopengl) or setuptools')
-#         print("package and try running this again.")
-#         sys.exit()
-#     print("Missing the OpenGL Python package. Will attempt to install this later.")
-#     def install_with_easyinstall(package):             
-#         try:                   
-#             print("trying system-wide ")               
-#             easy_install.main(['-f',os.path.split(__file__)[0],package])               
-#             return             
-#         except:                
-#             pass               
-#         try:                   
-#             print("trying user level ")                
-#             easy_install.main(['-f',os.path.split(__file__)[0],'--user',package])              
-#             return             
-#         except:                
-#             print("\nInstall of "+package+" failed. Error traceback follows:")
-#             import traceback                   
-#             print(traceback.format_exc())
-#             sys.exit() 
 
 if not skipDownloadSteps: