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.

Sign up for GitHub

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

Add missing configuration in pyproject.toml #1301

Merged
merged 3 commits into from
Jul 11, 2024
Merged

Add missing configuration in pyproject.toml #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fc58dd
Add missing configuration in pyproject.toml
sbrunner Jul 11, 2024
72ef03b
Fix docker-compose replacement
sbrunner Jul 11, 2024
e8ad608
Add sleep in acceptance-dev
sbrunner Jul 11, 2024
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
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,18 @@ acceptance-init:
docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS postgis'
docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS pg_trgm'
docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS hstore'
scripts/db-restore --docker compose-file=docker-compose.yaml --docker compose-file=docker-compose-db.yaml \
scripts/db-restore --docker-compose-file=docker-compose.yaml --docker-compose-file=docker-compose-db.yaml \
--arg=--clean --arg=--if-exists --arg=--verbose data/prod-2-7.dump
docker compose restart geoportal alembic
docker compose exec -T geoportal wait-db

.PHONY: acceptance
acceptance:
docker compose exec -T tools pytest tests/
ci/docker compose-check
ci/docker-compose-check

acceptance-dev:
docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml --file=docker-compose.override.sample.yaml up -d
sleep 2
docker compose exec -T tools pytest tests/
ci/docker compose-check
ci/docker-compose-check
6 changes: 6 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[tool.black]
line-length = 110
target-version = ['py38']

[tool.poetry]
name = "demo_geomapfish"
version = "0.0.0"
description = "Demo of GeoMapFish Application"
authors = ["Camptocamp <[email protected]>"]
Loading