From 65cc52a6406a8c210fe442c3848054fe2157c0e3 Mon Sep 17 00:00:00 2001
From: Tim O'Guin <timoguin@proton.me>
Date: Sat, 2 Mar 2024 00:48:47 -0600
Subject: [PATCH] chore (ci): Fix Poetry setup action

---
 .github/workflows/ci.yml          | 12 ++++++------
 Makefile                          |  6 +++---
 aws_data_tools/__init__.py        |  1 +
 aws_data_tools/client/__init__.py |  1 +
 aws_data_tools/models/__init__.py |  1 +
 aws_data_tools/utils/__init__.py  |  1 +
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e623ced..1718c60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.6
+        uses: snok/install-poetry@v1.3.4
         with:
           virtualenvs-create: false
           virtualenvs-in-project: true
@@ -36,7 +36,7 @@ jobs:
         uses: syphar/restore-virtualenv@v1
         id: cache-venv
         with: 
-          requirements_files: poetry.lock
+          requirement_files: poetry.lock
           # need to set this to manually bust the cache
           custom_cache_key_element: v2
 
@@ -46,7 +46,7 @@ jobs:
 
       - name: Install Python dependencies
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: make python-install-deps PY_INSTALL_ARGS="--extras=all"
+        run: make python-install-deps
 
   lint:
     name: Lint
@@ -64,7 +64,7 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.6
+        uses: snok/install-poetry@v1.3.4
         with:
           virtualenvs-create: false
           virtualenvs-in-project: true
@@ -92,7 +92,7 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.6
+        uses: snok/install-poetry@v1.3.4
         with:
           virtualenvs-create: false
           virtualenvs-in-project: true
@@ -120,7 +120,7 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.6
+        uses: snok/install-poetry@v1.3.4
         with:
           virtualenvs-create: false
           virtualenvs-in-project: true
diff --git a/Makefile b/Makefile
index 99e5f09..894feff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DEPS ?=awk docker grep poetry realpath sed
 AWS_OKTA_PROFILE ?=
-PY_INSTALL_ARGS ?=--extras="cli"
+PY_INSTALL_ARGS ?=--extras="all" --with="docs"
 VENV_DIR ?=.venv
 CMD ?=/bin/bash
 DEBUG ?=false
@@ -27,7 +27,7 @@ shell: ${VENV_DIR}
 shellcmd: ${VENV_DIR}
 	@${SHELL_CMD_PREFIX} /bin/bash -c "poetry run ${CMD}"
 
-.PHONY: lint
+.PHONY: lint ## Run code linting
 lint: ${VENV_DIR}
 	@echo "Running the black code formatter"
 	@poetry run black ${ARGS} .
@@ -35,7 +35,7 @@ lint: ${VENV_DIR}
 	# @echo "Running flakehell plugins"
 	# @poetry run flakehell lint aws_data_tools
 
-.PHONY: lint-docs
+.PHONY: lint-docs ## Run docs linting
 lint-docs: ${VENV_DIR}
 	@echo "Running blacken code formatter for Markdown code blocks"
 	@poetry run blacken-docs *.md
diff --git a/aws_data_tools/__init__.py b/aws_data_tools/__init__.py
index 3e19298..c009e7e 100644
--- a/aws_data_tools/__init__.py
+++ b/aws_data_tools/__init__.py
@@ -1,6 +1,7 @@
 """
 A library for working with data from AWS APIs
 """
+
 # flake8: noqa: F401
 
 from . import client, models, utils
diff --git a/aws_data_tools/client/__init__.py b/aws_data_tools/client/__init__.py
index 67f79a1..7552986 100644
--- a/aws_data_tools/client/__init__.py
+++ b/aws_data_tools/client/__init__.py
@@ -1,4 +1,5 @@
 """Package containing classes for interacting with AWS APIs"""
+
 # flake8: noqa: F401
 
 from .client import APIClient
diff --git a/aws_data_tools/models/__init__.py b/aws_data_tools/models/__init__.py
index cddddcc..b37915e 100644
--- a/aws_data_tools/models/__init__.py
+++ b/aws_data_tools/models/__init__.py
@@ -1,6 +1,7 @@
 """
 Package containing dataclass representations of AWS API data
 """
+
 # flake8: noqa: F401
 
 from . import (
diff --git a/aws_data_tools/utils/__init__.py b/aws_data_tools/utils/__init__.py
index 9225ccc..5e06625 100644
--- a/aws_data_tools/utils/__init__.py
+++ b/aws_data_tools/utils/__init__.py
@@ -1,6 +1,7 @@
 """
 Utilities for common operations that happen across different services
 """
+
 # flake8: noqa: F401
 
 from . import dynamodb, tags, validators