Fix or ignore deprecation warnings in the catalog (#4773)

* Fix or ignore deprecation warnings in the catalog

* Make marshmallow ignoration broader

catalog/dags/common/storage/columns.py

@@ -31,7 +31,7 @@ class UpsertStrategy(Enum):
     merge_jsonb_arrays = auto()
     merge_array = auto()
     merge_tags = auto()
-    no_change = ()
+    no_change = auto()
     calculate_value = auto()
 
 

catalog/pytest.ini

@@ -23,11 +23,17 @@ addopts =
 #   https://docs.sqlalchemy.org/en/20/errors.html#error-b8d9
 #   Warning in dependency, nothing we can do
 #   "removed"/"remoevd" is due to https://github.com/pallets/flask
-# distutils
+# botocore
+#   https://github.com/boto/boto3/issues/3889
 #   Warning in dependency, nothing we can do
+# marshmallow_sqlalchemy
+#   https://github.com/marshmallow-code/marshmallow/issues/2227
+#   Upstream dependency is fixed but Airflow constraints are keeping us on an
+#   older version
 filterwarnings=
     ignore:.*is deprecated and will be (remoevd|removed) in Flask 2.3.:DeprecationWarning
-    ignore:distutils Version classes are deprecated. Use packaging.version instead:DeprecationWarning
+    ignore:datetime.datetime.utcnow:DeprecationWarning:botocore
+    ignore::DeprecationWarning:marshmallow.*
 
 # Change the pytest cache location since Docker cannot write within the module file
 # structure due to permissions issues