From 63482e1c4aac75cff3d9a963b242b470e8699054 Mon Sep 17 00:00:00 2001 From: Lynne Jones Date: Thu, 5 Oct 2023 12:41:32 -0700 Subject: [PATCH 1/2] Remove six --- rubin_sim/utils/spatial_bounds.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rubin_sim/utils/spatial_bounds.py b/rubin_sim/utils/spatial_bounds.py index 8951f72d6..f5bbf457b 100644 --- a/rubin_sim/utils/spatial_bounds.py +++ b/rubin_sim/utils/spatial_bounds.py @@ -9,7 +9,6 @@ __all__ = ("SpatialBounds", "CircleBounds", "BoxBounds") import numpy as np -from six import with_metaclass class SpatialBoundsMetaClass(type): @@ -31,7 +30,7 @@ def __init__(cls, name, bases, dct): return super(SpatialBoundsMetaClass, cls).__init__(name, bases, dct) -class SpatialBounds(with_metaclass(SpatialBoundsMetaClass, object)): +class SpatialBounds(metaclass=SpatialBoundsMetaClass: """ Classes inheriting from this class define spatial bounds on the objects contained within a catalog. They also translate those bounds into From b6f57ee4abd42b07a4c0fcc39687e9e4df35e8fc Mon Sep 17 00:00:00 2001 From: Lynne Jones Date: Thu, 5 Oct 2023 12:52:47 -0700 Subject: [PATCH 2/2] Remove six with correct pythoning --- rubin_sim/utils/spatial_bounds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubin_sim/utils/spatial_bounds.py b/rubin_sim/utils/spatial_bounds.py index f5bbf457b..b0b6385b9 100644 --- a/rubin_sim/utils/spatial_bounds.py +++ b/rubin_sim/utils/spatial_bounds.py @@ -30,7 +30,7 @@ def __init__(cls, name, bases, dct): return super(SpatialBoundsMetaClass, cls).__init__(name, bases, dct) -class SpatialBounds(metaclass=SpatialBoundsMetaClass: +class SpatialBounds(metaclass=SpatialBoundsMetaClass): """ Classes inheriting from this class define spatial bounds on the objects contained within a catalog. They also translate those bounds into