Skip to content

Commit b8c3d05

Browse files
authored
Merge pull request #582 from Sage-Bionetworks/develop
Develop
2 parents 90a37c9 + 68e4066 commit b8c3d05

Some content is hidden

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

71 files changed

+21689
-3
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
*.pyc
22
*.egg-info
33
pypi.info.txt
4-
build
54
dist
65
virtualenvs
76
examples_temp
87
.DS_Store
98
deploy.sh
109

11-
doc/_build
1210
junk/
1311
nose.cfg
1412
notes.md
@@ -17,4 +15,6 @@ examples/
1715
jenkins/
1816

1917
.idea/*
18+
docs/build/doctrees/*
19+
docs/build/html/_sources/*
2020

docs/.nojekyll

Whitespace-only changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

doc/Makefile renamed to docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
77
PAPER =
8-
BUILDDIR = _build
8+
BUILDDIR = build
99

1010
# User-friendly check for sphinx-build
1111
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
File renamed without changes.

0 commit comments

Comments
 (0)