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

Commit 6307098

Browse files
committed
Merge remote-tracking branch 'origin/unstable'
2 parents 5ddbc60 + f226dfc commit 6307098

File tree

218 files changed

+25835
-12226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+25835
-12226
lines changed

.eslintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
scripts/auto_backtester/node_modules/*
2+
scripts/genetic_backtester/node_modules/*
3+
scripts/genetic_algo/node_modules/*
4+
dist
5+
templates/dashboard_assets/js/*

.eslintrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"env": {
33
"es6": true,
4-
"node": true
4+
"node": true,
5+
"jasmine": true,
6+
"browser": true
57
},
68
"extends": "eslint:recommended",
79
"rules": {
@@ -22,5 +24,11 @@
2224
"error",
2325
"never"
2426
]
27+
},
28+
"parserOptions": {
29+
"sourceType": "module",
30+
"ecmaFeatures": {
31+
"experimentalObjectRestSpread": true
32+
}
2533
}
2634
}

.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,22 @@ conf_*
1818
!conf-sample.js
1919
sim_result*
2020
trade_result*
21+
paper_result*
2122
*_test
2223
backtesting_*
2324
generation_data_*
24-
models/*.json
25-
models/*.html
25+
simulations/*
26+
models/**/*.json
27+
models/**/*.html
2628
*.pyc
2729
*.swp
2830
temp.html
2931
logs
3032
.sync
3133
dist/*
34+
.idea
35+
*.iml
36+
simulations/sim_*.json
37+
gen.*.bat
38+
gen.*.sh
39+

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
language: node_js
22
node_js:
3-
- "8"
4-
- "9"
3+
- '8'
4+
- '9'
55
before_install:
6-
- rm -rf package-lock.json
7-
- npm install https://github.com/floatdrop/pinkie-promise.git
86
- npm install -g node-gyp
7+
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then npm install -g greenkeeper-lockfile@1; fi
8+
script:
9+
- npm run lint
10+
- npm test
11+
after_success:
12+
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then greenkeeper-lockfile-update; fi
13+
after_script:
14+
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then /bin/sh scripts/cron.sh; fi
15+
- if [ "$TRAVIS_NODE_VERSION" = "9" ]; then greenkeeper-lockfile-upload; fi
16+
env:
17+
global:
18+
secure: X5ZcoLrEavb26c1vY6L6hxmOtUGp07ta9jb0heU/9TkR0PCxBwqh1THHZIUO4qhOURSPXmBmajgMBDYzBgHpjd+5PrtF5mTqcRhXLpAbb9RQ0+H9VvTuwAWca6H7jG8RUS7zcV70u9de0zEmRFTX85iusPoIoqF2cafgsMtq6Gtx8rb+4WZ45Etn589RrOaehG2u1w+MW6vzohWpHY6hc3yqFWsKUfDdahWofdmH1SIpEgckbQ26LuaBMfqHeDPHtHsMfloHhukvmPzobBKJ7PuQWtJ/enuygY9ZjAX7NTgWEG7m5SLvJZ4PuVkc9ea0ZHMVB3L9bR2njbtBf4QnRhti/XyaNgBGqTsce52z3Z+3Hs9/Hktbb2KLJ2Jid3nwhoUmYr5HTRPkkQ54gOgLFMshi4H+vr4s+MMcfHQ6B0kjADenEf2vFcMwLCey/ERh52csqdlJviw9IJRa0YrSXc3krnlOVMPHnaOgKuU/hYyM3uj5CzG4iCmqOJG0sBtlrp+Q+q9kDtpNw+U/xRZzJ6+0XmFNtNLz762VCW6zs/zsaJ6livU6rSUOKyUo5v+5Ay6DOAjDe2NM3R7hymvhlWJh8SCLBJEDZsLbeN1pozDatOXsD2OWJnhHYfQbntekytoXy3fSrgZYuWJ6yL/S6R4Eo73XkoL2Bah8+aAhcEE=

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ FROM node:8
33
RUN mkdir -p /app
44
WORKDIR /app
55

6-
COPY package.json /app/
7-
COPY webpack.config.js /app/
8-
COPY webpack-src /app/webpack-src
9-
COPY templates /app/templates
6+
COPY . /app
107
RUN npm install -g node-gyp
11-
RUN npm install --unsafe-perm
8+
RUN npm install --unsafe
129

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

1612
ENV NODE_ENV production

ISSUE_TEMPLATE.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
1-
Please go to Stack Overflow for help and support:
1+
KINDLY READ AND ACT ON THE BELOW INFORMATION BEFORE FILING YOUR ISSUE!
22

3-
https://stackoverflow.com/questions/tagged/zenbot
3+
Please go to our Zenbot subreddit for questions, help and support:
4+
5+
[https://www.reddit.com/r/zenbot/](https://www.reddit.com/r/zenbot/)
46

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

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

10-
**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.
12+
**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.
1113

14+
------------------------
15+
Remove everything above before creating your issue.
1216
------------------------
1317

1418
### System information
1519
- **Have I written custom code (as opposed to using zenbot vanilla)**:
1620
- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
17-
- **Zenbot version**:
18-
- **NodeJS version**:
19-
- **Python version**:
20-
- **Exact command to reproduce**:
21+
- **Zenbot version** (commit ref, or version):
22+
- **Zenbot branch**:
23+
- **NodeJS version**:
24+
- **Python version (when using a python script)**:
25+
- **Exact command to reproduce (include everything)**:
26+
- **Did I make any changes to conf-sample.js?**:
2127

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

25-
### Source code / logs
31+
### Source code / Error logs
2632
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.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 Carlos Rodriguez
3+
Copyright (c) 2018 Carlos Rodriguez
44

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

0 commit comments

Comments
 (0)