fix moto>=5 rename of test mock utility for AWS S3

Author: fmigneault

CHANGES.rst

@@ -16,7 +16,7 @@ Changes:
 
 Fixes:
 ------
-- No change.
+- Fix ``moto>=5`` used in tests to mock AWS S3 operations that replaced ``mock_s3`` context manager by ``mock_aws``.
 
 .. _changes_5.0.0:
 

Makefile

@@ -492,7 +492,7 @@ check-all: install-dev $(CHECKS_ALL) 	## check all code linters
 
 .PHONY: check-pep8-only
 check-pep8-only: mkdir-reports 		## check for PEP8 code style issues
-	@echo "Running pep8 code style checks..."
+	@echo "Running PEP8 code style checks..."
 	@-rm -fr "$(REPORTS_DIR)/check-pep8.txt"
 	@bash -c '$(CONDA_CMD) \
 		flake8 --config="$(APP_ROOT)/setup.cfg" --output-file="$(REPORTS_DIR)/check-pep8.txt" --tee'

setup.cfg

@@ -103,6 +103,7 @@ exclude =
 	env,
 	parts,
 	examples,
+	node_modules,
 
 [doc8]
 max-line-length = 120

tests/utils.py

@@ -38,6 +38,7 @@
 
 from weaver import __name__ as __package__
 from weaver.app import main as weaver_app
+from weaver.compat import Version
 from weaver.config import WEAVER_DEFAULT_INI_CONFIG, WeaverConfiguration, get_weaver_config_file
 from weaver.database import get_db
 from weaver.datatype import Service
@@ -1285,7 +1286,11 @@ def mocked_aws_s3(test_func):
     @functools.wraps(test_func)
     def wrapped(*args, **kwargs):
         # type: (*Any, **Any) -> Any
-        with moto.mock_s3():
+        if Version(moto.__version__).major >= 5:
+            mock_aws_s3 = moto.mock_aws  # pylint: disable=E1101,no-member
+        else:
+            mock_aws_s3 = moto.mock_s3  # pylint: disable=E1101,no-member
+        with mock_aws_s3():
             return test_func(*args, **kwargs)
     return wrapped