Changeset 3e1f417 in sasview for check_packages.py


Ignore:
Timestamp:
May 24, 2017 9:36:00 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7b15990
Parents:
7132e49
Message:

Don't check pywin version in check_packages: it may not be marked in the file

File:
1 edited

Legend:

Unmodified
Added
Removed
  • check_packages.py

    r235f514 r3e1f417  
    7272    for package_name, test_vals in win_required_package_list.items(): 
    7373        try: 
    74             if package_name == "pywin": 
    75                 import win32api 
    76                 fixed_file_info = win32api.GetFileVersionInfo(win32api.__file__, '\\') 
    77                 print("%s Version Installed: %s"% (package_name, fixed_file_info['FileVersionLS'] >> 16)) 
    78             else: 
    79                 i = __import__(test_vals['import_name'], fromlist=['']) 
    80                 print("%s Version Installed: %s"% (package_name, getattr(i, test_vals['test']))) 
     74            i = __import__(test_vals['import_name'], fromlist=['']) 
     75            print("%s Version Installed: %s"% (package_name, getattr(i, test_vals['test'], "unknown"))) 
    8176        except ImportError: 
    8277            print('%s NOT INSTALLED'% package_name) 
Note: See TracChangeset for help on using the changeset viewer.