Merge branch 'develop' into feat_readjust_entry

This commit is contained in:
eSeR1805 2022-05-02 18:30:05 +03:00
commit 52d510c331
No known key found for this signature in database
GPG Key ID: BA53686259B46936
5 changed files with 20 additions and 17 deletions

View File

@ -15,9 +15,9 @@ repos:
additional_dependencies: additional_dependencies:
- types-cachetools==5.0.1 - types-cachetools==5.0.1
- types-filelock==3.2.5 - types-filelock==3.2.5
- types-requests==2.27.20 - types-requests==2.27.25
- types-tabulate==0.8.7 - types-tabulate==0.8.8
- types-python-dateutil==2.8.12 - types-python-dateutil==2.8.14
# stages: [push] # stages: [push]
- repo: https://github.com/pycqa/isort - repo: https://github.com/pycqa/isort

View File

@ -1,5 +1,5 @@
mkdocs==1.3.0 mkdocs==1.3.0
mkdocs-material==8.2.10 mkdocs-material==8.2.12
mdx_truly_sane_lists==1.2 mdx_truly_sane_lists==1.2
pymdown-extensions==9.4 pymdown-extensions==9.4
jinja2==3.1.1 jinja2==3.1.2

View File

@ -5,7 +5,7 @@ It's subclasses handle and storing data from disk.
""" """
import logging import logging
import re import re
from abc import ABC, abstractclassmethod, abstractmethod from abc import ABC, abstractmethod
from copy import deepcopy from copy import deepcopy
from datetime import datetime, timezone from datetime import datetime, timezone
from pathlib import Path from pathlib import Path
@ -38,7 +38,8 @@ class IDataHandler(ABC):
""" """
raise NotImplementedError() raise NotImplementedError()
@abstractclassmethod @classmethod
@abstractmethod
def ohlcv_get_available_data( def ohlcv_get_available_data(
cls, datadir: Path, trading_mode: TradingMode) -> ListPairsWithTimeframes: cls, datadir: Path, trading_mode: TradingMode) -> ListPairsWithTimeframes:
""" """
@ -48,7 +49,8 @@ class IDataHandler(ABC):
:return: List of Tuples of (pair, timeframe) :return: List of Tuples of (pair, timeframe)
""" """
@abstractclassmethod @classmethod
@abstractmethod
def ohlcv_get_pairs(cls, datadir: Path, timeframe: str, candle_type: CandleType) -> List[str]: def ohlcv_get_pairs(cls, datadir: Path, timeframe: str, candle_type: CandleType) -> List[str]:
""" """
Returns a list of all pairs with ohlcv data available in this datadir Returns a list of all pairs with ohlcv data available in this datadir
@ -118,7 +120,8 @@ class IDataHandler(ABC):
:param candle_type: Any of the enum CandleType (must match trading mode!) :param candle_type: Any of the enum CandleType (must match trading mode!)
""" """
@abstractclassmethod @classmethod
@abstractmethod
def trades_get_pairs(cls, datadir: Path) -> List[str]: def trades_get_pairs(cls, datadir: Path) -> List[str]:
""" """
Returns a list of all pairs for which trade data is available in this Returns a list of all pairs for which trade data is available in this

View File

@ -7,7 +7,7 @@
coveralls==3.3.1 coveralls==3.3.1
flake8==4.0.1 flake8==4.0.1
flake8-tidy-imports==4.6.0 flake8-tidy-imports==4.6.0
mypy==0.942 mypy==0.950
pre-commit==2.18.1 pre-commit==2.18.1
pytest==7.1.2 pytest==7.1.2
pytest-asyncio==0.18.3 pytest-asyncio==0.18.3
@ -24,6 +24,6 @@ nbconvert==6.5.0
# mypy types # mypy types
types-cachetools==5.0.1 types-cachetools==5.0.1
types-filelock==3.2.5 types-filelock==3.2.5
types-requests==2.27.20 types-requests==2.27.25
types-tabulate==0.8.7 types-tabulate==0.8.8
types-python-dateutil==2.8.12 types-python-dateutil==2.8.14

View File

@ -2,11 +2,11 @@ numpy==1.22.3
pandas==1.4.2 pandas==1.4.2
pandas-ta==0.3.14b pandas-ta==0.3.14b
ccxt==1.80.61 ccxt==1.81.16
# Pin cryptography for now due to rust build errors with piwheels # Pin cryptography for now due to rust build errors with piwheels
cryptography==36.0.2 cryptography==37.0.1
aiohttp==3.8.1 aiohttp==3.8.1
SQLAlchemy==1.4.35 SQLAlchemy==1.4.36
python-telegram-bot==13.11 python-telegram-bot==13.11
arrow==1.2.2 arrow==1.2.2
cachetools==4.2.2 cachetools==4.2.2
@ -17,7 +17,7 @@ TA-Lib==0.4.24
technical==1.3.0 technical==1.3.0
tabulate==0.8.9 tabulate==0.8.9
pycoingecko==2.2.0 pycoingecko==2.2.0
jinja2==3.1.1 jinja2==3.1.2
tables==3.7.0 tables==3.7.0
blosc==1.10.6 blosc==1.10.6
joblib==1.1.0 joblib==1.1.0