diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b97e36e95..f8000b475 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,7 +248,7 @@ test_api: CACHE_URL: "redis://redis:6379/0" before_script: - cd api - - poetry install --all-extras + - make install script: - > poetry run pytest @@ -351,7 +351,7 @@ build_api_schema: API_TYPE: "v1" before_script: - cd api - - poetry install --all-extras + - make install - poetry run funkwhale-manage migrate script: - poetry run funkwhale-manage spectacular --file ../docs/schema.yml diff --git a/.gitpod.yml b/.gitpod.yml index 29f893054..993afaf10 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -14,7 +14,7 @@ tasks: docker-compose up -d poetry env use python - poetry install + make install gp ports await 5432 diff --git a/api/Makefile b/api/Makefile index a31857fad..f946180cc 100644 --- a/api/Makefile +++ b/api/Makefile @@ -4,7 +4,7 @@ CPU_CORES := $(shell N=$$(nproc); echo $$(( $$N > 4 ? 4 : $$N ))) .PHONY: install lint install: - poetry install + poetry install --all-extras lint: poetry run pylint \