Skip to content

Commit 93c845c

Browse files
Lock Pydantic; v1.10 breaks our codegen (#467)
1 parent 6cb74a9 commit 93c845c

File tree

15 files changed

+2569
-737
lines changed

15 files changed

+2569
-737
lines changed

.github/workflows/cookiecutter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Poetry
2424
uses: snok/install-poetry@v1
2525
with:
26-
version: "1.1.13"
26+
version: "1.2.0"
2727

2828
- name: Set up cache
2929
uses: actions/cache@v2

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Poetry
3030
uses: snok/install-poetry@v1
3131
with:
32-
version: "1.1.13"
32+
version: "1.2.0"
3333

3434
- name: Set up cache
3535
uses: actions/cache@v2
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up mdBook
4444
uses: peaceiris/actions-mdbook@v1
4545
with:
46-
mdbook-version: '0.4.18'
46+
mdbook-version: '0.4.21'
4747

4848
- name: Install project
4949
run: make install

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Set up Poetry
7575
uses: snok/install-poetry@v1
7676
with:
77-
version: "1.1.13"
77+
version: "1.2.0"
7878

7979
- name: Install project
8080
run: make install

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Poetry
3939
uses: snok/install-poetry@v1
4040
with:
41-
version: "1.1.13"
41+
version: "1.2.0"
4242

4343
- name: Set up cache
4444
uses: actions/cache@v2

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog],
66
and this project adheres to [Semantic Versioning].
77

8+
## [Unreleased]
9+
10+
### Fixed
11+
12+
- ci: Lock Pydantic to 1.9.2 to avoid breaking changes in 1.10.0
13+
814
## [6.1.0] - 2022-08-30
915

1016
### Added

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN <<eot
88
apt update
99
apt install -y gcc make git `if [[ $PYTEZOS = "1" ]]; then echo build-essential pkg-config libsodium-dev libsecp256k1-dev libgmp-dev; fi`
1010

11-
pip install --no-cache-dir poetry
11+
pip install --no-cache-dir poetry==1.2.0
1212

1313
mkdir -p /opt/dipdup
1414

@@ -37,7 +37,7 @@ SHELL ["/bin/bash", "-c"]
3737

3838
RUN <<eot
3939
useradd -ms /bin/bash dipdup
40-
pip install --no-cache-dir poetry
40+
pip install --no-cache-dir poetry==1.2.0 setuptools
4141

4242
apt update
4343
apt install -y --no-install-recommends git `if [[ $PYTEZOS = "1" ]]; then echo libsodium-dev libsecp256k1-dev libgmp-dev; fi`

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ all: ## Run a whole CI pipeline: lint, run tests, build docs
2121
install: ## Install project dependencies
2222
poetry install \
2323
`if [ "${PYTEZOS}" = "1" ]; then echo "-E pytezos "; fi` \
24-
`if [ "${DEV}" = "0" ]; then echo "--no-dev"; fi`
24+
`if [ "${DEV}" = "0" ]; then echo "--without dev"; fi`
2525

2626
lint: ## Lint with all tools
2727
make isort black flake mypy
@@ -100,18 +100,18 @@ update: ## Update dependencies, export requirements.txt (wait an eternit
100100
cp pyproject.toml pyproject.toml.bak
101101
cp poetry.lock poetry.lock.bak
102102

103-
poetry export -o requirements.txt
104-
poetry export -o requirements.pytezos.txt -E pytezos
105-
poetry export -o requirements.dev.txt --dev
106-
103+
# NOTE: 1.2.0 spells
104+
poetry export --without-hashes -o requirements.txt
105+
poetry export --without-hashes -o requirements.pytezos.txt -E pytezos
106+
poetry export --without-hashes -o requirements.dev.txt --with dev
107107
poetry remove datamodel-code-generator
108-
poetry export -o requirements.slim.txt
108+
poetry export --without-hashes -o requirements.slim.txt
109109

110110
mv pyproject.toml.bak pyproject.toml
111111
mv poetry.lock.bak poetry.lock
112112

113113
make install
114114

115-
scripts/update-demos.sh
115+
scripts/update_demos.sh
116116

117117
##

cookiecutter/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# DipDup cookiecutter template
2+
3+
[Cookiecutter](https://cookiecutter.readthedocs.io/en/stable/README.html) template for [DipDup](https://github.com/dipdup-net/dipdup-py) projects.
4+
5+
```shell
6+
$ cookiecutter https://github.com/dipdup-net/cookiecutter-dipdup --directory=cookiecutter
7+
```
8+
9+
See README.md in the generated project to learn about the next steps.

docs/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ advanced:
5757
Exceptions that occurred during callback execution are reraised as `CallbackError`s. If you experience this issue, most likely your code is incorrect. Luckily, the Python ecosystem has lots of tools called linters to help you find mistakes. In DipDup we mostly use a combo of `flake8` and `mypy`. You can start using both with zero configuration:
5858

5959
```shell
60-
poetry add --dev flake8 mypy
60+
poetry add --with dev flake8 mypy
6161
poetry run flake8
6262
poetry run mypy
6363
```

0 commit comments

Comments
 (0)