diff --git a/Makefile b/Makefile index 230252b..b621f32 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ venv: .PHONY: upgrade-pip ## Upgrades pip. upgrade-pip: - python -m pip install -U pip + python -m pip install pip==25.2 .PHONY: install-test ## Install and only test dependencies. install-test: upgrade-pip diff --git a/docker-compose.yml b/docker-compose.yml index fe26248..44b0ec6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,26 +1,29 @@ services: gcloud: image: google/cloud-sdk:latest + platform: linux/amd64 volumes: - - "gcp:/root/.config/" + - 'gcp:/root/.config/' entrypoint: gcloud dev: build: context: . target: dev + platform: linux/amd64 volumes: - - ".:/opt/project" - - "gcp:/root/.config/" + - '.:/opt/project' + - 'gcp:/root/.config/' entrypoint: /bin/bash test: + platform: linux/amd64 # Runs tests using the production Docker image. # Intended to be executed in the GitHub CI environment. build: context: . target: test - entrypoint: "pytest -v" + entrypoint: 'pytest -v' volumes: gcp: external: true diff --git a/pyproject.toml b/pyproject.toml index c9cb008..754ae4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ requires-python = ">= 3.9" dependencies = [ "pyyaml~=6.0", - "rich~=13.9", + "rich~=14.0", "rich-argparse~=1.6", ] @@ -63,7 +63,7 @@ lint = [ # Development workflow and tools dev = [ "pre-commit~=4.2", # Framework for managing pre-commit hooks. - "pip-tools~=7.0", # Freezing dependencies for production containers. + "pip-tools>=7.4,<8.0", # Compatible with pip 24+, fixes use_pep517 AttributeError. "pip-audit~=2.8", # Audit for finding vulnerabilities in dependencies. ] diff --git a/requirements.txt b/requirements.txt index c8542a3..240e028 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,17 +4,17 @@ # # pip-compile --output-file=requirements.txt # -markdown-it-py==3.0.0 +markdown-it-py==4.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -pygments==2.19.1 +pygments==2.19.2 # via rich -pyyaml==6.0.2 +pyyaml==6.0.3 # via python-app-template (setup.py) -rich==13.9.4 +rich==14.2.0 # via # python-app-template (setup.py) # rich-argparse -rich-argparse==1.7.0 +rich-argparse==1.7.2 # via python-app-template (setup.py) diff --git a/src/python_app_template/cli/main.py b/src/python_app_template/cli/main.py index 3699030..4d8be48 100644 --- a/src/python_app_template/cli/main.py +++ b/src/python_app_template/cli/main.py @@ -1,7 +1,7 @@ import sys import logging -from .version import __version__ +from ..version import __version__ logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py new file mode 100644 index 0000000..706d917 --- /dev/null +++ b/tests/cli/test_main.py @@ -0,0 +1,5 @@ +from python_app_template.cli.main import main + + +def test_main(): + main()