Skip to content

Commit

Permalink
chore (ci): Fix Poetry setup action
Browse files Browse the repository at this point in the history
  • Loading branch information
timoguin committed Mar 2, 2024
1 parent 2f06669 commit 65cc52a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -27,15 +27,15 @@ 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} .
# flakehell currently disabled, see .pre-commit-config.yaml notesk
# @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
Expand Down
1 change: 1 addition & 0 deletions aws_data_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
A library for working with data from AWS APIs
"""

# flake8: noqa: F401

from . import client, models, utils
Expand Down
1 change: 1 addition & 0 deletions aws_data_tools/client/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Package containing classes for interacting with AWS APIs"""

# flake8: noqa: F401

from .client import APIClient
1 change: 1 addition & 0 deletions aws_data_tools/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Package containing dataclass representations of AWS API data
"""

# flake8: noqa: F401

from . import (
Expand Down
1 change: 1 addition & 0 deletions aws_data_tools/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Utilities for common operations that happen across different services
"""

# flake8: noqa: F401

from . import dynamodb, tags, validators

0 comments on commit 65cc52a

Please sign in to comment.