[Version] v1.5.7

Drakkar-Software · May 12, 2020 · a6a2239 · a6a2239
1 parent ed59646
commit a6a2239
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.7] - 2020-05-12
+### Fixed
+- Date description parsing
+
 ## [1.5.6] - 2020-05-11
 ### Added
 - Multiple data files support

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OctoBot-Backtesting [1.5.6](https://github.com/Drakkar-Software/OctoBot-Backtesting/blob/master/CHANGELOG.md)
+# OctoBot-Backtesting [1.5.7](https://github.com/Drakkar-Software/OctoBot-Backtesting/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/aa0b156e99604b3c98923fffeaea6a49)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Backtesting?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Backtesting&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Backtesting.svg)](https://pypi.python.org/pypi/OctoBot-Backtesting/)
 [![Build Status](https://api.travis-ci.com/Drakkar-Software/OctoBot-Backtesting.svg?branch=master)](https://travis-ci.com/Drakkar-Software/OctoBot-Backtesting) 

diff --git a/octobot_backtesting/__init__.py b/octobot_backtesting/__init__.py
@@ -16,6 +16,6 @@
 import logging
 
 PROJECT_NAME = "OctoBot-Backtesting"
-VERSION = "1.5.6"
+VERSION = "1.5.7"
 
 logging.getLogger('aiosqlite').setLevel(logging.ERROR)
diff --git a/octobot_backtesting/api/data_file.py b/octobot_backtesting/api/data_file.py
@@ -25,7 +25,7 @@ async def get_file_description(file_name, data_path=BACKTESTING_FILE_PATH) -> di
         return {
             DataFormatKeys.SYMBOLS.value: description[DataFormatKeys.SYMBOLS.value],
             DataFormatKeys.EXCHANGE.value: description[DataFormatKeys.EXCHANGE.value],
-            DataFormatKeys.DATE.value: data_manager.get_date(description[DataFormatKeys.DATE.value]),
+            DataFormatKeys.DATE.value: data_manager.get_date(int(description[DataFormatKeys.DATE.value])),
             DataFormatKeys.TIME_FRAMES.value: [tf.value for tf in description[DataFormatKeys.TIME_FRAMES.value]],
             DataFormatKeys.TYPE.value: "OctoBot data file"
         }

diff --git a/octobot_backtesting/data/data_file_manager.pxd b/octobot_backtesting/data/data_file_manager.pxd
@@ -17,7 +17,7 @@
 
 cpdef object get_data_type(str file_name)
 cpdef str get_file_ending(object data_type)
-cpdef double get_date(str time_info)
+cpdef double get_date(int time_info)
 cpdef bint is_valid_ending(str ending)
 cpdef list get_all_available_data_files(str data_collector_path)
 cpdef object delete_data_file(str data_collector_path, str file_name)