Skip to content

Commit

Permalink
Merge pull request #1982 from Drakkar-Software/dev
Browse files Browse the repository at this point in the history
Master merge
  • Loading branch information
GuillaumeDSM authored Jun 13, 2022
2 parents 4e949a7 + 7cb8080 commit 831ad43
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

*It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)*

## [0.4.5] - 2022-06-12
### Fixed
- [Trading modes] Stop loss are not created after instantly filled limit orders
- [Exchanges] Multiple backtesting issues
- [WebInterface] Portfolio value sorting

## [0.4.4] - 2022-06-01
### Added
- [Exchanges] Future trading engine
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OctoBot [0.4.4](https://octobot.click/gh-changelog)
# OctoBot [0.4.5](https://octobot.click/gh-changelog)
[![PyPI](https://img.shields.io/pypi/v/OctoBot.svg)](https://octobot.click/gh-pypi)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e07fb190156d4efb8e7d07aaa5eff2e1)](https://app.codacy.com/gh/Drakkar-Software/OctoBot?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot&utm_campaign=Badge_Grade_Dashboard)[![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
[![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg)](https://octobot.click/gh-dockerhub)
Expand All @@ -14,7 +14,7 @@
[![Telegram News](https://img.shields.io/badge/telegram-news-blue.svg)](https://t.me/OctoBot_Project)
[![Twitter](https://img.shields.io/twitter/follow/DrakkarsOctobot.svg?label=Follow&style=social)](https://octobot.click/gh-twitter)
<p align="center">
<img src="../assets/octopus.svg" alt="Octobot Logo" height="400" width="400">
<img src="../assets/OctoBot-icon-only.svg" alt="Octobot Logo" height="400" width="400">
</p>

![Web Interface](../assets/web-interface.gif)
Expand Down
2 changes: 1 addition & 1 deletion octobot/community/errors_upload/error_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self, error: Exception, title: str, timestamp: float, metrics_id: s
self.type: str = self.error.__class__.__name__ if self.error else ""
self.stacktrace: list = traceback.format_exception(
etype=type(self.error), value=self.error, tb=self.error.__traceback__
)[1:] if self.error else []
)[1:] if self.error and isinstance(self.error, Exception) else []

def to_dict(self) -> dict:
"""
Expand Down
2 changes: 1 addition & 1 deletion octobot/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

PROJECT_NAME = "OctoBot"
AUTHOR = "DrakkarSoftware"
SHORT_VERSION = "0.4.4" # major.minor.revision
SHORT_VERSION = "0.4.5" # major.minor.revision
PATCH_VERSION = "" # patch : pX
VERSION_DEV_PHASE = "" # alpha : a / beta : b / release candidate : rc
VERSION_PHASE = "" # XX
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cython==0.29.26

# Drakkar-Software requirements
OctoBot-Commons==1.7.8
OctoBot-Trading==2.2.5
OctoBot-Trading==2.2.6
OctoBot-Evaluators==1.7.3
OctoBot-Tentacles-Manager==2.7.0
OctoBot-Services==1.3.1
Expand Down

0 comments on commit 831ad43

Please sign in to comment.