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

Jump to bottom

WIP: Restore tomopy example. #112

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

WIP: Restore tomopy example. #112

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7de33b7
Fix build by removing tomopy dependency for now.
danielballan Jul 1, 2019
b5796c6
No need for special doctr branch.
danielballan Jul 1, 2019
6681e6c
WIP: Get tomopy installed in Travis.
danielballan Jul 1, 2019
8bea0bd
Update .travis.yml
danielballan Jul 1, 2019
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
21 changes: 19 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,33 @@ sudo: false
env:
global:
- secure: "Y6tBB5CwAxaHPxLzwyyoQKXEwLK68ni8GqzoaYCYbrjLhSFqEDCk6Si7UPmMoED8t7hyxFZofPfEpmOLBoronWUQycnB/K/oxYFfKyEXxNxGpY/iaQk/XCC6rkJ3g863QKdAsgobBgJIClDczZ7leY3RlN+mHfH0wohCBLFAh0E="
addons:
apt:
sources:
# https://apt.repos.intel.com/setup/intelproducts.list
- sourceline: deb https://apt.repos.intel.com/intelpython binary/
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
- sourceline: deb https://apt.repos.intel.com/mkl all main
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
- sourceline: deb https://apt.repos.intel.com/ipp all main
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
- sourceline: deb https://apt.repos.intel.com/tbb all main
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
- sourceline: deb https://apt.repos.intel.com/daal all main
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
- sourceline: deb https://apt.repos.intel.com/mpi all main
key_url: https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
packages:
- intel-mkl-2018.2-046 # needed for tomopy

install:
- pip install -q -r requirements.txt
- pip install skbuild # build dep for tomopy
danielballan marked this conversation as resolved.
Show resolved Hide resolved
- pip install git+https://github.com/tomopy/tomopy
- ls -alF /home/travis/virtualenv/python3.6.3/lib/
- export LD_LIBRARY_PATH="/home/travis/virtualenv/python3.6.3/lib/":$LD_LIBRARY_PATH

script:
- set -e
- make html
- pip uninstall -y doctr
- pip install git+https://github.com/danielballan/doctr@other-master
- doctr deploy --deploy-repo NSLS-II/NSLS-II.github.io --deploy-branch-name master .
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ numexpr # for gallery example
numpy # for gallery example
numpydoc
ophyd
pandas # for tomopy
path.py
pillow # required by sphinx-gallery
pyepics
Expand Down
168 changes: 0 additions & 168 deletions source/_cookbook/live_recon.py
View file
Open in desktop

This file was deleted.