DM-33478: Try to speed up PropertySet on macOS ARM

.github/workflows/lint.yaml

@@ -1,8 +1,10 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   lint:
@@ -13,7 +15,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Install
         run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)

python/lsst/daf/base/propertyContainer/propertyContainerContinued.py

@@ -25,6 +25,7 @@
 __all__ = ["getPropertySetState", "getPropertyListState", "setPropertySetState", "setPropertyListState"]
 
 import enum
+import math
 import numbers
 import dataclasses
 from collections.abc import Mapping, KeysView, ValuesView, ItemsView
@@ -37,6 +38,16 @@
 from .propertyList import PropertyList
 from ..dateTime import DateTime
 
+# Map the type names to the internal type representation.
+_TYPE_MAP = {}
+for checkType in ("Bool", "Short", "Int", "Long", "LongLong", "UnsignedLongLong",
+                  "Float", "Double", "String", "DateTime",
+                  "PropertySet", "Undef"):
+    type_obj = getattr(PropertySet, "TYPE_" + checkType)
+    _TYPE_MAP[type_obj] = checkType
+    # Store both directions.
+    _TYPE_MAP[checkType] = type_obj
+
 
 def getPropertySetState(container, asLists=False):
     """Get the state of a PropertySet in a form that can be pickled.
@@ -164,13 +175,9 @@ def _propertyContainerElementTypeName(container, name):
     except LookupError as e:
         # KeyError is more commonly expected when asking for an element
         # from a mapping.
-        raise KeyError(str(e))
-    for checkType in ("Bool", "Short", "Int", "Long", "LongLong", "UnsignedLongLong",
-                      "Float", "Double", "String", "DateTime",
-                      "PropertySet", "Undef"):
-        if t == getattr(container, "TYPE_" + checkType):
-            return checkType
-    return None
+        raise KeyError(str(e)) from None
+
+    return _TYPE_MAP.get(t, None)
 
 
 def _propertyContainerGet(container, name, returnStyle):
@@ -325,9 +332,9 @@ def _choose_int_from_range(int_value, current_type):
                                f"range value: {int_value}")
         return use_type
 
-    try:
+    if container.exists(name):
         containerType = _propertyContainerElementTypeName(container, name)
-    except LookupError:
+    else:
         containerType = None
 
     useTypeMin = _choose_int_from_range(min, containerType)
@@ -645,12 +652,20 @@ def __eq__(self, other):
             return False
 
         for name in self:
-            if _propertyContainerGet(self, name, returnStyle=ReturnStyle.AUTO) != \
-                    _propertyContainerGet(other, name, returnStyle=ReturnStyle.AUTO):
-                return False
-            if self.typeOf(name) != other.typeOf(name):
+            if (self_typeOf := self.typeOf(name)) != other.typeOf(name):
                 return False
 
+            if (v1 := _propertyContainerGet(self, name, returnStyle=ReturnStyle.AUTO)) != \
+                    (v2 := _propertyContainerGet(other, name, returnStyle=ReturnStyle.AUTO)):
+                # It is possible that we have floats that are NaN. When
+                # equating two PropertySets if there are fields with NaN
+                # these should equate equal.
+                if self_typeOf in (_TYPE_MAP["Float"], _TYPE_MAP["Double"]) \
+                        and math.isnan(v1) and math.isnan(v2):
+                    pass
+                else:
+                    return False
+
         return True
 
     def __copy__(self):