Skip to content

Commit

Permalink
Merge branch 'main' into next-major
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Feb 1, 2025
2 parents 4eb28b8 + acc13af commit e9ed7f3
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/actions/merge-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ inputs:
type: string

python-version:
description: "The version of Python to use, such as 3.11.0"
description: "The version of Python to use, such as 3.11"
required: true
type: string

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/tests/python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ branding:
color: "orange"
inputs:
python-version:
description: "The version of Python to use, such as 3.11.0"
description: "The version of Python to use, such as 3.11"
required: true
type: string

Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
args: ["--ignore-words=codespell.txt"]
Expand All @@ -21,7 +21,7 @@ repos:
hooks:
- id: flake8
- repo: https://github.com/PyCQA/isort
rev: 5.13.2
rev: 6.0.0
hooks:
- id: isort
args: ["--settings-path=pyproject.toml"]
Expand All @@ -33,7 +33,7 @@ repos:
language: script
types: [python]
- repo: https://github.com/PyCQA/bandit
rev: 1.8.0
rev: 1.8.2
hooks:
- id: bandit
args: ["-ll"]
Expand Down Expand Up @@ -61,7 +61,7 @@ repos:
- id: check-merge-conflict
- id: debug-statements
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.19.0
rev: v9.20.0
hooks:
- id: commitlint
stages: [commit-msg]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ terraform apply
- [AWS Command Line Interface](https://aws.amazon.com/cli/)
- [Terraform](https://www.terraform.io/).
_If you're new to Terraform then see [Getting Started With AWS and Terraform](./doc/TERRAFORM.md)_
- [Python 3.11](https://www.python.org/downloads/): for creating virtual environment used for building AWS Lambda Layer, and locally by pre-commit linters and code formatters.
- [Python 3.13](https://www.python.org/downloads/): for creating virtual environment used for building AWS Lambda Layer, and locally by pre-commit linters and code formatters.
- [NodeJS](https://nodejs.org/en/download): used with NPM for local ReactJS developer environment, and for configuring/testing Semantic Release.

## Documentation
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ codespell==2.4.1

# project dependencies
# ------------
setuptools
boto3>=1.35.71
botocore>=1.35.76
python-dotenv==1.0.1
Expand Down
112 changes: 56 additions & 56 deletions terraform/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions terraform/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
###############################################################################
# AWS CLI parameters
###############################################################################
aws_account_id = "012345678901"
aws_account_id = "090511222473"
aws_region = "us-east-1"
# aws_profile = "ADD YOUR PROFILE HERE"
aws_profile = "lawrence"
tags = {
"terraform" = "true",
"project" = "Facial Recognition microservice"
"contact" = "ADD YOUR CONTACT INFORMATION HERE"
"contact" = "Lawrence McDaniel - [email protected]"
"shared_resource_identifier" = "rekognition"
}
shared_resource_identifier = "rekognition"
Expand Down Expand Up @@ -46,8 +46,8 @@ aws_rekognition_face_detect_quality_filter = "AUTO"
###############################################################################
# APIGateway parameters
###############################################################################
aws_apigateway_create_custom_domaim = false
aws_apigateway_root_domain = "example.com"
aws_apigateway_create_custom_domaim = true
aws_apigateway_root_domain = "lawrencemcdaniel.com"
stage = "v1"

# Maximum number of requests that can be made in a given time period.
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ python =
3.9: gitlint,py39,flake8
3.10: gitlint,py310,flake8
3.11: gitlint,py311,flake8,mypy,black,pylint
3.11: gitlint,py312,flake8,mypy,black,pylint

[testenv]
deps = -rrequirements.txt
Expand Down

0 comments on commit e9ed7f3

Please sign in to comment.