Merge pull request #1393 from mathics/remove-psutil-for-msys

Make psutil optional - msys doesn't have

Author: rocky

.gitignore

@@ -1,5 +1,6 @@
 *.c
 *.cpp
+*.dll
 *.egg
 *.gz
 *.nix

mathics/builtin/system.py

@@ -8,7 +8,6 @@
 
 import os
 import platform
-import psutil
 import sys
 import re
 import subprocess
@@ -29,6 +28,13 @@
 from mathics import version_string
 from mathics.builtin.strings import to_regex
 
+try:
+    import psutil
+except:
+    have_psutil = False
+else:
+    have_psutil = True
+
 
 class Aborted(Predefined):
     """
@@ -459,42 +465,43 @@ def evaluate(self, evaluation) -> Real:
         return Real(self.value)
 
 
-class SystemMemory(Predefined):
-    """
-    <dl>
-      <dt>'$SystemMemory'
-      <dd>Returns the total amount of physical memory.
-    </dl>
+if have_psutil:
+    class SystemMemory(Predefined):
+        """
+        <dl>
+          <dt>'$SystemMemory'
+          <dd>Returns the total amount of physical memory.
+        </dl>
 
-    >> $SystemMemory
-     = ...
-    """
+        >> $SystemMemory
+         = ...
+        """
 
-    name = "$SystemMemory"
+        name = "$SystemMemory"
 
-    def evaluate(self, evaluation) -> Integer:
-        totalmem = psutil.virtual_memory().total
-        return Integer(totalmem)
+        def evaluate(self, evaluation) -> Integer:
+            totalmem = psutil.virtual_memory().total
+            return Integer(totalmem)
 
-class MemoryAvailable(Builtin):
-    """
-    <dl>
-      <dt>'MemoryAvailable'
-      <dd>Returns the amount of the available physical memory.
-    </dl>
+    class MemoryAvailable(Builtin):
+        """
+        <dl>
+          <dt>'MemoryAvailable'
+          <dd>Returns the amount of the available physical memory.
+        </dl>
 
-    >> MemoryAvailable[]
-     = ...
+        >> MemoryAvailable[]
+         = ...
 
-    The relationship between $SystemMemory, MemoryAvailable, and MemoryInUse:
-    >> $SystemMemory > MemoryAvailable[] > MemoryInUse[]
-     = True
-    """
+        The relationship between $SystemMemory, MemoryAvailable, and MemoryInUse:
+        >> $SystemMemory > MemoryAvailable[] > MemoryInUse[]
+         = True
+        """
 
-    def apply(self, evaluation) -> Integer:
-        """MemoryAvailable[]"""
-        totalmem = psutil.virtual_memory().available
-        return Integer(totalmem)
+        def apply(self, evaluation) -> Integer:
+            """MemoryAvailable[]"""
+            totalmem = psutil.virtual_memory().available
+            return Integer(totalmem)
 
 
 class MemoryInUse(Builtin):

requirements-extra.txt

@@ -1,4 +1,5 @@
 # Optional packages which add functionality or speed things up
+psutil #
 scikit-image # FindMinimum can use this
 lxml  # for HTML parsing used in builtin/fileformats/html
 wordcloud # Used in builtin/image.py by WordCloud()

setup.py

@@ -111,7 +111,7 @@ def read(*rnames):
     "palettable",
     "pint",
     "python-dateutil",
-    "psutil",  # for $SystemMemory
+    # "psutil",  # for $SystemMemory
     "llvmlite",
     "requests",
     # lxml is an optional dependency for HTML parsing used in builtin/fileformats/html