Skip to content

Commit

Permalink
Merge pull request #409 from freqtrade/dependabot/pip/black-24.1.1
Browse files Browse the repository at this point in the history
Bump black from 23.12.1 to 24.1.1
  • Loading branch information
xmatthias authored Jan 29, 2024
2 parents ad97eef + 2a216aa commit 837277e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 16 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pytest-mock==3.12.0
pytest-random-order==1.1.1
ruff==0.1.14
isort==5.13.2
black==23.12.1
black==24.1.1
1 change: 1 addition & 0 deletions technical/bouncyhouse.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
helper file for calculating touches and bounces of or under supports and resistances
"""

import numpy as np
from pandas import DataFrame

Expand Down
37 changes: 22 additions & 15 deletions technical/indicators/indicators.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
This file contains a collection of common indicators,
which are based on third party or custom libraries
"""

import math

import numpy as np
Expand Down Expand Up @@ -1188,22 +1189,28 @@ def PMAX(dataframe, period=10, multiplier=3, length=12, MAtype=1, src=1): # noq
df[pm].iat[i - 1] == df["final_ub"].iat[i - 1]
and df[mavalue].iat[i] <= df["final_ub"].iat[i]
)
else df["final_lb"].iat[i]
if (
df[pm].iat[i - 1] == df["final_ub"].iat[i - 1]
and df[mavalue].iat[i] > df["final_ub"].iat[i]
)
else df["final_lb"].iat[i]
if (
df[pm].iat[i - 1] == df["final_lb"].iat[i - 1]
and df[mavalue].iat[i] >= df["final_lb"].iat[i]
)
else df["final_ub"].iat[i]
if (
df[pm].iat[i - 1] == df["final_lb"].iat[i - 1]
and df[mavalue].iat[i] < df["final_lb"].iat[i]
else (
df["final_lb"].iat[i]
if (
df[pm].iat[i - 1] == df["final_ub"].iat[i - 1]
and df[mavalue].iat[i] > df["final_ub"].iat[i]
)
else (
df["final_lb"].iat[i]
if (
df[pm].iat[i - 1] == df["final_lb"].iat[i - 1]
and df[mavalue].iat[i] >= df["final_lb"].iat[i]
)
else (
df["final_ub"].iat[i]
if (
df[pm].iat[i - 1] == df["final_lb"].iat[i - 1]
and df[mavalue].iat[i] < df["final_lb"].iat[i]
)
else 0.00
)
)
)
else 0.00
)

# Mark the trend direction up/down
Expand Down
1 change: 1 addition & 0 deletions technical/indicators/volatility.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Volatility indicator functions
"""

import numpy as np
import pandas as pd
from numpy.core.records import ndarray
Expand Down
1 change: 1 addition & 0 deletions technical/util.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
defines utility functions to be used
"""

from pandas import DataFrame, DatetimeIndex, merge, to_datetime, to_timedelta

TICKER_INTERVAL_MINUTES = {
Expand Down

0 comments on commit 837277e

Please sign in to comment.