Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis Build showing success now, still script key needed to be added. #36

Merged
merged 1 commit into from
May 15, 2018
Merged

Travis Build showing success now, still script key needed to be added. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion candis/ios/pipeline/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
# imports - module imports
from candis.config import CONFIG
from candis.ios import cdata
from candis.ios import pipeline
from candis.ios import json as JSON
from candis.util import assign_if_none, get_rand_uuid_str, get_b64_plot, buffer_to_b64

Expand Down
6 changes: 3 additions & 3 deletions get-candis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ def get_candis():

Rscript = which('Rscript', raise_err = True)
popen(Rscript, 'setup.R', dir = osp.join(appdir, 'R'))

s
python3 = which('python3', raise_err = True)
pip3 = which('pip3', raise_err = True)

popen(pip3, 'install', '--upgrade', 'pip')

popen(pip3, 'install', 'numpy') # Thanks, javabridge.
popen(pip3, 'install', '-r', 'requirements.txt', dir = appdir)
popen(pip3, 'install', '-r', 'requirements-dev.txt', dir = appdir, raise_err = False)
popen(pip3, 'install', '--ignore-installed', '-r', 'requirements.txt', dir = appdir)
# popen(pip3, 'install', '-r', 'requirements-dev.txt', dir = appdir, raise_err = False)

# Force matplotlib backend for macOS
if sys.platform == 'darwin':
Expand Down
5 changes: 4 additions & 1 deletion package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
from setuptools import find_packages

# imports - third-party imports
from pip.req import parse_requirements
try: # for pip >= 10
from pip._internal.req import parse_requirements
except ImportError: # for pip <= 9.0.3
from pip.req import parse_requirements

# Python 2
try:
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ nbformat==4.4.0
notebook==5.4.0
numpy==1.14.0
packaging==16.8
pandas==0.22.0
# pandas==0.22.0
pandas; python_version >= '3.5'
pandas<0.21; python_version == '3.4'
pandocfilters==1.4.2
parso==0.1.1
pexpect==4.4.0
Expand Down