From 5a0f6ca5627a8a76246965beada5c57a1573af54 Mon Sep 17 00:00:00 2001 From: DogsTailFarmer Date: Sat, 9 Mar 2024 20:03:53 +0300 Subject: [PATCH] 3.0.0rc14 --- CHANGELOG.md | 7 +++++-- README.md | 4 ++-- martin_binance/__init__.py | 2 +- martin_binance/executor.py | 4 +++- pyproject.toml | 4 ++-- requirements.txt | 6 +++--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fe1d4b..ba812f4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.0.0rc14 - 2024-03-09 +### Update +* Up requirements for exchanges-wrapper==2.0.0 +* Refined logging + ## 3.0.0rc8 - 2024-03-08 ### Fix * logging for Simulate mode @@ -8,8 +13,6 @@ * `WSS`: check and restart ## 3.0.0rc1 - 2024-03-02 -### Fix -# TODO * `cancel_order_call()`: not raised asyncio.TimeoutError on timeout * `on_balance_update_ex()`: don't update direct initial asset values in Reverse cycle * Partially filled TP in Hold reverse cycle diff --git a/README.md b/README.md index 2d3130e..286739d 100755 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ All risks and possible losses associated with use of this strategy lie with you. Strongly recommended that you test the strategy in the demo mode before using real bidding. ## Important notices -* After update to `2.1.0`, the configuration files `cli_XX_AAABBB.py` for all running trading pairs -should be updated, also update the configuration files `exch_srv_cfg.toml` and `ms_cfg.toml`. Use templates for reference. +* After update to `3.0.0`, the configuration files `cli_XX_AAABBB.py` for all running trading pairs +should be updated. Use templates for reference. * You cannot run multiple pairs with overlapping currencies on the same account! diff --git a/martin_binance/__init__.py b/martin_binance/__init__.py index 62754c5..3454d6f 100755 --- a/martin_binance/__init__.py +++ b/martin_binance/__init__.py @@ -6,7 +6,7 @@ __author__ = "Jerry Fedorenko" __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM" __license__ = "MIT" -__version__ = "3.0.0rc12" +__version__ = "3.0.0rc14" __maintainer__ = "Jerry Fedorenko" __contact__ = "https://github.com/DogsTailFarmer" diff --git a/martin_binance/executor.py b/martin_binance/executor.py index 49e8114..654b555 100755 --- a/martin_binance/executor.py +++ b/martin_binance/executor.py @@ -7,6 +7,8 @@ __version__ = "3.0.0rc12" __maintainer__ = "Jerry Fedorenko" __contact__ = 'https://github.com/DogsTailFarmer' + +import logging ################################################################## import sys import gc @@ -455,7 +457,7 @@ def save_strategy_state(self, return_only=False) -> Dict[str, str]: def restore_strategy_state(self, strategy_state: Dict[str, str] = None, restore=True) -> None: if strategy_state: # Restore from file if lose state only - self.message_log("restore_strategy_state from saved state:", log_level=logging.DEBUG) + self.message_log("Restore strategy state from saved state:", log_level=logging.INFO) self.message_log("\n".join(f"{k}\t{v}" for k, v in strategy_state.items()), log_level=logging.DEBUG) # self.command = json.loads(strategy_state.get('command')) diff --git a/pyproject.toml b/pyproject.toml index 8efa8ed..67de48c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ dynamic = ["version", "description"] requires-python = ">=3.9" dependencies = [ - "exchanges-wrapper==2.0.0rc1", + "exchanges-wrapper==2.0.0", "jsonpickle==3.0.2", "psutil==5.9.6", "requests==2.31.0", @@ -37,7 +37,7 @@ dependencies = [ "pyarrow~=14.0.2", "shortuuid~=1.0.11", "numpy~=1.23.4", - "scipy~=1.9.3", + "scipy~=1.12.0", "toml~=0.10.2", ] diff --git a/requirements.txt b/requirements.txt index 45eff86..98b6fe3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -exchanges-wrapper==2.0.0rc1 +exchanges-wrapper==2.0.0 jsonpickle==3.0.2 psutil==5.9.6 requests==2.31.0 @@ -18,5 +18,5 @@ orjson~=3.9.15 pyarrow~=14.0.2 shortuuid~=1.0.11 numpy~=1.23.4 -scipy~=1.9.3 -toml~=0.10.2 \ No newline at end of file +scipy==1.12.0 +toml~=0.10.2