diff --git a/pyproject.toml b/pyproject.toml index a7be18650..d771dcd6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -150,6 +150,9 @@ python_version = "3.12" plugins = ["pydantic.mypy"] strict = true +[tool.mypy-ruamel.yaml] +ignore_missing_imports = true + [tool.pytest.ini_options] addopts="--cov-report=term-missing --cov=dipdup --cov-report=xml -n auto -s -v" asyncio_mode = "auto" diff --git a/scripts/demos.py b/scripts/demos.py index f2802500d..e3bc9865f 100644 --- a/scripts/demos.py +++ b/scripts/demos.py @@ -62,7 +62,7 @@ def _init_demo(path: Path) -> None: ) # NOTE: We don't need magic symlinks in demo projects. - Path(package_path).joinpath(package).unlink() + Path(package_path).joinpath(package).unlink(missing_ok=True) def _rm_demo(path: Path) -> None: diff --git a/src/demo_blank/Makefile b/src/demo_blank/Makefile index a61c566b6..3125aaf14 100644 --- a/src/demo_blank/Makefile +++ b/src/demo_blank/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_blank/deploy/compose.sqlite.yaml b/src/demo_blank/deploy/compose.sqlite.yaml index acbe19272..c4506a42e 100644 --- a/src/demo_blank/deploy/compose.sqlite.yaml +++ b/src/demo_blank/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_blank services: diff --git a/src/demo_blank/deploy/compose.swarm.yaml b/src/demo_blank/deploy/compose.swarm.yaml index 8455c8052..e0cd38169 100644 --- a/src/demo_blank/deploy/compose.swarm.yaml +++ b/src/demo_blank/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_blank services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_blank/deploy/compose.yaml b/src/demo_blank/deploy/compose.yaml index b9dfcae6e..79dca295c 100644 --- a/src/demo_blank/deploy/compose.yaml +++ b/src/demo_blank/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_blank services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_blank/pyproject.toml b/src/demo_blank/pyproject.toml index 82df797a8..044436f64 100644 --- a/src/demo_blank/pyproject.toml +++ b/src/demo_blank/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_blank" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_evm_events/Makefile b/src/demo_evm_events/Makefile index 010085850..715c3c407 100644 --- a/src/demo_evm_events/Makefile +++ b/src/demo_evm_events/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_evm_events/deploy/compose.sqlite.yaml b/src/demo_evm_events/deploy/compose.sqlite.yaml index 0fcc631d2..697b0266c 100644 --- a/src/demo_evm_events/deploy/compose.sqlite.yaml +++ b/src/demo_evm_events/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_events services: diff --git a/src/demo_evm_events/deploy/compose.swarm.yaml b/src/demo_evm_events/deploy/compose.swarm.yaml index dae26314b..6c7f0bb2e 100644 --- a/src/demo_evm_events/deploy/compose.swarm.yaml +++ b/src/demo_evm_events/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_events services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_evm_events/deploy/compose.yaml b/src/demo_evm_events/deploy/compose.yaml index 238422777..052d238fb 100644 --- a/src/demo_evm_events/deploy/compose.yaml +++ b/src/demo_evm_events/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_events services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_evm_events/pyproject.toml b/src/demo_evm_events/pyproject.toml index eda2fe6a9..e1c1c4039 100644 --- a/src/demo_evm_events/pyproject.toml +++ b/src/demo_evm_events/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_evm_events" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_evm_transactions/Makefile b/src/demo_evm_transactions/Makefile index 8702d8d72..092eb3a8f 100644 --- a/src/demo_evm_transactions/Makefile +++ b/src/demo_evm_transactions/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_evm_transactions/deploy/compose.sqlite.yaml b/src/demo_evm_transactions/deploy/compose.sqlite.yaml index 6cd82b582..251751cb2 100644 --- a/src/demo_evm_transactions/deploy/compose.sqlite.yaml +++ b/src/demo_evm_transactions/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_transactions services: diff --git a/src/demo_evm_transactions/deploy/compose.swarm.yaml b/src/demo_evm_transactions/deploy/compose.swarm.yaml index bdb67ab79..19341f766 100644 --- a/src/demo_evm_transactions/deploy/compose.swarm.yaml +++ b/src/demo_evm_transactions/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_transactions services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_evm_transactions/deploy/compose.yaml b/src/demo_evm_transactions/deploy/compose.yaml index 27178d8dd..9fca0020f 100644 --- a/src/demo_evm_transactions/deploy/compose.yaml +++ b/src/demo_evm_transactions/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_transactions services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_evm_transactions/pyproject.toml b/src/demo_evm_transactions/pyproject.toml index 037905f3c..72630926f 100644 --- a/src/demo_evm_transactions/pyproject.toml +++ b/src/demo_evm_transactions/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_evm_transactions" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_evm_uniswap/Makefile b/src/demo_evm_uniswap/Makefile index 0abd9cab8..47a23e586 100644 --- a/src/demo_evm_uniswap/Makefile +++ b/src/demo_evm_uniswap/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_evm_uniswap/deploy/compose.sqlite.yaml b/src/demo_evm_uniswap/deploy/compose.sqlite.yaml index 3b9e8fe75..9cae453a1 100644 --- a/src/demo_evm_uniswap/deploy/compose.sqlite.yaml +++ b/src/demo_evm_uniswap/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_uniswap services: diff --git a/src/demo_evm_uniswap/deploy/compose.swarm.yaml b/src/demo_evm_uniswap/deploy/compose.swarm.yaml index 7239bd8c3..d21f4c40e 100644 --- a/src/demo_evm_uniswap/deploy/compose.swarm.yaml +++ b/src/demo_evm_uniswap/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_uniswap services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_evm_uniswap/deploy/compose.yaml b/src/demo_evm_uniswap/deploy/compose.yaml index 5ff082540..8ebd5945a 100644 --- a/src/demo_evm_uniswap/deploy/compose.yaml +++ b/src/demo_evm_uniswap/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_evm_uniswap services: @@ -19,7 +18,7 @@ services: db: image: timescale/timescaledb-ha:pg15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/home/postgres/pgdata/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_evm_uniswap/pyproject.toml b/src/demo_evm_uniswap/pyproject.toml index dc555f298..0ba5de6db 100644 --- a/src/demo_evm_uniswap/pyproject.toml +++ b/src/demo_evm_uniswap/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_evm_uniswap" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_starknet_events/Makefile b/src/demo_starknet_events/Makefile index 4a99f03c5..36be0402a 100644 --- a/src/demo_starknet_events/Makefile +++ b/src/demo_starknet_events/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_starknet_events/deploy/compose.sqlite.yaml b/src/demo_starknet_events/deploy/compose.sqlite.yaml index ed33d4d06..0711af314 100644 --- a/src/demo_starknet_events/deploy/compose.sqlite.yaml +++ b/src/demo_starknet_events/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_starknet_events services: diff --git a/src/demo_starknet_events/deploy/compose.swarm.yaml b/src/demo_starknet_events/deploy/compose.swarm.yaml index 8bc9b5cb6..7124ecbdc 100644 --- a/src/demo_starknet_events/deploy/compose.swarm.yaml +++ b/src/demo_starknet_events/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_starknet_events services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_starknet_events/deploy/compose.yaml b/src/demo_starknet_events/deploy/compose.yaml index 648f0040a..39fbfbaeb 100644 --- a/src/demo_starknet_events/deploy/compose.yaml +++ b/src/demo_starknet_events/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_starknet_events services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_starknet_events/pyproject.toml b/src/demo_starknet_events/pyproject.toml index b00cc8c11..cac11dc4f 100644 --- a/src/demo_starknet_events/pyproject.toml +++ b/src/demo_starknet_events/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_starknet_events" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_auction/Makefile b/src/demo_tezos_auction/Makefile index 24889ed90..225b46de1 100644 --- a/src/demo_tezos_auction/Makefile +++ b/src/demo_tezos_auction/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_auction/deploy/compose.sqlite.yaml b/src/demo_tezos_auction/deploy/compose.sqlite.yaml index 29d2c4320..5f14ef88c 100644 --- a/src/demo_tezos_auction/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_auction/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_auction services: diff --git a/src/demo_tezos_auction/deploy/compose.swarm.yaml b/src/demo_tezos_auction/deploy/compose.swarm.yaml index c2d9046e0..c06aca89f 100644 --- a/src/demo_tezos_auction/deploy/compose.swarm.yaml +++ b/src/demo_tezos_auction/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_auction services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_auction/deploy/compose.yaml b/src/demo_tezos_auction/deploy/compose.yaml index bcc4562c8..b30b59283 100644 --- a/src/demo_tezos_auction/deploy/compose.yaml +++ b/src/demo_tezos_auction/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_auction services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_auction/pyproject.toml b/src/demo_tezos_auction/pyproject.toml index 45914dc1e..5f4c29798 100644 --- a/src/demo_tezos_auction/pyproject.toml +++ b/src/demo_tezos_auction/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_auction" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_big_maps/Makefile b/src/demo_tezos_big_maps/Makefile index 0b7a204da..d0afb9e5e 100644 --- a/src/demo_tezos_big_maps/Makefile +++ b/src/demo_tezos_big_maps/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_big_maps/deploy/compose.sqlite.yaml b/src/demo_tezos_big_maps/deploy/compose.sqlite.yaml index f41c49631..162deba88 100644 --- a/src/demo_tezos_big_maps/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_big_maps/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_big_maps services: diff --git a/src/demo_tezos_big_maps/deploy/compose.swarm.yaml b/src/demo_tezos_big_maps/deploy/compose.swarm.yaml index 0853a14de..4b926dd27 100644 --- a/src/demo_tezos_big_maps/deploy/compose.swarm.yaml +++ b/src/demo_tezos_big_maps/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_big_maps services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_big_maps/deploy/compose.yaml b/src/demo_tezos_big_maps/deploy/compose.yaml index 5fa187f94..f2040aaec 100644 --- a/src/demo_tezos_big_maps/deploy/compose.yaml +++ b/src/demo_tezos_big_maps/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_big_maps services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_big_maps/pyproject.toml b/src/demo_tezos_big_maps/pyproject.toml index bec76581b..20002f4cc 100644 --- a/src/demo_tezos_big_maps/pyproject.toml +++ b/src/demo_tezos_big_maps/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_big_maps" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_dao/Makefile b/src/demo_tezos_dao/Makefile index b2cac6949..91437d585 100644 --- a/src/demo_tezos_dao/Makefile +++ b/src/demo_tezos_dao/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_dao/deploy/compose.sqlite.yaml b/src/demo_tezos_dao/deploy/compose.sqlite.yaml index 1167e7da5..5eef6451c 100644 --- a/src/demo_tezos_dao/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_dao/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dao services: diff --git a/src/demo_tezos_dao/deploy/compose.swarm.yaml b/src/demo_tezos_dao/deploy/compose.swarm.yaml index 427064d1e..3a76b5a43 100644 --- a/src/demo_tezos_dao/deploy/compose.swarm.yaml +++ b/src/demo_tezos_dao/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dao services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_dao/deploy/compose.yaml b/src/demo_tezos_dao/deploy/compose.yaml index d6ee7270f..652603da7 100644 --- a/src/demo_tezos_dao/deploy/compose.yaml +++ b/src/demo_tezos_dao/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dao services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_dao/pyproject.toml b/src/demo_tezos_dao/pyproject.toml index b6695c76b..a39cf8c1b 100644 --- a/src/demo_tezos_dao/pyproject.toml +++ b/src/demo_tezos_dao/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_dao" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_dex/Makefile b/src/demo_tezos_dex/Makefile index a1880393c..ea08d0868 100644 --- a/src/demo_tezos_dex/Makefile +++ b/src/demo_tezos_dex/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_dex/deploy/compose.sqlite.yaml b/src/demo_tezos_dex/deploy/compose.sqlite.yaml index 976b690ad..45de223bd 100644 --- a/src/demo_tezos_dex/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_dex/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dex services: diff --git a/src/demo_tezos_dex/deploy/compose.swarm.yaml b/src/demo_tezos_dex/deploy/compose.swarm.yaml index 416161492..47eaa0a1c 100644 --- a/src/demo_tezos_dex/deploy/compose.swarm.yaml +++ b/src/demo_tezos_dex/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dex services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_dex/deploy/compose.yaml b/src/demo_tezos_dex/deploy/compose.yaml index 6dd154485..b4a00d91d 100644 --- a/src/demo_tezos_dex/deploy/compose.yaml +++ b/src/demo_tezos_dex/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_dex services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_dex/pyproject.toml b/src/demo_tezos_dex/pyproject.toml index 45535827a..aa1c646b7 100644 --- a/src/demo_tezos_dex/pyproject.toml +++ b/src/demo_tezos_dex/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_dex" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_domains/Makefile b/src/demo_tezos_domains/Makefile index 035f7d7b2..a9fc034bd 100644 --- a/src/demo_tezos_domains/Makefile +++ b/src/demo_tezos_domains/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_domains/deploy/compose.sqlite.yaml b/src/demo_tezos_domains/deploy/compose.sqlite.yaml index 1df796b73..22519d470 100644 --- a/src/demo_tezos_domains/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_domains/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_domains services: diff --git a/src/demo_tezos_domains/deploy/compose.swarm.yaml b/src/demo_tezos_domains/deploy/compose.swarm.yaml index 5204005bc..b6736b333 100644 --- a/src/demo_tezos_domains/deploy/compose.swarm.yaml +++ b/src/demo_tezos_domains/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_domains services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_domains/deploy/compose.yaml b/src/demo_tezos_domains/deploy/compose.yaml index d676bbf0c..af3c3acb9 100644 --- a/src/demo_tezos_domains/deploy/compose.yaml +++ b/src/demo_tezos_domains/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_domains services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_domains/pyproject.toml b/src/demo_tezos_domains/pyproject.toml index de41092bc..f6b53c560 100644 --- a/src/demo_tezos_domains/pyproject.toml +++ b/src/demo_tezos_domains/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_domains" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_events/Makefile b/src/demo_tezos_events/Makefile index 55d8f30a6..8af63b565 100644 --- a/src/demo_tezos_events/Makefile +++ b/src/demo_tezos_events/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_events/deploy/compose.sqlite.yaml b/src/demo_tezos_events/deploy/compose.sqlite.yaml index 5b79fca0f..2b176fb69 100644 --- a/src/demo_tezos_events/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_events/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_events services: diff --git a/src/demo_tezos_events/deploy/compose.swarm.yaml b/src/demo_tezos_events/deploy/compose.swarm.yaml index 18f4bcdcc..ff62744b3 100644 --- a/src/demo_tezos_events/deploy/compose.swarm.yaml +++ b/src/demo_tezos_events/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_events services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_events/deploy/compose.yaml b/src/demo_tezos_events/deploy/compose.yaml index e06291403..65785803a 100644 --- a/src/demo_tezos_events/deploy/compose.yaml +++ b/src/demo_tezos_events/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_events services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_events/pyproject.toml b/src/demo_tezos_events/pyproject.toml index 01f1f7065..68e8c47c5 100644 --- a/src/demo_tezos_events/pyproject.toml +++ b/src/demo_tezos_events/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_events" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_factories/Makefile b/src/demo_tezos_factories/Makefile index 0a9eaed32..a3e01c1f8 100644 --- a/src/demo_tezos_factories/Makefile +++ b/src/demo_tezos_factories/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_factories/deploy/compose.sqlite.yaml b/src/demo_tezos_factories/deploy/compose.sqlite.yaml index 7e2293586..2be1d6d2c 100644 --- a/src/demo_tezos_factories/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_factories/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_factories services: diff --git a/src/demo_tezos_factories/deploy/compose.swarm.yaml b/src/demo_tezos_factories/deploy/compose.swarm.yaml index 603c2c672..83065d1d6 100644 --- a/src/demo_tezos_factories/deploy/compose.swarm.yaml +++ b/src/demo_tezos_factories/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_factories services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_factories/deploy/compose.yaml b/src/demo_tezos_factories/deploy/compose.yaml index d4fdfedf7..697bc6ec7 100644 --- a/src/demo_tezos_factories/deploy/compose.yaml +++ b/src/demo_tezos_factories/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_factories services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_factories/pyproject.toml b/src/demo_tezos_factories/pyproject.toml index f02665e08..3344caf30 100644 --- a/src/demo_tezos_factories/pyproject.toml +++ b/src/demo_tezos_factories/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_factories" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_head/Makefile b/src/demo_tezos_head/Makefile index 5da90fe7a..81838ec03 100644 --- a/src/demo_tezos_head/Makefile +++ b/src/demo_tezos_head/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_head/deploy/compose.sqlite.yaml b/src/demo_tezos_head/deploy/compose.sqlite.yaml index 13d1949e5..c25c253ba 100644 --- a/src/demo_tezos_head/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_head/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_head services: diff --git a/src/demo_tezos_head/deploy/compose.swarm.yaml b/src/demo_tezos_head/deploy/compose.swarm.yaml index 0566f5d9c..7e03e70ef 100644 --- a/src/demo_tezos_head/deploy/compose.swarm.yaml +++ b/src/demo_tezos_head/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_head services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_head/deploy/compose.yaml b/src/demo_tezos_head/deploy/compose.yaml index fc6595cad..b5aec04c6 100644 --- a/src/demo_tezos_head/deploy/compose.yaml +++ b/src/demo_tezos_head/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_head services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_head/pyproject.toml b/src/demo_tezos_head/pyproject.toml index 6bc2acfa1..d638a254a 100644 --- a/src/demo_tezos_head/pyproject.toml +++ b/src/demo_tezos_head/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_head" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_nft_marketplace/Makefile b/src/demo_tezos_nft_marketplace/Makefile index 26f580fb4..99ffe533f 100644 --- a/src/demo_tezos_nft_marketplace/Makefile +++ b/src/demo_tezos_nft_marketplace/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_nft_marketplace/deploy/compose.sqlite.yaml b/src/demo_tezos_nft_marketplace/deploy/compose.sqlite.yaml index 0e77ebcfb..df0fabd22 100644 --- a/src/demo_tezos_nft_marketplace/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_nft_marketplace/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_nft_marketplace services: diff --git a/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml b/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml index 02888c062..201222372 100644 --- a/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml +++ b/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_nft_marketplace services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_nft_marketplace/deploy/compose.yaml b/src/demo_tezos_nft_marketplace/deploy/compose.yaml index 424b3b42d..35549df16 100644 --- a/src/demo_tezos_nft_marketplace/deploy/compose.yaml +++ b/src/demo_tezos_nft_marketplace/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_nft_marketplace services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_nft_marketplace/pyproject.toml b/src/demo_tezos_nft_marketplace/pyproject.toml index 2ea5a0354..a454ebfa0 100644 --- a/src/demo_tezos_nft_marketplace/pyproject.toml +++ b/src/demo_tezos_nft_marketplace/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_nft_marketplace" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_raw/Makefile b/src/demo_tezos_raw/Makefile index 08eddc4dd..ae4a0644d 100644 --- a/src/demo_tezos_raw/Makefile +++ b/src/demo_tezos_raw/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_raw/deploy/compose.sqlite.yaml b/src/demo_tezos_raw/deploy/compose.sqlite.yaml index 31fcdfdf5..087a2f4b1 100644 --- a/src/demo_tezos_raw/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_raw/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_raw services: diff --git a/src/demo_tezos_raw/deploy/compose.swarm.yaml b/src/demo_tezos_raw/deploy/compose.swarm.yaml index 796079517..bf7b3a812 100644 --- a/src/demo_tezos_raw/deploy/compose.swarm.yaml +++ b/src/demo_tezos_raw/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_raw services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_raw/deploy/compose.yaml b/src/demo_tezos_raw/deploy/compose.yaml index b84178109..94d2db108 100644 --- a/src/demo_tezos_raw/deploy/compose.yaml +++ b/src/demo_tezos_raw/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_raw services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_raw/pyproject.toml b/src/demo_tezos_raw/pyproject.toml index 64be7002d..49db3bce4 100644 --- a/src/demo_tezos_raw/pyproject.toml +++ b/src/demo_tezos_raw/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_raw" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_token/Makefile b/src/demo_tezos_token/Makefile index 39a5639da..cbe1e5d65 100644 --- a/src/demo_tezos_token/Makefile +++ b/src/demo_tezos_token/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_token/deploy/compose.sqlite.yaml b/src/demo_tezos_token/deploy/compose.sqlite.yaml index 039321ead..2e9dad75a 100644 --- a/src/demo_tezos_token/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_token/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token services: diff --git a/src/demo_tezos_token/deploy/compose.swarm.yaml b/src/demo_tezos_token/deploy/compose.swarm.yaml index 85cd2f533..ea0522b6b 100644 --- a/src/demo_tezos_token/deploy/compose.swarm.yaml +++ b/src/demo_tezos_token/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_token/deploy/compose.yaml b/src/demo_tezos_token/deploy/compose.yaml index 856e0d784..7adbabb7e 100644 --- a/src/demo_tezos_token/deploy/compose.yaml +++ b/src/demo_tezos_token/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_token/pyproject.toml b/src/demo_tezos_token/pyproject.toml index 3aa4a39f7..a0335127d 100644 --- a/src/demo_tezos_token/pyproject.toml +++ b/src/demo_tezos_token/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_token" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_token_balances/Makefile b/src/demo_tezos_token_balances/Makefile index ecdbca7cc..fdff18d25 100644 --- a/src/demo_tezos_token_balances/Makefile +++ b/src/demo_tezos_token_balances/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_token_balances/deploy/compose.sqlite.yaml b/src/demo_tezos_token_balances/deploy/compose.sqlite.yaml index 52ebc9d62..7b635d9bc 100644 --- a/src/demo_tezos_token_balances/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_token_balances/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_balances services: diff --git a/src/demo_tezos_token_balances/deploy/compose.swarm.yaml b/src/demo_tezos_token_balances/deploy/compose.swarm.yaml index 45588b09f..e6649b5a9 100644 --- a/src/demo_tezos_token_balances/deploy/compose.swarm.yaml +++ b/src/demo_tezos_token_balances/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_balances services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_token_balances/deploy/compose.yaml b/src/demo_tezos_token_balances/deploy/compose.yaml index e7c8d4bfc..2a62024b5 100644 --- a/src/demo_tezos_token_balances/deploy/compose.yaml +++ b/src/demo_tezos_token_balances/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_balances services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_token_balances/pyproject.toml b/src/demo_tezos_token_balances/pyproject.toml index d483051e9..81eaa14f2 100644 --- a/src/demo_tezos_token_balances/pyproject.toml +++ b/src/demo_tezos_token_balances/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_token_balances" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/demo_tezos_token_transfers/Makefile b/src/demo_tezos_token_transfers/Makefile index 6a8d8efa1..b492a6bf8 100644 --- a/src/demo_tezos_token_transfers/Makefile +++ b/src/demo_tezos_token_transfers/Makefile @@ -13,6 +13,15 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies + pdm install + +update: ## Update dependencies + pdm update + dipdup self update -q + format: ## Format with all tools make black @@ -28,7 +37,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/demo_tezos_token_transfers/deploy/compose.sqlite.yaml b/src/demo_tezos_token_transfers/deploy/compose.sqlite.yaml index bf0d2c553..9f6ac570a 100644 --- a/src/demo_tezos_token_transfers/deploy/compose.sqlite.yaml +++ b/src/demo_tezos_token_transfers/deploy/compose.sqlite.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_transfers services: diff --git a/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml b/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml index 007ab4215..3daef952e 100644 --- a/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml +++ b/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_transfers services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/demo_tezos_token_transfers/deploy/compose.yaml b/src/demo_tezos_token_transfers/deploy/compose.yaml index e993cdf94..653a56cae 100644 --- a/src/demo_tezos_token_transfers/deploy/compose.yaml +++ b/src/demo_tezos_token_transfers/deploy/compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" name: demo_tezos_token_transfers services: @@ -19,7 +18,7 @@ services: db: image: postgres:15 ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:/var/lib/postgresql/data restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: hasura/graphql-engine:latest ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/demo_tezos_token_transfers/pyproject.toml b/src/demo_tezos_token_transfers/pyproject.toml index 661c01cc6..033472526 100644 --- a/src/demo_tezos_token_transfers/pyproject.toml +++ b/src/demo_tezos_token_transfers/pyproject.toml @@ -20,18 +20,6 @@ dev = [ "mypy", ] -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} - [tool.black] line-length = 120 target-version = ['py312'] @@ -50,6 +38,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "demo_tezos_token_transfers" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true [build-system] requires = ["pdm-backend"] diff --git a/src/dipdup/codegen/__init__.py b/src/dipdup/codegen/__init__.py index f1a9cbac9..b4c8b220c 100644 --- a/src/dipdup/codegen/__init__.py +++ b/src/dipdup/codegen/__init__.py @@ -252,7 +252,7 @@ async def _generate_models(self) -> None: def _cleanup_schemas(self) -> None: rmtree(self._package.schemas) - self._package.schemas.mkdir() + self._package.schemas.mkdir(parents=True, exist_ok=True) class CommonCodeGenerator(_BaseCodeGenerator): diff --git a/src/dipdup/config/__init__.py b/src/dipdup/config/__init__.py index 64bd63164..5f715e3ec 100644 --- a/src/dipdup/config/__init__.py +++ b/src/dipdup/config/__init__.py @@ -928,7 +928,7 @@ def _resolve_template(self, template_config: IndexTemplateConfig) -> None: if missing_value := re.search(r'<*>', raw_template): raise ConfigurationError( - f'`{template_config.name}` index config is missing required template value `{missing_value}`' + f'`{template_config.name}` index config is missing required template value `{missing_value.group()}`' ) json_template = orjson.loads(raw_template) diff --git a/src/dipdup/projects/base/Makefile.j2 b/src/dipdup/projects/base/Makefile.j2 index 3c785f986..acb7e5f84 100644 --- a/src/dipdup/projects/base/Makefile.j2 +++ b/src/dipdup/projects/base/Makefile.j2 @@ -13,6 +13,28 @@ help: ## Show this help (default) all: ## Run an entire CI pipeline make format lint +## + +install: ## Install dependencies +{%- if project.package_manager == 'none' %} + true +{%- elif project.package_manager == 'pdm' %} + pdm install +{%- elif project.package_manager == 'poetry' %} + poetry install +{% endif %} + +update: ## Update dependencies +{%- if project.package_manager == 'none' %} + true +{%- elif project.package_manager == 'pdm' %} + pdm update + dipdup self update -q +{%- elif project.package_manager == 'poetry' %} + poetry update + dipdup self update -q +{% endif %} + format: ## Format with all tools make black @@ -28,7 +50,7 @@ ruff: ## Lint with ruff ruff check --fix . mypy: ## Lint with mypy - mypy --no-incremental --exclude ${PACKAGE} . + mypy . ## diff --git a/src/dipdup/projects/base/deploy/compose.sqlite.yaml.j2 b/src/dipdup/projects/base/deploy/compose.sqlite.yaml.j2 index 7fb4e4d3c..8be07744f 100644 --- a/src/dipdup/projects/base/deploy/compose.sqlite.yaml.j2 +++ b/src/dipdup/projects/base/deploy/compose.sqlite.yaml.j2 @@ -1,4 +1,3 @@ -version: "3.8" name: {{ project.package }} services: diff --git a/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2 b/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2 index f2c986a54..db2d2ad59 100644 --- a/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2 +++ b/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2 @@ -1,4 +1,3 @@ -version: "3.8" name: {{ project.package }} services: @@ -38,7 +37,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/src/dipdup/projects/base/deploy/compose.yaml.j2 b/src/dipdup/projects/base/deploy/compose.yaml.j2 index 76f6b63c5..57b1500a2 100644 --- a/src/dipdup/projects/base/deploy/compose.yaml.j2 +++ b/src/dipdup/projects/base/deploy/compose.yaml.j2 @@ -1,4 +1,3 @@ -version: "3.8" name: {{ project.package }} services: @@ -19,7 +18,7 @@ services: db: image: {{ project.postgres_image }} ports: - - 5432 + - "${POSTGRES_HOST_PORT:-5432}:5432" volumes: - db:{{ project.postgres_data_path }} restart: always @@ -29,7 +28,7 @@ services: - POSTGRES_DB=dipdup - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} healthcheck: - test: ["CMD-SHELL", "pg_isready -U dipdup"] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -37,7 +36,7 @@ services: hasura: image: {{ project.hasura_image }} ports: - - 8080 + - "${HASURA_HOST_PORT:-8080}:8080" depends_on: - db restart: always diff --git a/src/dipdup/projects/base/pyproject.toml.j2 b/src/dipdup/projects/base/pyproject.toml.j2 index 42f4dd76a..de2d7f496 100644 --- a/src/dipdup/projects/base/pyproject.toml.j2 +++ b/src/dipdup/projects/base/pyproject.toml.j2 @@ -34,18 +34,6 @@ dev = [ "ruff", "mypy", ] - -[tool.pdm.scripts] -help = {cmd = "make help", help = "Show this help (default)"} -all = {cmd = "make all", help = "Run an entire CI pipeline"} -format = {cmd = "make format", help = "Format with all tools"} -lint = {cmd = "make lint", help = "Lint with all tools"} -black = {cmd = "make black", help = "Format with black"} -ruff = {cmd = "make ruff", help = "Lint with ruff"} -mypy = {cmd = "make mypy", help = "Lint with mypy"} -image = {cmd = "make image", help = "Build Docker image"} -up = {cmd = "make up", help = "Start Compose stack"} -down = {cmd = "make down", help = "Stop Compose stack"} {% elif project.package_manager == 'poetry' %} [tool.poetry] name = "{{ project.package }}" @@ -84,6 +72,10 @@ isort = { force-single-line = true} python_version = "3.12" plugins = ["pydantic.mypy"] strict = false +exclude = "{{ project.package }}" + +[tool.mypy-ruamel.yaml] +ignore-missing-imports = true {% if project.package_manager == 'pdm' -%} [build-system]