Changeset bc04647 in sasview for check_packages.py

Timestamp:

Jun 19, 2017 9:42:18 AM (7 years ago)

Author:

GitHub <noreply@…>

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:

0d93464, b6b81a3, 78312f7, fca1f50, 03e3902, a6ee176, 7b15990, 490c617, fcfaf52, 4abc05d8, 8bcf866

Parents:

d9c1551 (diff), 3e1f417 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (06/19/17 09:42:18)

git-committer:

GitHub <noreply@…> (06/19/17 09:42:18)

Message:

Merge pull request #93 from SasView?/dont-check-pywin-version

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

File:

• check_packages.py (modified) (1 diff)

check_packages.py

@@ -72 +72 @@
     for package_name, test_vals in win_required_package_list.items():
         try:
-            if package_name == "pywin":
-                import win32api
-                fixed_file_info = win32api.GetFileVersionInfo(win32api.__file__, '\\')
-                print("%s Version Installed: %s"% (package_name, fixed_file_info['FileVersionLS'] >> 16))
-            else:
-                i = __import__(test_vals['import_name'], fromlist=[''])
-                print("%s Version Installed: %s"% (package_name, getattr(i, test_vals['test'])))
+            i = __import__(test_vals['import_name'], fromlist=[''])
+            print("%s Version Installed: %s"% (package_name, getattr(i, test_vals['test'], "unknown")))
         except ImportError:
             print('%s NOT INSTALLED'% package_name)