update ruff config

.gitignore

@@ -138,3 +138,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# vim
+*.swp

apps/api/src/hyp3_api/__init__.py

@@ -1,5 +1,6 @@
 from flask import Flask
 
+
 app = Flask(__name__, template_folder='ui/swagger/', static_folder='ui/swagger/', static_url_path='/ui/')
 CMR_URL = 'https://cmr.earthdata.nasa.gov/search/granules.json'
 

apps/api/src/hyp3_api/__main__.py

@@ -1,4 +1,5 @@
 from hyp3_api import app
 
+
 if __name__ == '__main__':
     app.run(port=8080)

apps/api/src/hyp3_api/routes.py

@@ -16,6 +16,7 @@
 from hyp3_api import app, auth, handlers
 from hyp3_api.openapi import get_spec_yaml
 
+
 api_spec_file = Path(__file__).parent / 'api-spec' / 'openapi-spec.yml'
 api_spec_dict = get_spec_yaml(api_spec_file)
 api_spec = OpenAPI.from_dict(api_spec_dict)

apps/api/src/hyp3_api/validation.py

@@ -11,6 +11,7 @@
 from hyp3_api import CMR_URL
 from hyp3_api.util import get_granules
 
+
 DEM_COVERAGE = None
 
 

apps/get-files/src/get_files.py

@@ -8,6 +8,7 @@
 
 import boto3
 
+
 S3_CLIENT = boto3.client('s3')
 
 

apps/render_cf.py

@@ -151,7 +151,7 @@ def render_templates(job_types: dict, compute_envs: dict, security_environment:
         keep_trailing_newline=True,
     )
 
-    for template_file in Path('.').glob('**/*.j2'):
+    for template_file in Path().glob('**/*.j2'):
         template = env.get_template(str(template_file))
 
         output = template.render(

apps/scale-cluster/src/scale_cluster.py

@@ -5,6 +5,7 @@
 import boto3
 import dateutil.relativedelta
 
+
 BATCH = boto3.client('batch')
 COST_EXPLORER = boto3.client('ce')
 

apps/start-execution-manager/src/start_execution_manager.py

@@ -2,9 +2,10 @@
 import os
 
 import boto3
+from lambda_logging import log_exceptions, logger
 
 import dynamo
-from lambda_logging import log_exceptions, logger
+
 
 LAMBDA_CLIENT = boto3.client('lambda')
 

apps/start-execution-worker/src/start_execution_worker.py

@@ -4,9 +4,9 @@
 from typing import Any
 
 import boto3
-
 from lambda_logging import log_exceptions, logger
 
+
 STEP_FUNCTION = boto3.client('stepfunctions')
 
 batch_params_file = Path(__file__).parent / 'batch_params_by_job_type.json'

apps/upload-log/src/upload_log.py

@@ -5,6 +5,7 @@
 import boto3
 from botocore.config import Config
 
+
 config = Config(retries={'max_attempts': 2, 'mode': 'standard'})
 CLOUDWATCH = boto3.client('logs', config=config)
 S3 = boto3.client('s3')

lib/dynamo/dynamo/jobs.py

@@ -2,7 +2,7 @@
 from decimal import Decimal
 from os import environ
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 from uuid import uuid4
 
 from boto3.dynamodb.conditions import Attr, Key
@@ -18,6 +18,7 @@
 from dynamo.user import APPLICATION_APPROVED, APPLICATION_NOT_STARTED, APPLICATION_PENDING, APPLICATION_REJECTED
 from dynamo.util import DYNAMODB_RESOURCE, convert_floats_to_decimals, current_utc_time, get_request_time_expression
 
+
 costs_file = Path(__file__).parent / 'costs.json'
 COSTS = convert_floats_to_decimals(json.loads(costs_file.read_text()))
 
@@ -29,7 +30,7 @@
     DEFAULT_PARAMS_BY_JOB_TYPE = {}
 
 
-def put_jobs(user_id: str, jobs: List[dict], dry_run=False) -> List[dict]:
+def put_jobs(user_id: str, jobs: list[dict], dry_run=False) -> list[dict]:
     table = DYNAMODB_RESOURCE.Table(environ['JOBS_TABLE_NAME'])
     request_time = current_utc_time()
 

lib/dynamo/dynamo/user.py

@@ -16,6 +16,7 @@
 )
 from dynamo.util import DYNAMODB_RESOURCE
 
+
 APPLICATION_NOT_STARTED = 'NOT_STARTED'
 APPLICATION_PENDING = 'PENDING'
 APPLICATION_APPROVED = 'APPROVED'

lib/dynamo/dynamo/util.py

@@ -5,6 +5,7 @@
 from boto3.dynamodb.conditions import Key
 from dateutil.parser import parse
 
+
 DYNAMODB_RESOURCE = boto3.resource('dynamodb')
 
 

lib/dynamo/setup.py

@@ -1,5 +1,6 @@
 from setuptools import find_packages, setup
 
+
 setup(
     name='dynamo',
     license='BSD',

lib/lambda_logging/lambda_logging/__init__.py

@@ -1,6 +1,7 @@
 import logging
 from functools import wraps
 
+
 logging.basicConfig()
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)

lib/lambda_logging/setup.py

@@ -1,5 +1,6 @@
 from setuptools import find_packages, setup
 
+
 setup(
     name='lambda_logging',
     license='BSD',

pyproject.toml

@@ -0,0 +1,40 @@
+[tool.ruff]
+line-length = 120
+src = [
+    "apps",
+    "apps/api/src",
+    "apps/check-processing-time/src",
+    "apps/get-files/src",
+    "apps/handle-batch-event/src",
+    "apps/set-batch-overrides/src",
+    "apps/scale-cluster/src",
+    "apps/start-execution-manager/src",
+    "apps/start-execution-worker/src",
+    "apps/disable-private-dns/src",
+    "apps/update-db/src",
+    "apps/upload-log/src",
+    "lib/dynamo",
+    "tests",
+]
+
+[tool.ruff.format]
+indent-style = "space"
+quote-style = "single"
+
+[tool.ruff.lint]
+extend-select = [
+    "I",   # isort: https://docs.astral.sh/ruff/rules/#isort-i
+    "UP",  # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up
+
+    # TODO: uncomment the following extensions and address their warnings:
+    #"D",   # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d
+    #"ANN", # annotations: https://docs.astral.sh/ruff/rules/#flake8-annotations-ann
+    #"PTH", # use-pathlib-pth: https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ruff.lint.isort]
+case-sensitive = true
+lines-after-imports = 2

tests/conftest.py

@@ -21,7 +21,7 @@ class TableProperties:
 def get_table_properties_from_template(resource_name):
     yaml.SafeLoader.add_multi_constructor('!', lambda loader, suffix, node: None)
     template_file = path.join(path.dirname(__file__), '../apps/main-cf.yml')
-    with open(template_file, 'r') as f:
+    with open(template_file) as f:
         template = yaml.safe_load(f)
     table_properties = template['Resources'][resource_name]['Properties']
     return table_properties

tests/test_api/conftest.py

@@ -7,6 +7,7 @@
 from hyp3_api import CMR_URL, app, auth
 from hyp3_api.util import get_granules
 
+
 AUTH_COOKIE = 'asf-urs'
 COSTS_URI = '/costs'
 JOBS_URI = '/jobs'

tests/test_api/test_api_spec.py

@@ -1,8 +1,8 @@
 from http import HTTPStatus
 
+from hyp3_api import auth
 from test_api.conftest import AUTH_COOKIE, JOBS_URI, USER_URI, login
 
-from hyp3_api import auth
 
 ENDPOINTS = {
     JOBS_URI: {'GET', 'HEAD', 'OPTIONS', 'POST'},

tests/test_api/test_get_user.py

@@ -1,9 +1,8 @@
 from http import HTTPStatus
 
-from test_api.conftest import USER_URI, login, make_db_record
-
 from dynamo.user import APPLICATION_APPROVED, APPLICATION_NOT_STARTED, APPLICATION_REJECTED
 from dynamo.util import current_utc_time
+from test_api.conftest import USER_URI, login, make_db_record
 
 
 def test_get_new_user(client, tables, monkeypatch):

tests/test_api/test_patch_user.py

@@ -2,9 +2,8 @@
 from decimal import Decimal
 from http import HTTPStatus
 
-from test_api.conftest import DEFAULT_ACCESS_TOKEN, USER_URI, login
-
 from dynamo.user import APPLICATION_APPROVED, APPLICATION_PENDING, APPLICATION_REJECTED
+from test_api.conftest import DEFAULT_ACCESS_TOKEN, USER_URI, login
 
 
 def test_patch_new_user(client, tables):

tests/test_api/test_submit_job.py

@@ -1,10 +1,9 @@
 from decimal import Decimal
 from http import HTTPStatus
 
-from test_api.conftest import login, make_job, setup_requests_mock, submit_batch
-
 from dynamo.user import APPLICATION_PENDING
 from dynamo.util import current_utc_time
+from test_api.conftest import login, make_job, setup_requests_mock, submit_batch
 
 
 def test_submit_one_job(client, approved_user):

tests/test_api/test_validation.py

@@ -1,9 +1,9 @@
 import responses
 from pytest import raises
 from shapely.geometry import Polygon
-from test_api.conftest import setup_requests_mock_with_given_polygons
 
 from hyp3_api import CMR_URL, validation
+from test_api.conftest import setup_requests_mock_with_given_polygons
 
 
 def rectangle(north, south, east, west):

tests/test_dynamo/test_jobs.py

@@ -2,9 +2,9 @@
 from decimal import Decimal
 
 import pytest
-from conftest import list_have_same_elements
 
 import dynamo
+from conftest import list_have_same_elements
 from dynamo.exceptions import (
     InsufficientCreditsError,
     InvalidApplicationStatusError,

tests/test_lambda_logging.py

@@ -1,6 +1,5 @@
-import pytest
-
 import lambda_logging
+import pytest
 
 
 def test_log_exceptions():

tests/test_render_cf.py

@@ -1,7 +1,8 @@
 import pytest
-import render_cf
 import yaml
 
+import render_cf
+
 
 def test_parse_map_statement():
     assert render_cf.parse_map_statement('for item in items') == ('item', 'items')

tests/test_set_batch_overrides.py

@@ -3,11 +3,11 @@
 from set_batch_overrides import (
     AUTORIFT_LANDSAT_MEMORY,
     AUTORIFT_S2_MEMORY,
-    INSAR_ISCE_BURST_MEMORY_128G,
+    INSAR_ISCE_BURST_MEMORY_8G,
     INSAR_ISCE_BURST_MEMORY_16G,
     INSAR_ISCE_BURST_MEMORY_32G,
     INSAR_ISCE_BURST_MEMORY_64G,
-    INSAR_ISCE_BURST_MEMORY_8G,
+    INSAR_ISCE_BURST_MEMORY_128G,
     RTC_GAMMA_10M_MEMORY,
     WATER_MAP_10M_MEMORY,
     lambda_handler,