Skip to content

Commit

Permalink
[Versions] Adapt from OctoBot packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Herklos committed Mar 28, 2020
1 parent 04abeaa commit 590ec4d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ env:
- GH_REPO=Drakkar-Software/OctoBot-Evaluators
- DEPLOY_BRANCH=master
- PACKAGE_FOLDER=octobot_evaluators
- secure: JTbzCJ3CynlSJSFNkLNspASVEszBDy1BwkRym6IvVehE5SDM3wDanWwAD9t3ZjOJMt7H0pUojXwmVlg32tOOZbZ8pZIIFaMy2JlcQ7iPpAQE2TW5LEEtVbXZgSU2Siqq1nHCL3aH1ZxvYtRzofEhyBtpEXwPwI39C2e3/XfFqEyP8a1nlDYLmQKIEyUIGIAQ2DJmqroS9YgkVE6e+oeyCY6bcp95b2XRRAGF4YzRmhOJtqNjXz1OG5ME7h/KOLrmHe0Fu5j38etL8gjfYAXSrL41jO0a7PjfrVgHBjuoACwUjQ8yU0OHE4JhOeAwBR5k5lrtKGNrkZM5JbOnR9YHR7xBKG8mwRCI2juaSVeOFo8vNNMqVE7PDOJtT6RLBAFgli81Npfjk9RMctY9BDIKK2v5O3cB6NF6KXdJJTKudN2wrqCiUdQveTyWO/eK7M9NevVgoGDwx8WdtJ5sQwkb3vHJo3TH/+O1cInahbAi/rIIoIL4d1naJFQLmN2/upP3Is+U+fFB3mYsYpHa8TeRPtf94SrqszPIVFgRahcClcSvtBIj3Ft492/C2kBPBFaO2RdtoBlPXkJac16yZ88hbuCMfr0fVdKHV1CKEqCwWFeaUOR685EqYb8GBIR89LPzsdx0+NJpCk10GNxgXT4o95Qd6e/ni+kO/nlgzxJ6Gco=
- secure: VkXsqKTZAhfn6r6YlVZ3bOZjtnA5iOHGMioNTSMzowjikx8/rxGrgifzTVaos7we7Z5LOfx6shnkyyaaHuEJQrCIji+Qb1t3mayXM2YIIWhhQCJX1pcl+kIvx0A/fQ8twHSDhpT1KNtWqSg0ohbz5cBqziqyWjnOS33pH2Cbr1g/Pcb3BjI2y10rfCJjtUO3PB0RUehrt8qzEh5bEPvUWfd+j9Jk2t8ciw6CjfXmastd/thA6TxuD9lSqiWKxBfPeUTiRjeTGROO6BJPxU8e/9rlIO4AWs76zbe7yBsSTtPhVfnlabQwH8dMA5g9AaSpHFTNHzgwzpT2XrY/0Cxy+mYJJDpwDLUb7lDj2n4HdPxeWLQVtqy6+hT69p6rs+b4QVD4kKkDnKodmtFyTaz56+hkleXpmghfkm/pcoBcmQg2I07ETZuvoG4u1xFFiyPwlqH+2kJGHBYameVG/XLbZiq7FTKvsd7U482/SDp80HQtadgUYmBWZxlv5xdSxykgnTHz4OKOyGIEW4xGH6zsK2mu1z7eQZnJwXuAMzVOPV/qeEUoSSiWa0wy/02Ovrvsdi0Puop8xkEhvBkLhmAcMNg5+YEvsC7Fk/cvYfAYI3iQiz3cgH4ynT0liK40El5KJ7Z32RcA4tPfKL/uO9CGGKIy31oNbgI94QEpiuXFpCY=
- secure: VESfwztBU1VGr/9tnkClpdUQ+SYw0r0TIqox4Ad+SJ2W3G6vNC26KHZRYVbbQsCQuefiLfnPor55otx9JTcFJNM7mCUPS3fy1g4HeQ/PKzcT6Jt0nkMzUspiUG+ozl5bSS1WcyZZ6iPt6NGXYAfsbCiiBzsocLlYHbKMgDCzs7Y1LdbQ1/Zpd/peQp8BmHV6SGWMVJlbXLlAKGVPjx7djgmC3iBosKLY7p5LRO1h7nVt9z9V47Tav/3UrfrilXuiCwd0C4s8+dCLki6UB0hxCno0Bgkmje5os1tWapDtcKLbmIXjtcNbgvn6KqChAAuFpVXrdY1F8qtbbWuwDJyyNhDA96YkK/+hFRC+hGHUidoiPSN27QldkVrXArR0WJfTuGbzP1EIntEHdpN965zg2fU2uEwbRVCNgaiYjvF7UbN9gmozH+tjxBmVVgw8ZU56Uqew0qO4hEGmwInwIhRKM0YGew7Tdm+AihHlpyCa3byBi2g6jaROhYnAIOti0U901de6rQ+rLjFB3aAVq3ewgg2lg3JFIfJ3dkadp/QITs5UpiTNIBrwFAyM5U8YImMreVzZzfuHn6LVDv/NVCj2ClJWTHUo4ikoYDPM0Bj/QUA2VtpmF8IFs2yfwu9aW4EvSrlsdIRAon4sB0lm0CyYbqggHOHYTJtk9JmAsM7ZguE=
- secure: jk0K8ZmewZez4N9vYXAJtXk8YFzGQ7Nraix826Fqb/V4aDgA/dz5zMwcdtKWrypfMH6u3Pk1BirCQqoZUqYT3TKUx2A90ToBrvtqaT0qTtjinOy/NvkviyoPqMJkmjEMsDOLW2bAZiBGug5uoFk5dGTbNH7QF0iVLSWD3ODunElFtRT5M305UdYfoCo//UmPoUH2swTeVmsgpI4zYCSjLz1ypioclnQNU2PxaAhXwGWKUCd4IXNRysik5wsrRk77m064W4ZFR+6MeZ7pAhXFpx3spnXFHwDlp2Cot1ap/hWyMROP5BaIaEINrXKdwpbFQ9eKoqf6Nw2wuyLaxKiSvfR2n5rscmjrr0uDAQm4ioqCsc/TakM7XEWOv1AIzhE6JOrQcWOr9A/UEx/kZHefNyGIZ4F1yXeBZrVd0njY1QhHBj7hzzCpDV1DQudLBwGWDxgj/yv45O6CxXcbXVygn2YlroBM0mxkrS1i++dy+SwjvaXZQKsOJTcJwA88daNuQJBXS5gv0hh9we2MEbsZzCm2eFPo6+OTbk429i3awDGWCzjsC7Use6JjbekMZsb0qn6xNyH9qOhJwzNyJL2NQopC/AQT3Przke9EQUTyT2bq4vaHSSwWPzNG9lj8/c6iInyhOUSbemjmqwpC80BC1rks43n494FNCPa6d+nZlrc=

install:
- python3 -m pip install --prefer-binary -r dev_requirements.txt -r requirements.txt
Expand Down Expand Up @@ -44,9 +44,9 @@ matrix:
- ls
deploy:
- provider: pypi
user: "__token__"
user: __token__
password:
secure: HHlsEgI/sKI1iG5y571xXlokPZN6nwT4wCeG1oLFX6gEJTMnyWDq8wSiqaaIiOMcs6MWA/pQI6wf4yL0a2lXZMiNQIEC+Q64Iln1leNBXbDDsNYXPHPhsb2ZIPkVf2PFFIUCp+7kNQk7+h/5Px3wmoLs2WZbqy2vMHA4fGKwA3/xrwbjovQTJbDkonyZPzPCo30jsbl5jH/IzH1Lv2hn1xK7yS2w3y+iSV9tj2Wchcfz18OAVrb59PgaQptEzlKqujP6Khj6qV+04cTldzYh2Vd0kyYlSxmSN57EKYVyZfUkXCLm/AcJ55YfNwbrGslmPC/0g8rbmlMVGwB9cHQwBLARu3QwJZ7wW1PDiCXvJ2BTbeihh8dzOneGkgwfOe3HXD1F/7zA0I4NOuucPhcyD+EA3XVzFhNSqCOrK1E9D8pMqxn3c08+ORazdcebVojF7OAODxDOt1cldPwRjjflZ2AV6vOpZZvSKq43A9n3aXDnyTmzJF5y/Q1RjdmAgqb/bCchtUQ3COq5RA7BWtYCWnZURWy3lnjBB99G24v3dR2d1L730mjN72AIqx86bvKYU7YEiwz0ZTzlWaSXUjz78I7oDkYHuQwEnEeQ8AdA78+IJU3/lgac2XuRjkVr4MDwfJm52Y1GrayOC+JvFj9axVA6jgKOfk0WSN0qZwsTim8=
secure: FAYFAw/yxVHQH7qJ7m6CoueReiw8tF+BmWzlSO7vxnvtE8ptsLUjBG60VfDB4GSJFu2FKSnjayu+hWHNUSBI9VbCAJi8LlX0jIOjMXd2HxbDhXjSgNm6dQbIVFB6L89zBor66s6g3nQX7uuS1jJE6cgY/u/sHGctZU+TguJDdDDJj0JcWIh2FUoW7jhMplXErLtDLHNtyyG5AEsBAWuDcKZV0RNX8Bu2gerG4d6oszW6rhnVXYo3aAVScJ3K3XIloWuazmLYaxnOFCfHLRBBearusFZpxfqIQ/SV8m2IAM0wqzIufdC2UdgpGHU8N1oQ6L/Kq6VLKE35GqgJWLKOQDHnlbStYFvFs7eFpMgJXlhUrQGzH33kkCERrBqvYYDpFFyzyQVFyuFfR+7/jiLT/AEAUAYM8mIK4uJ9LpXPFKBce15ADMGrRo20azPGaZyG+X+da3hhDt2UpJ/01PYB4DKRwtkrE6Qwk27mRS4xVg8VEAeZwUve9zh246fL80ObzyAVEK8Hl8yjDf8+DRNoWGSpOTDTuVTEBvfNLic4cVslzXnfsgKdIPQeDq2l0vV5ajyJAAr87VnYq35KXEUwwmhfzxM4tcFC84uhvbkj0T0tWJUkBX1hduBaOplw+iaKnBIdiqvG4RG4hnk4WmnIZ3On4K+Ln4iJA2ZgNVS6GT0=
skip_cleanup: true
skip_existing: true
distributions: "sdist"
Expand Down
5 changes: 2 additions & 3 deletions octobot_evaluators/channels/matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,8 @@ async def new_consumer(self,
evaluator_name=CHANNEL_WILDCARD,
evaluator_type=CHANNEL_WILDCARD,
exchange_name=CHANNEL_WILDCARD,
time_frame=CHANNEL_WILDCARD,
filter_size=False):
consumer = MatrixChannelConsumer(callback, size=size, filter_size=filter_size)
time_frame=CHANNEL_WILDCARD):
consumer = MatrixChannelConsumer(callback, size=size)
await self._add_new_consumer_and_run(consumer,
matrix_id=matrix_id,
cryptocurrency=cryptocurrency,
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Setup requirements
cython==0.29.14
numpy==1.17.3
cython==0.29.16
numpy==1.18.2

# Drakkar-Software requirements
OctoBot-Channels>=1.3.17, <1.4
OctoBot-Commons>=1.2.1, <1.3
OctoBot-Channels>=1.3.22, <1.4
OctoBot-Commons>=1.3.5, <1.4
OctoBot-Tentacles-Manager==1.0.12

# Cryptocurrency trading
Expand Down
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.29.14', 'numpy>=1.17.3'])
dist.Distribution().fetch_build_eggs(['Cython>=0.29.16', 'numpy>=1.18.2'])

import numpy as np

Expand Down

0 comments on commit 590ec4d

Please sign in to comment.