From 132f9644a2cb8332a6a0adc3ba5bc83d03b12f3d Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Fri, 11 Oct 2024 12:52:46 -0700 Subject: [PATCH 1/4] Updating for pypechain v0.0.44 --- python/hyperdrivetypes/hyperdrivetypes/fixedpoint_types.py | 5 +++-- python/hyperdrivetypes/prerequisite.txt | 2 +- python/hyperdrivetypes/pyproject.toml | 4 ++-- python/test_hyperdrivetypes.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/hyperdrivetypes/hyperdrivetypes/fixedpoint_types.py b/python/hyperdrivetypes/hyperdrivetypes/fixedpoint_types.py index ef932802b..b184b678b 100644 --- a/python/hyperdrivetypes/hyperdrivetypes/fixedpoint_types.py +++ b/python/hyperdrivetypes/hyperdrivetypes/fixedpoint_types.py @@ -5,7 +5,9 @@ from dataclasses import dataclass from fixedpointmath import FixedPoint -from hyperdrivetypes.types.IHyperdriveTypes import ( +from pypechain.core import BaseEventArgs + +from .types.IHyperdrive import ( AddLiquidityEvent, Checkpoint, CloseLongEvent, @@ -20,7 +22,6 @@ RedeemWithdrawalSharesEvent, RemoveLiquidityEvent, ) -from pypechain.core import BaseEventArgs # TODO: These dataclasses are similar to pypechain except for # - snake_case attributes instead of camelCase diff --git a/python/hyperdrivetypes/prerequisite.txt b/python/hyperdrivetypes/prerequisite.txt index 482dc2a92..f0496e369 100644 --- a/python/hyperdrivetypes/prerequisite.txt +++ b/python/hyperdrivetypes/prerequisite.txt @@ -1 +1 @@ -pypechain == 0.0.43 +pypechain == 0.0.44 diff --git a/python/hyperdrivetypes/pyproject.toml b/python/hyperdrivetypes/pyproject.toml index fa91689cc..a41d9992a 100644 --- a/python/hyperdrivetypes/pyproject.toml +++ b/python/hyperdrivetypes/pyproject.toml @@ -19,10 +19,10 @@ classifiers = [ "Natural Language :: English", ] -dependencies = ["pypechain==0.0.43", "fixedpointmath"] +dependencies = ["pypechain==0.0.44", "fixedpointmath"] [project.optional-dependencies] -dev = ["pyright", "pytest"] +dev = ["pyright>=1.1.384", "pytest"] all = [ "hyperdrivetypes[dev]", diff --git a/python/test_hyperdrivetypes.py b/python/test_hyperdrivetypes.py index 5ef4191a7..45fb73ef3 100644 --- a/python/test_hyperdrivetypes.py +++ b/python/test_hyperdrivetypes.py @@ -15,7 +15,7 @@ RedeemWithdrawalSharesEventFP, RemoveLiquidityEventFP, ) -from hyperdrivetypes.types.IHyperdriveTypes import ( +from hyperdrivetypes.types.IHyperdrive import ( AddLiquidityEvent, Checkpoint, CloseLongEvent, From fad4b8497713984e5770345dd3296bd56305c665 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 15 Oct 2024 16:52:45 -0700 Subject: [PATCH 2/4] Don't import * --- python/hyperdrivetypes/hyperdrivetypes/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/hyperdrivetypes/hyperdrivetypes/__init__.py b/python/hyperdrivetypes/hyperdrivetypes/__init__.py index 293bdaea3..eb0feeb77 100644 --- a/python/hyperdrivetypes/hyperdrivetypes/__init__.py +++ b/python/hyperdrivetypes/hyperdrivetypes/__init__.py @@ -18,4 +18,3 @@ RedeemWithdrawalSharesEventFP, RemoveLiquidityEventFP, ) -from .types import * From 1a8107e2d380315ae155519018fbe3df25cb6133 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 15 Oct 2024 16:52:53 -0700 Subject: [PATCH 3/4] Moving test hyperdrivetypes --- python/{ => hyperdrivetypes/test}/test_hyperdrivetypes.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename python/{ => hyperdrivetypes/test}/test_hyperdrivetypes.py (100%) diff --git a/python/test_hyperdrivetypes.py b/python/hyperdrivetypes/test/test_hyperdrivetypes.py similarity index 100% rename from python/test_hyperdrivetypes.py rename to python/hyperdrivetypes/test/test_hyperdrivetypes.py From 1e1596857cc94dc3f9a04a24ef8ba9bf1169ec50 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Wed, 16 Oct 2024 13:47:27 -0700 Subject: [PATCH 4/4] Bump pypechain version, and bump hyperdrivetypes version to 1.0.20.8 --- python/hyperdrivetypes/prerequisite.txt | 2 +- python/hyperdrivetypes/pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/hyperdrivetypes/prerequisite.txt b/python/hyperdrivetypes/prerequisite.txt index f0496e369..18d2d538e 100644 --- a/python/hyperdrivetypes/prerequisite.txt +++ b/python/hyperdrivetypes/prerequisite.txt @@ -1 +1 @@ -pypechain == 0.0.44 +pypechain == 0.0.45 diff --git a/python/hyperdrivetypes/pyproject.toml b/python/hyperdrivetypes/pyproject.toml index a41d9992a..2a63f4324 100644 --- a/python/hyperdrivetypes/pyproject.toml +++ b/python/hyperdrivetypes/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "hyperdrivetypes" -version = "1.0.19.7" +version = "1.0.20.8" # Authors are the current, primary stewards of the repo # contributors can be found on github @@ -19,7 +19,7 @@ classifiers = [ "Natural Language :: English", ] -dependencies = ["pypechain==0.0.44", "fixedpointmath"] +dependencies = ["pypechain==0.0.45", "fixedpointmath"] [project.optional-dependencies] dev = ["pyright>=1.1.384", "pytest"]