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.

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

Bump version 7.3.1 #929

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].

## [7.3.1] - 2024-01-29

### Fixed

- codegen: Always cleanup jsonschemas before generating types.
- config: Make `ws_url` field optional for `evm.node` datasource.

## [7.3.0] - 2024-01-23

### Added
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ before_release: ## Prepare for a new release after updating version in pyproject
make demos
make test
make docs_build
echo "🎉 Commit changes, merge `aux/X.Y.Z`, run 'git checkout next && git pull && git tag X.Y.Z && git push origin X.Y.Z'"
echo "🎉 Commit changes, merge aux/X.Y.Z branch, tag release on next"
##
56 changes: 28 additions & 28 deletions pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "dipdup"
description = "Modular framework for creating selective indexers and featureful backends for dapps"
version = "7.3.0"
version = "7.3.1"
license = { text = "MIT" }
authors = [
{ name = "Lev Gorodetskii", email = "[email protected]" },
Expand Down
6 changes: 3 additions & 3 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is @generated by PDM.
# Please do not edit it manually.

aiohttp==3.9.1
aiohttp==3.9.2
aiolimiter==1.1.0
aiosignal==1.3.1
aiosqlite==0.17.0
Expand All @@ -16,7 +16,7 @@ asyncpg==0.29.0
attrs==23.2.0
babel==2.14.0
bitarray==2.9.2
black==24.1.0
black==24.1.1
certifi==2023.11.17
charset-normalizer==3.3.2
click==8.1.7
Expand Down Expand Up @@ -75,7 +75,7 @@ pypika-tortoise==0.1.6
pysignalr==0.2.0
pytest==7.4.4
pytest-aiohttp==1.0.5
pytest-asyncio==0.23.3
pytest-asyncio==0.23.4
pytest-cov==4.1.0
pytest-xdist==3.5.0
python-dotenv==1.0.1
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is @generated by PDM.
# Please do not edit it manually.

aiohttp==3.9.1
aiohttp==3.9.2
aiolimiter==1.1.0
aiosignal==1.3.1
aiosqlite==0.17.0
Expand All @@ -14,7 +14,7 @@ asyncclick==8.1.7.1
asyncpg==0.29.0
attrs==23.2.0
bitarray==2.9.2
black==24.1.0
black==24.1.1
certifi==2023.11.17
charset-normalizer==3.3.2
click==8.1.7
Expand Down
2 changes: 1 addition & 1 deletion src/demo_auction/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_auction"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_big_maps/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_big_maps"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_blank/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_blank"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_dao/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_dao"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_dex/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_dex"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_domains/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_domains"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_etherlink/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_etherlink"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_events/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_events"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_evm_events/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_evm_events"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_factories/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_factories"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_head/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_head"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_nft_marketplace/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_nft_marketplace"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_raw/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_raw"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_token/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_token"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_token_balances/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_token_balances"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_token_transfers/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_token_transfers"
version = "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/demo_uniswap/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by DipDup 7.3.0+editable
# Generated by DipDup 7.3.1+editable
[project]
name = "demo_uniswap"
version = "0.0.1"
Expand Down
4 changes: 2 additions & 2 deletions src/dipdup/codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ async def init(
force = any(str(path).startswith('types') for path in self._include)

await self.generate_abi()
await self.generate_schemas(force)
await self.generate_schemas()
await self._generate_types(force)

await self._generate_models()
Expand All @@ -74,7 +74,7 @@ async def init(
async def generate_abi(self) -> None: ...

@abstractmethod
async def generate_schemas(self, force: bool = False) -> None: ...
async def generate_schemas(self) -> None: ...

@abstractmethod
async def generate_hooks(self) -> None: ...
Expand Down
5 changes: 2 additions & 3 deletions src/dipdup/codegen/evm_subsquid.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,8 @@ async def generate_abi(self) -> None:
if isinstance(index_config, SubsquidEventsIndexConfig):
await self._fetch_abi(index_config)

async def generate_schemas(self, force: bool = False) -> None:
if force:
self._cleanup_schemas()
async def generate_schemas(self) -> None:
self._cleanup_schemas()

events: set[str] = set()
functions: set[str] = set()
Expand Down
7 changes: 3 additions & 4 deletions src/dipdup/codegen/tezos_tzkt.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,17 @@ def __init__(
async def generate_abi(self) -> None:
pass

async def generate_schemas(self, force: bool = False) -> None:
async def generate_schemas(self) -> None:
"""Fetch JSONSchemas for all contracts used in config"""
self._cleanup_schemas()

self._logger.info('Fetching contract schemas')
await late_tzkt_initialization(
config=self._config,
datasources=self._datasources,
reindex_fn=None,
)

if force:
self._cleanup_schemas()

unused_operation_templates = [
t for t in self._config.templates.values() if isinstance(t, TzktOperationsIndexConfig)
]
Expand Down
Loading