Skip to content

Commit

Permalink
fix: dont install pdm again after bootstrapping; fix import bug
Browse files Browse the repository at this point in the history
  • Loading branch information
MultifokalHirn committed Nov 13, 2023
1 parent b8f4f16 commit a03bb33
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 17 deletions.
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Check http://editorconfig.org for more information

root = true

[*]
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
indent_style = space
insert_final_newline = true
indent_size = 2

[*.py]
indent_size = 4

[*.pyi]
indent_size = 4

[Makefile]
indent_style = tab
4 changes: 2 additions & 2 deletions .github/workflows/python-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
name: Run Checks on Code

on:
# push:
# branches: [ "main" ]
push:
branches: ["main"]
pull_request:
branches: ["main"]
workflow_dispatch:
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@ install-pdm: venv
$(VENV)/pdm use --venv in-project
.PHONY: install-pdm

bootstrap: clean-venv venv install-pdm dev ## fresh install of venv and dependencies
bootstrap: clean-venv venv install-pdm ## fresh install of venv and dependencies
.PHONY: bootstrap



prod: install-pdm ## install prod dependencies
prod: ## install prod dependencies
$(VENV)/pdm sync --fail-fast --prod
.PHONY: dev

dev: install-pdm ## install dev dependencies
dev: ## install dev dependencies
$(VENV)/pdm sync --fail-fast --dev
.PHONY: dev

Expand Down Expand Up @@ -83,8 +81,10 @@ define find.functions
@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
endef

help: ## Show this help.
@ grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
help: ## Shows the available commands and their descriptions
@echo "Usage: make [target]"
@echo ""
@awk -F ':.*?## ' '/^[a-zA-Z0-9_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
.PHONY: help

include Makefile.venv
6 changes: 3 additions & 3 deletions src/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""project version."""
"""project version"""

__version__ = "0.0.1"
__full_version__ = (0, 0, 1)
__version__ = "0.0.0"
__full_version__ = (0, 0, 0)
6 changes: 1 addition & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
"""Common PyTest setup."""
# pylint: disable=missing-function-docstring

import json
import logging
from collections.abc import Iterator
from io import StringIO
from typing import Any, Dict, List
from typing import Any, Dict, Iterator, List

import pytest

Expand Down

0 comments on commit a03bb33

Please sign in to comment.