Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
DeviaVir committed Mar 9, 2018
2 parents 5ddbc60 + f226dfc commit 6307098
Show file tree
Hide file tree
Showing 218 changed files with 25,835 additions and 12,226 deletions.
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
scripts/auto_backtester/node_modules/*
scripts/genetic_backtester/node_modules/*
scripts/genetic_algo/node_modules/*
dist
templates/dashboard_assets/js/*
10 changes: 9 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"env": {
"es6": true,
"node": true
"node": true,
"jasmine": true,
"browser": true
},
"extends": "eslint:recommended",
"rules": {
Expand All @@ -22,5 +24,11 @@
"error",
"never"
]
},
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"experimentalObjectRestSpread": true
}
}
}
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,22 @@ conf_*
!conf-sample.js
sim_result*
trade_result*
paper_result*
*_test
backtesting_*
generation_data_*
models/*.json
models/*.html
simulations/*
models/**/*.json
models/**/*.html
*.pyc
*.swp
temp.html
logs
.sync
dist/*
.idea
*.iml
simulations/sim_*.json
gen.*.bat
gen.*.sh

18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
language: node_js
node_js:
- "8"
- "9"
- '8'
- '9'
before_install:
- rm -rf package-lock.json
- npm install https://github.com/floatdrop/pinkie-promise.git
- npm install -g node-gyp
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then npm install -g greenkeeper-lockfile@1; fi
script:
- npm run lint
- npm test
after_success:
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then greenkeeper-lockfile-update; fi
after_script:
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then /bin/sh scripts/cron.sh; fi
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then greenkeeper-lockfile-upload; fi
env:
global:
secure: X5ZcoLrEavb26c1vY6L6hxmOtUGp07ta9jb0heU/9TkR0PCxBwqh1THHZIUO4qhOURSPXmBmajgMBDYzBgHpjd+5PrtF5mTqcRhXLpAbb9RQ0+H9VvTuwAWca6H7jG8RUS7zcV70u9de0zEmRFTX85iusPoIoqF2cafgsMtq6Gtx8rb+4WZ45Etn589RrOaehG2u1w+MW6vzohWpHY6hc3yqFWsKUfDdahWofdmH1SIpEgckbQ26LuaBMfqHeDPHtHsMfloHhukvmPzobBKJ7PuQWtJ/enuygY9ZjAX7NTgWEG7m5SLvJZ4PuVkc9ea0ZHMVB3L9bR2njbtBf4QnRhti/XyaNgBGqTsce52z3Z+3Hs9/Hktbb2KLJ2Jid3nwhoUmYr5HTRPkkQ54gOgLFMshi4H+vr4s+MMcfHQ6B0kjADenEf2vFcMwLCey/ERh52csqdlJviw9IJRa0YrSXc3krnlOVMPHnaOgKuU/hYyM3uj5CzG4iCmqOJG0sBtlrp+Q+q9kDtpNw+U/xRZzJ6+0XmFNtNLz762VCW6zs/zsaJ6livU6rSUOKyUo5v+5Ay6DOAjDe2NM3R7hymvhlWJh8SCLBJEDZsLbeN1pozDatOXsD2OWJnhHYfQbntekytoXy3fSrgZYuWJ6yL/S6R4Eo73XkoL2Bah8+aAhcEE=
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ FROM node:8
RUN mkdir -p /app
WORKDIR /app

COPY package.json /app/
COPY webpack.config.js /app/
COPY webpack-src /app/webpack-src
COPY templates /app/templates
COPY . /app
RUN npm install -g node-gyp
RUN npm install --unsafe-perm
RUN npm install --unsafe

COPY . /app
RUN ln -s /app/zenbot.sh /usr/local/bin/zenbot

ENV NODE_ENV production
Expand Down
22 changes: 14 additions & 8 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
Please go to Stack Overflow for help and support:
KINDLY READ AND ACT ON THE BELOW INFORMATION BEFORE FILING YOUR ISSUE!

https://stackoverflow.com/questions/tagged/zenbot
Please go to our Zenbot subreddit for questions, help and support:

[https://www.reddit.com/r/zenbot/](https://www.reddit.com/r/zenbot/)

If you open a GitHub issue, here is our policy:

1. It must be a bug or a feature request.
2. The form below must be filled out.

**Here's why we have that policy**: Zenbot developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals. GitHub also notifies hundreds of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
**Here's why we have that policy**: Zenbot developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals and rarely leads to bugfixes or useful enhancements. GitHub also notifies hundreds of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Reddit.

------------------------
Remove everything above before creating your issue.
------------------------

### System information
- **Have I written custom code (as opposed to using zenbot vanilla)**:
- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
- **Zenbot version**:
- **NodeJS version**:
- **Python version**:
- **Exact command to reproduce**:
- **Zenbot version** (commit ref, or version):
- **Zenbot branch**:
- **NodeJS version**:
- **Python version (when using a python script)**:
- **Exact command to reproduce (include everything)**:
- **Did I make any changes to conf-sample.js?**:

### Describe the problem
Describe the problem clearly here. Be sure to convey here why it's a bug in Zenbot or a feature request.

### Source code / logs
### Source code / Error logs
Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Carlos Rodriguez
Copyright (c) 2018 Carlos Rodriguez

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 6307098

Please sign in to comment.