Skip to content

Commit

Permalink
[Version] v1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Herklos committed Oct 10, 2019
1 parent ed70de1 commit 47e6549
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 15 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ matrix:
password:
secure: HHlsEgI/sKI1iG5y571xXlokPZN6nwT4wCeG1oLFX6gEJTMnyWDq8wSiqaaIiOMcs6MWA/pQI6wf4yL0a2lXZMiNQIEC+Q64Iln1leNBXbDDsNYXPHPhsb2ZIPkVf2PFFIUCp+7kNQk7+h/5Px3wmoLs2WZbqy2vMHA4fGKwA3/xrwbjovQTJbDkonyZPzPCo30jsbl5jH/IzH1Lv2hn1xK7yS2w3y+iSV9tj2Wchcfz18OAVrb59PgaQptEzlKqujP6Khj6qV+04cTldzYh2Vd0kyYlSxmSN57EKYVyZfUkXCLm/AcJ55YfNwbrGslmPC/0g8rbmlMVGwB9cHQwBLARu3QwJZ7wW1PDiCXvJ2BTbeihh8dzOneGkgwfOe3HXD1F/7zA0I4NOuucPhcyD+EA3XVzFhNSqCOrK1E9D8pMqxn3c08+ORazdcebVojF7OAODxDOt1cldPwRjjflZ2AV6vOpZZvSKq43A9n3aXDnyTmzJF5y/Q1RjdmAgqb/bCchtUQ3COq5RA7BWtYCWnZURWy3lnjBB99G24v3dR2d1L730mjN72AIqx86bvKYU7YEiwz0ZTzlWaSXUjz78I7oDkYHuQwEnEeQ8AdA78+IJU3/lgac2XuRjkVr4MDwfJm52Y1GrayOC+JvFj9axVA6jgKOfk0WSN0qZwsTim8=
skip_cleanup: true
skip_existing: true
distributions: "sdist"
on:
repo: $GH_REPO
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.4] - 2019-10-11
## Changed
- Style improvements

## [1.2.3] - 2019-10-09
## Added
- PyPi manylinux deployment
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OctoBot-Evaluators [1.2.3-beta](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md)
# OctoBot-Evaluators [1.2.4-beta](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md)
[![PyPI](https://img.shields.io/pypi/v/OctoBot-Evaluators.svg)](https://pypi.python.org/pypi/OctoBot-Evaluators/)
[![Build Status](https://travis-ci.com/Drakkar-Software/OctoBot-Evaluators.svg?branch=master)](https://travis-ci.org/Drakkar-Software/OctoBot-Evaluators)
[![Build status](https://ci.appveyor.com/api/projects/status/p68n2y6547xhw0t6?svg=true)](https://ci.appveyor.com/project/Herklos/octobot-evaluators)
Expand Down
2 changes: 2 additions & 0 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ twine
pip
setuptools
wheel

pur
2 changes: 1 addition & 1 deletion octobot_evaluators/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# License along with this library.

PROJECT_NAME = "OctoBot-Evaluators"
VERSION = "1.2.3" # major.minor.revision
VERSION = "1.2.4" # major.minor.revision
2 changes: 1 addition & 1 deletion octobot_evaluators/data/matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def set_eval(self,
self.matrix[evaluator_name][symbol] = value
else:
self.matrix[evaluator_name] = value
except KeyError as e:
except KeyError:
EvaluatorMatrix.__init_matrix(evaluator_matrix, symbol, exchange_name)
self.set_eval(evaluator_name, evaluator_type, value, eval_note_type, exchange_name, symbol, time_frame)

Expand Down
2 changes: 1 addition & 1 deletion octobot_evaluators/evaluator/strategy_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async def matrix_callback(self,
def get_required_time_frames(cls, config):
if CONFIG_FORCED_TIME_FRAME in config:
return TimeFrameManager.parse_time_frames(config[CONFIG_FORCED_TIME_FRAME])
strategy_config = cls.get_specific_config(True, False)
strategy_config = cls.get_specific_config()
if STRATEGIES_REQUIRED_TIME_FRAME in strategy_config:
return TimeFrameManager.parse_time_frames(strategy_config[STRATEGIES_REQUIRED_TIME_FRAME])
else:
Expand Down
5 changes: 0 additions & 5 deletions renovate.json

This file was deleted.

11 changes: 6 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
cython
numpy
# Setup requirements
cython==0.29.13
numpy==1.17.2

# Drakkar-Software requirements
OctoBot-Channels
OctoBot-Commons
OctoBot-Tentacles-Manager==1.0.11
OctoBot-Channels==1.3.13
OctoBot-Commons==1.1.46
OctoBot-Tentacles-Manager==1.0.12
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import os

from setuptools import dist
dist.Distribution().fetch_build_eggs(['Cython>=0.15.1', 'numpy>=1.10'])
dist.Distribution().fetch_build_eggs(['Cython>=0.29.13', 'numpy>=1.17.2'])

import numpy as np

Expand Down

0 comments on commit 47e6549

Please sign in to comment.