Skip to content

Commit

Permalink
Merge pull request #199 [Beta Version] Release 1 : Beta
Browse files Browse the repository at this point in the history
[Beta Version] Release 1 : Beta
  • Loading branch information
Herklos authored Jun 1, 2018
2 parents f6db6b7 + e1518ef commit 7e57842
Show file tree
Hide file tree
Showing 188 changed files with 10,364 additions and 2,573 deletions.
3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
service_name: travis-pro
repo_token: F6QyEab3wPS7COXdw8oPCVrU3ogNj44dm
parallel: true # if the CI is running your build in parallel
25 changes: 18 additions & 7 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
---
name: Bug report
about: Create a report to help us improve

---

## Step 1: Have you search for this issue before posting it?

If you have discovered a bug in the bot, please [search our issue tracker](https://github.com/Trading-Bot/CryptoBot/issues?q=is%3Aissue).
If you have discovered a bug in the bot, please [search our issue tracker](https://github.com/Drakkar-Software/OctoBot/issues?q=is%3Aissue).
If it hasn't been reported, please create a new issue.

## Step 2: Describe your environment

* OS : [Windows, Ubuntu, Debian, Raspbian...]
* Python Version: _____ (`python -V`)
* Branch: Master | Dev
* Last Commit ID: _____ (`git log --format="%H" -n 1`)

## Step 3: Describe the problem:
*Explain the problem you have encountered*
**Describe the bug**
A clear and concise description of what the bug is.

**Expected behavior**
A clear and concise description of what you expected to happen.

### Steps to reproduce:

Expand All @@ -24,7 +34,8 @@ If it hasn't been reported, please create a new issue.
* What did you expect to happen?

### Relevant code exceptions or logs:

```
// paste your log here
```
If applicable, add screenshots to help explain your problem.

```
// paste your log here
```
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
- Add any other context or screenshots about the feature request here.
- You can link a github gist to explain the feature
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Thank you for sending your pull request.
But first, have you included unit tests, and is your code PEP8 conformant? [More details](https://github.com/Trading-Bot/CryptoBot/blob/dev/CONTRIBUTING.md)
But first, have you included unit tests, and is your code PEP8 conformant? [More details](https://github.com/Drakkar-Software/OctoBot/blob/dev/CONTRIBUTING.md)

## Summary
Explain in one sentence the goal of this PR
Expand Down
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,20 @@ ENV/
.mypy_cache/

# config
config.json
config/config.json

# modules
# evaluators
/.gitmodules
evaluator/.gitignore
**/Default/*.*
**/Advanced/*.*

# Specific config
config/evaluator_config.json

# Data
backtesting/collector/data/**

logs/matrix_history\.data

logs/OctoBot\.log\.*
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ sudo: enabled
language: python
python:
- 3.6
notifications:
notifications:
slack: "cryptobotgroupe:vYDDCLRne52jPGVtN6cMiUkb"
email: false
install:
- ./docs/install/install-ta-lib.sh
- cp ./docs/install/config_test.json ./config/config.json
- python -m pip install -r requirements.txt
script: pytest tests/
- sudo ./docs/install/linux_installer.sh
- pip3 install -r requirements.txt
- pip3 install -r dev_requirements.txt
- cp ./config/default_config.json ./config/config.json
- python3 start.py -p install all
script:
- pytest --cov-report term --cov=. tests/unit_tests/


46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at herklos.dev@protonmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contribute to CryptoBot
# Contribute to OctoBot

Feel like our bot is missing a feature? We welcome your pull requests! Few pointers for contributions:

Expand Down
30 changes: 24 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
#Download base image ubuntu 16.04
FROM ubuntu:16.04
FROM python:3

# Update Ubuntu Software repository
# Update Software repository
RUN apt-get update
RUN apt install git -y

RUN bash ./docs/install/install-ta-lib.sh
# Set up dev environment
WORKDIR /bot
RUN git clone https://github.com/Drakkar-Software/OctoBot /bot/octobot
WORKDIR /bot/octobot
RUN git checkout dev

RUN cp ./docs/install/config_test.json ./config/config.json
# install dependencies
RUN bash ./docs/install/linux_installer.sh

RUN python3 -m pip install -r requirements.txt
# configuration
RUN cp ./config/default_config.json ./config/config.json
RUN cp ./config/default_evaluator_config.json ./config/evaluator_config.json

# python libs
RUN pip3 install -U setuptools
RUN pip3 install -r requirements.txt

# install evaluators
RUN python start.py -p install all

# entry point
ENTRYPOINT ["python"]
CMD ["start.py"]
Loading

0 comments on commit 7e57842

Please sign in to comment.