Merge pull request #178 from MITLibraries/maintenance-week

Maintenance week updates

.python-version

@@ -1 +1 @@
-3.11.4
+3.12

Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lambda/python:3.11
+FROM public.ecr.aws/lambda/python:3.12
 
 # Copy function code
 COPY . ${LAMBDA_TASK_ROOT}/

Pipfile

@@ -19,4 +19,4 @@ pytest = "*"
 ruff = "*"
 
 [requires]
-python_version = "3.11"
+python_version = "3.12"

lambdas/format_input.py

@@ -55,9 +55,9 @@ def lambda_handler(event: dict, _context: dict) -> dict:
                     "for the provided date and source, something likely went wrong."
                 )
             elif run_type == "daily":
-                result[
-                    "success"
-                ] = "There were no daily new/updated/deleted records to harvest."
+                result["success"] = (
+                    "There were no daily new/updated/deleted records to harvest."
+                )
             return result
         logger.info(
             "%s extracted files found in TIMDEX S3 bucket for date '%s' and source '%s'",

pyproject.toml

@@ -1,7 +1,3 @@
-# We do our best to sync this template with the latest version in our internal documentation.
-# For MIT developers, we strongly recommend copying the pyproject.toml template from:
-# https://mitlibraries.atlassian.net/wiki/spaces/IN/pages/3432415247/Python+Project+Linters#Template-for-pyproject.toml
-
 [tool.black]
 line-length = 90
 
@@ -14,7 +10,15 @@ exclude = ["tests/"]
 log_level = "INFO"
 
 [tool.ruff]
-target-version = "py311"
+target-version = "py312"
+
+# set max line length
+line-length = 90
+
+# enumerate all fixed violations
+show-fixes = true
+
+[tool.ruff.lint]
 select = ["ALL", "PT"]
 
 ignore = [
@@ -43,27 +47,21 @@ ignore = [
 # allow autofix behavior for specified rules
 fixable = ["E", "F", "I", "Q"]
 
-# set max line length
-line-length = 90
-
-# enumerate all fixed violations
-show-fixes = true
-
-[tool.ruff.flake8-annotations]
+[tool.ruff.lint.flake8-annotations]
 mypy-init-return = true
 
-[tool.ruff.flake8-pytest-style]
+[tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/**/*" = [
     "ANN",
     "ARG001",
     "S101",
 ]
 
-[tool.ruff.pycodestyle]
+[tool.ruff.lint.pycodestyle]
 max-doc-length = 90
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "google"

tests/conftest.py

@@ -1,6 +1,6 @@
 import boto3
 import pytest
-from moto import mock_s3
+from moto import mock_aws
 
 
 @pytest.fixture(autouse=True)
@@ -17,7 +17,7 @@ def _test_env(monkeypatch):
 
 @pytest.fixture(autouse=True)
 def mocked_s3():
-    with mock_s3():
+    with mock_aws():
         client = boto3.client("s3", region_name="us-east-1")
         client.create_bucket(Bucket="test-timdex-bucket")
         client.create_bucket(Bucket="test-alma-bucket")