Skip to content

Commit

Permalink
Merge pull request #1299 from camptocamp/pyproject-config-fix
Browse files Browse the repository at this point in the history
Add missing configuration in pyproject.toml
  • Loading branch information
sbrunner authored Jul 11, 2024
2 parents ace056d + 649d8c0 commit 6a5e648
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,25 @@ jobs:
- name: Initialize the acceptance tests
run: make acceptance-init
- run: c2cciutils-docker-logs
if: always()

- name: Fix null values
run: docker compose exec tools psql -c "UPDATE main_2_7.tsearch SET label = 'no-label' WHERE label is NULL;"
- name: Rename schemas
run: |
docker compose exec tools psql -c "ALTER SCHEMA main_2_7 RENAME TO main_2_9;"
docker compose exec tools psql -c "ALTER SCHEMA static_2_7 RENAME TO static_2_9;"
- name: Run Alembic main
run: docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml up alembic-main
- name: Run Alembic static
run: docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml up alembic
- run: c2cciutils-docker-logs

- name: Run the acceptance tests
run: make acceptance
- run: c2cciutils-docker-logs
if: always()

- run: make acceptance-dev
- run: c2cciutils-docker-logs
if: always()

- run:
docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml --file=docker-compose.override.sample.yaml
Expand Down
2 changes: 0 additions & 2 deletions env.acceptance-test
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ PGPORT_SLAVE=5432
PGDATABASE=balanced-woodcock
PGUSER=balanced-woodcock
PGPASSWORD=secret
PGSCHEMA=main_2_7
PGSCHEMA_STATIC=static_2_7

OSM_PGHOST=db
OSM_PGHOST_SLAVE=db
Expand Down
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ target-version = ['py39']
[tool.isort]
profile = "black"
line_length = 110

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

0 comments on commit 6a5e648

Please sign in to comment.