Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFC] Fix make rules path and env var #1

Merged
merged 8 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.services.local.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
PROJECT_NAME = superside
PROJECT_NAME=superside

# Postgres DDBB (all)
POSTGRES_VERSION=14.7
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ The following is the list of supported scopes:
- `cicd`
- `docker`
- `infra`
- `dags`
- `dbt`
- none/empty string: useful for `test` changes that are done across all packages (i.e `test: add the X test`)

#### Description
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ install-poetry: ## Install poetry. Usage: make install-poetry
.PHONY: install-project
install-project: ## Install the project dependencies. Usage: make install-project
$(call log, Installing project dependencies...)
poetry install --no-interaction --all-extras --with dev --sync
poetry install --no-interaction --all-extras --with dev,docs --sync

.PHONY: install-pre-commit
install-pre-commit: ## Install pre-commit and git hooks. Usage: make install-pre-commit
Expand All @@ -81,17 +81,17 @@ format-python: ## Format a Python file. Usage: make format-python path="./dags/m
.PHONY: lint-sql
lint-sql: ## Lint a SQL file. Usage: make lint-sql path="./path/to/my_file.sql"
$(call log, Linting $(path)...)
poetry run sqlfluff lint --config ./.sqlfluff $(path)
poetry run sqlfluff lint --config ./dbt/${PROJECT_NAME}/.sqlfluff $(path)

.PHONY: fix-sql
fix-sql: ## Apply fixes to a SQL file. Usage: make fix-sql path="./path/to/my_file.sql"
$(call log, Fixing $(path)...)
poetry run sqlfluff fix --force --config ./.sqlfluff $(path)
poetry run sqlfluff fix --force --config ./dbt/${PROJECT_NAME}/.sqlfluff $(path)

.PHONY: format-sql
format-sql: ## Format a SQL file. Usage: make format-sql path="./path/to/my_file.sql"
$(call log, Formatting $(path)...)
poetry run sqlfluff format --config ./.sqlfluff $(path)
poetry run sqlfluff format --config ./dbt/${PROJECT_NAME}/.sqlfluff $(path)


##@ Pre-commit hooks
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ tfenv use 1.5.6
There are other optional dependencies:

- [Lens](https://k8slens.dev/) to easily manage the k8s cluster
- [DBeaver](https://dbeaver.io/download/) as a desktop SQL client like
- [DBeaver](https://dbeaver.io/download/) as a desktop SQL client
- The recommended VS Code extensions

## Architecture overview
Expand Down Expand Up @@ -330,7 +330,7 @@ watch -d kubectl get pods \
--field-selector spec.nodeName=$(
kubectl get nodes \
-l component=jobs \
-o jsonpath='{.items[0].metadata.name}'
-o jsonpath='{.items[0].metadata.name}' \
)
```

Expand Down
Loading
Loading