From 9ed09afa0a2a9ad98b3bf2dcfeecc14921794735 Mon Sep 17 00:00:00 2001 From: darwintree <17946284+darwintree@users.noreply.github.com> Date: Mon, 31 Mar 2025 10:05:19 +0800 Subject: [PATCH 1/4] chore: update CHANGELOG for version 1.4.1 --- docs/en/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/CHANGELOG.md b/docs/en/CHANGELOG.md index ea3f230..6b3882a 100644 --- a/docs/en/CHANGELOG.md +++ b/docs/en/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Logs +## 1.4.1 + +* fix: packing issues + ## 1.4.0 * bump web3.py to 7.8.0 From 2a308ec957fda1bebaadd604bae837820fabde5a Mon Sep 17 00:00:00 2001 From: darwintree <17946284+darwintree@users.noreply.github.com> Date: Mon, 31 Mar 2025 10:10:08 +0800 Subject: [PATCH 2/4] chore: bump dependencies version --- docs/en/CHANGELOG.md | 5 +++++ setup.py | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/en/CHANGELOG.md b/docs/en/CHANGELOG.md index 6b3882a..9a71f66 100644 --- a/docs/en/CHANGELOG.md +++ b/docs/en/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Logs +## 1.4.2 + +* chore: bump web3.py to 7.10.0 +* chore: pin cfx-* package versions + ## 1.4.1 * fix: packing issues diff --git a/setup.py b/setup.py index 81ef96b..5cc5779 100644 --- a/setup.py +++ b/setup.py @@ -101,10 +101,10 @@ "cns": ["py.typed"]}, url='https://github.com/conflux-chain/python-conflux-sdk', install_requires=[ - "web3==7.8.0", - "cfx-address>=1.2.0", - "cfx-account>=1.2.0", - "cfx-utils>=1.0.5", + "web3==7.10.0", + "1.2.4<=cfx-address<1.3.0", + "1.2.2<=cfx-account<1.3.0", + "1.0.5<=cfx-utils<1.2.0", ], # add any additional packages that # needs to be installed along with your package. Eg: 'caer' extras_require=extras_require, From fd9b9a6f34b2bdcde6c05ad05d2338f5f5ef4d0e Mon Sep 17 00:00:00 2001 From: darwintree <17946284+darwintree@users.noreply.github.com> Date: Mon, 31 Mar 2025 10:15:12 +0800 Subject: [PATCH 3/4] fix: setup.py grammar --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 5cc5779..2bff093 100644 --- a/setup.py +++ b/setup.py @@ -102,10 +102,10 @@ url='https://github.com/conflux-chain/python-conflux-sdk', install_requires=[ "web3==7.10.0", - "1.2.4<=cfx-address<1.3.0", - "1.2.2<=cfx-account<1.3.0", - "1.0.5<=cfx-utils<1.2.0", - ], # add any additional packages that + "cfx-address>=1.2.4,<1.3.0", + "cfx-account>=1.2.2,<1.3.0", + "cfx-utils>=1.0.5,<1.2.0", + ], # add any additional packages that need to be installed # needs to be installed along with your package. Eg: 'caer' extras_require=extras_require, keywords=['python', 'conflux', 'blockchain'], From f0fd3f6aae389bc21f3fff1b0ad4c575090aa990 Mon Sep 17 00:00:00 2001 From: darwintree <17946284+darwintree@users.noreply.github.com> Date: Mon, 31 Mar 2025 10:39:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=201.4.1=20=E2=86=92=201.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- tests/base_features/test_api.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f90e5e3..dcc0f02 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.4.1 +current_version = 1.4.2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[^.]*)\.(?P\d+))? diff --git a/setup.py b/setup.py index 2bff093..eb667a2 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup, ) -VERSION = "1.4.1" +VERSION = "1.4.2" DESCRIPTION = 'Python SDK for Conflux network' with open('./README.md') as readme: long_description = readme.read() diff --git a/tests/base_features/test_api.py b/tests/base_features/test_api.py index 31ff599..65f58c7 100644 --- a/tests/base_features/test_api.py +++ b/tests/base_features/test_api.py @@ -1,4 +1,4 @@ def test_api_version(w3): - expected_version = "1.4.1" + expected_version = "1.4.2" if "beta" not in expected_version: assert w3.api.startswith(expected_version)