adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'buy_reasons' of github.com:froggleston/freqtrade into buy_reasons

Browse Source
This commit is contained in:
froggleston 2022-05-29 11:20:32 +01:00
commit c59209a01a
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freqtrade/data/entryexitanalysis.py
View File

@ -1,5 +1,4 @@
import logging import logging
import os
from pathlib import Path from pathlib import Path
from typing import List, Optional from typing import List, Optional
@ -19,14 +18,11 @@ def _load_signal_candles(backtest_dir: Path):
if backtest_dir.is_dir(): if backtest_dir.is_dir():
scpf = Path(backtest_dir, scpf = Path(backtest_dir,
os.path.splitext( Path(get_latest_backtest_filename(backtest_dir)).stem + "_signals.pkl"
get_latest_backtest_filename(backtest_dir))[0] + "_signals.pkl"
) )
else: else:
scpf = Path(os.path.splitext( scpf = Path(Path(get_latest_backtest_filename(backtest_dir)).stem + "_signals.pkl")
get_latest_backtest_filename(backtest_dir))[0] + "_signals.pkl" print(scpf)
)
try: try:
scp = open(scpf, "rb") scp = open(scpf, "rb")
signal_candles = joblib.load(scp) signal_candles = joblib.load(scp)

2
tests/rpc/test_rpc_apiserver.py
View File

@ -1385,8 +1385,6 @@ def test_api_strategies(botclient):
assert_response(rc) assert_response(rc)
print(rc.json())
assert rc.json() == {'strategies': [ assert rc.json() == {'strategies': [
'HyperoptableStrategy', 'HyperoptableStrategy',
'InformativeDecoratorTest', 'InformativeDecoratorTest',

1
tests/strategy/strats/strategy_test_v3.py
View File

@ -144,7 +144,6 @@ class StrategyTestV3(IStrategy):
(dataframe['plus_di'] > self.buy_plusdi.value) (dataframe['plus_di'] > self.buy_plusdi.value)
), ),
'enter_long'] = 1 'enter_long'] = 1
dataframe.loc[ dataframe.loc[
( (
qtpylib.crossed_below(dataframe['rsi'], self.sell_rsi.value) qtpylib.crossed_below(dataframe['rsi'], self.sell_rsi.value)