Skip to content

Commit 9aa3c19

Browse files
6.3 release preparations (#534)
1 parent ad4d26d commit 9aa3c19

File tree

193 files changed

+492
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+492
-454
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Build
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches:

.github/workflows/docs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Docs
2-
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
35
on:
46
push:
57
tags:

.github/workflows/installer.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Installer
2-
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
35
on:
46
push:
57
paths:

.github/workflows/release.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
type=pep440,pattern={{major}}.{{minor}}-slim
6464
6565
- name: Set up Python
66-
uses: actions/setup-python@v2
66+
uses: actions/setup-python@v4
6767
with:
68-
python-version: '3.10.x'
68+
python-version: '3.10'
6969

7070
- name: Set up Poetry
7171
uses: snok/install-poetry@v1
@@ -135,3 +135,11 @@ jobs:
135135
${{ steps.changelog.outputs.changes }}
136136
draft: true
137137
prerelease: ${{ steps.changelog.outputs.status == 'prereleased' }}
138+
139+
- name: Create Sentry release
140+
uses: getsentry/action-release@v1
141+
env:
142+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
143+
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
144+
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
145+
SENTRY_URL: ${{ secrets.SENTRY_URL }}

.github/workflows/test.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Test
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25
on:
36
push:
47
paths:
@@ -17,10 +20,10 @@ jobs:
1720
include:
1821
- os: ubuntu-latest
1922
arch: amd64
20-
- os: macos-latest
21-
arch: amd64
2223
- os: ubuntu-latest
2324
arch: arm64
25+
# - os: macos-latest
26+
# arch: amd64
2427
- os: macos-latest
2528
arch: arm64
2629
steps:
@@ -36,14 +39,6 @@ jobs:
3639
python-version: '3.10'
3740
cache: 'poetry'
3841

39-
- name: Set up cache (replays)
40-
uses: actions/cache@v3
41-
id: cache-replays
42-
with:
43-
path: ~/.cache/dipdup/replays
44-
key: dipdup-replays-${{ matrix.os }}-${{ matrix.arch }}
45-
restore-keys: dipdup-replays-${{ matrix.os }}-${{ matrix.arch }}
46-
4742
- name: Install project
4843
run: make install
4944
- name: Run lint

CHANGELOG.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,27 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
99
### Added
1010

1111
- context: Added `execute_sql_query` method to run queries from `sql` project directory.
12-
- context: `execute_sql` method now accepts arbitrary arguments to format SQL script (unsafe, use with caution)
12+
- context: `execute_sql` method now accepts arbitrary arguments to format SQL script (unsafe, use with caution).
1313
- index: New index kind `operation_unfiltered`.
1414
- index: New filters for `token_transfer` index.
1515

1616
### Fixed
1717

18-
- codegen: Better PEP 8 compatibility of generated callbacks.
1918
- cli: Fixed missing log messages from `ctx.logger`.
20-
- cli: Configure package logger in addition to `dipdup` one.
21-
- context: Fixed `execute_sql` method crashes when the path is a file.
19+
- codegen: Better PEP 8 compatibility of generated callbacks.
20+
- context: Fixed SQL scripts executed in the wrong order.
21+
- context: Fixed `execute_sql` method crashes when the path is not a directory.
22+
- database: Fixed crash with `CannotConnectNowError` before establishing the database connection.
2223
- database: Fixed crash when using F expressions inside versioned transactions.
23-
- http: Fixed caching datasource responses to `replay_path` if set.
24+
- http: Fixed caching datasource responses when `replay_path` contains tilde.
2425
- http: Adjusted per-datasource default config values.
25-
- project: Fixed outdated options in DipDup version question.
26-
- tzkt: Fixed deserializing `EventData` model.
27-
- tzkt: Fixed empty contract balance in the `amount` field.
26+
- project: Use the latest stable version instead of hardcoded values.
27+
- tzkt: Fixed deserializing of `EventData` and `OperationData` models.
28+
- tzkt: Fixed matching migration originations by address.
29+
30+
### Deprecated
31+
32+
- ci: `pytezos` extra and corresponding Docker image are deprecated.
2833

2934
## [6.2.0] - 2022-10-12
3035

@@ -811,7 +816,8 @@ This release contains no changes except for the version number.
811816
[semantic versioning]: https://semver.org/spec/v2.0.0.html
812817

813818
<!-- Versions -->
814-
[Unreleased]: https://github.com/dipdup-net/dipdup/compare/6.2.0...HEAD
819+
[Unreleased]: https://github.com/dipdup-net/dipdup/compare/6.3.0...HEAD
820+
[6.3.0]: https://github.com/dipdup-net/dipdup/compare/6.2.0...6.3.0
815821
[6.2.0]: https://github.com/dipdup-net/dipdup/compare/6.1.3...6.2.0
816822
[6.1.3]: https://github.com/dipdup-net/dipdup/compare/6.1.2...6.1.3
817823
[6.1.2]: https://github.com/dipdup-net/dipdup/compare/6.1.1...6.1.2

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
44

55
## General
66

7-
- All code in this repository MUST be licensed under the [MIT License](LICENSE).
7+
- All code in this repository MUST be licensed under the [MIT License](./LICENSE.md).
88
- Python code in this repository MUST run on Python 3.10. It also SHOULD run on Python 3.11. Using modern language features is encouraged.
99
- Python code in this repository MUST run in Linux, macOS, Docker, and `amd64`/`arm64` environments. Windows SHOULD be supported as well.
1010
- We use the [Poetry](https://python-poetry.org/docs/#installation) package manager and GNU Make to set up the development environment. You SHOULD install both tools and run `make help` to see available shortcuts.

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# syntax=docker/dockerfile:1.3-labs
22
FROM python:3.10-slim-buster AS compile-image
33
ARG PYTEZOS=0
4+
ENV DIPDUP_PYTEZOS=${PYTEZOS}
45
ENV POETRY_VIRTUALENVS_IN_PROJECT=true
56
SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
67

@@ -32,6 +33,7 @@ eot
3233

3334
FROM python:3.10-slim-buster AS build-image
3435
ARG PYTEZOS=0
36+
ENV DIPDUP_PYTEZOS=${PYTEZOS}
3537
ENV POETRY_VIRTUALENVS_IN_PROJECT=true
3638
SHELL ["/bin/bash", "-c"]
3739

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
##
66
## DEV=1 Install dev dependencies
77
DEV=1
8+
# TODO: Remove in 7.0
89
## PYTEZOS=0 Install PyTezos
910
PYTEZOS=0
1011
## TAG=latest Tag for the `image` command
@@ -13,7 +14,7 @@ TAG=latest
1314
##
1415

1516
help: ## Show this help (default)
16-
@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
17+
@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
1718

1819
all: ## Run a whole CI pipeline: formatters, linters and tests
1920
make install lint test docs
@@ -29,7 +30,7 @@ lint: ## Lint with all tools
2930
test: ## Run test suite
3031
poetry run pytest --cov-report=term-missing --cov=dipdup --cov-report=xml -n auto -s -v tests
3132

32-
test-ci:
33+
test-ci: ## Run test suite without xdist, coverage and some tests (avoid macOS issues)
3334
CI=true poetry run pytest -s -v tests
3435

3536
docs: ## Build docs
@@ -42,7 +43,7 @@ docs: ## Build docs
4243
isort: ## Format with isort
4344
poetry run isort src tests scripts
4445

45-
blue: ## Format with blue
46+
blue: ## Format with blue
4647
poetry run blue src tests scripts
4748

4849
flake: ## Lint with flake8
@@ -65,6 +66,7 @@ image: ## Build all Docker images
6566
image-default: ## Build default Docker image
6667
docker buildx build . --progress plain -t dipdup:${TAG}
6768

69+
# TODO: Remove in 7.0
6870
image-pytezos: ## Build pytezos Docker image
6971
docker buildx build . --progress plain -t dipdup:${TAG}-pytezos --build-arg PYTEZOS=1
7072

@@ -96,6 +98,7 @@ release-major: ## Release major version
9698
clean: ## Remove all files from .gitignore except for `.venv`
9799
git clean -xdf --exclude=".venv"
98100
rm -r ~/.cache/flakeheaven
101+
rm -r ~/.cache/dipdup
99102

100103
update: ## Update dependencies, export requirements.txt
101104
make install
@@ -121,4 +124,3 @@ scripts:
121124
make lint
122125

123126
##
124-
##

demos/demo-domains-big-map/docker-compose.swarm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ services:
5353
logging: *logging
5454

5555
hasura:
56-
image: hasura/graphql-engine:v2.14.0
56+
image: hasura/graphql-engine:v2.15.0
5757
depends_on:
5858
- db
5959
environment:

0 commit comments

Comments
 (0)