Skip to content

Commit

Permalink
Merge pull request #358 from jGaboardi/attempt_binder2
Browse files Browse the repository at this point in the history
Attempt binder2
  • Loading branch information
jGaboardi committed Jan 1, 2020
2 parents 825ef49 + 3b8c1b1 commit 8e29a4f
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 52 deletions.
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ matrix:
env: PY=3.7 PYSAL_PYPI=true PYSAL_PLUS=true
- name: "tarball-pypi"
env: PY=3.7 PYSAL_PYPI=true PYSAL_PLUS=false
- name: "tarball-pypi-plus"
env: PY=3.7 PYSAL_PYPI=true PYSAL_PLUS=true
- name: "python-3.6"
env: PY=3.6 PYSAL_PYPI=false PYSAL_PLUS=false
- name: "python-3.6-plus"
Expand All @@ -23,10 +21,6 @@ matrix:
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=false
- name: "python-3.7-plus"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=true
- name: "tarball"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=false
- name: "tarball-plus"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=true
allow_failures:
- name: "python-3.6"
env: PY=3.6 PYSAL_PYPI=false PYSAL_PLUS=false
Expand All @@ -36,10 +30,6 @@ matrix:
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=false
- name: "python-3.7-plus"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=true
- name: "tarball"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=false
- name: "tarball-plus"
env: PY=3.7 PYSAL_PYPI=false PYSAL_PLUS=true

before_install:
- |
Expand Down
4 changes: 2 additions & 2 deletions docs/_sources/notebooks/Advanced_spaghetti_tutorial.ipynb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/2697ff11933bb0ea8b94c4326a540453"
"nbviewer_url": ""
},
"anaconda-cloud": {},
"extensions": {
Expand All @@ -1358,7 +1358,7 @@
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Network_Usage.ipynb",
"description": "",
"public": true
},
"id": "2697ff11933bb0ea8b94c4326a540453"
Expand Down
4 changes: 2 additions & 2 deletions docs/_sources/notebooks/Use_case-facility_location.ipynb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3170,11 +3170,11 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/a671d31a796e06d9df669d018d5b66ba"
"nbviewer_url": ""
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Facility_Location.ipynb",
"description": "",
"public": true
},
"id": "a671d31a796e06d9df669d018d5b66ba"
Expand Down
4 changes: 2 additions & 2 deletions docs/notebooks/Advanced_spaghetti_tutorial.html
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,9 @@
}
</style>
<div class="admonition note">
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/blob/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb">blob/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb</a>.
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/tree/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb">tree/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb</a>.
Interactive online version:
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=blob/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=tree/master/docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
</div>
<hr class="docutils" />
<p><strong>If any part of this notebook is used in your research, please cite with the reference found in</strong> <a class="reference external" href="https://github.com/pysal/spaghetti#bibtex-citation">README.md</a><strong>.</strong></p>
Expand Down
4 changes: 2 additions & 2 deletions docs/notebooks/Basic_spaghetti_tutorial.html
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@
}
</style>
<div class="admonition note">
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/blob/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb">blob/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb</a>.
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/tree/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb">tree/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb</a>.
Interactive online version:
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=blob/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=tree/master/docsrc/notebooks/Basic_spaghetti_tutorial.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
</div>
<hr class="docutils" />
<p><strong>If any part of this notebook is used in your research, please cite with the reference found in</strong> <a class="reference external" href="https://github.com/pysal/spaghetti#bibtex-citation">README.md</a><strong>.</strong></p>
Expand Down
4 changes: 2 additions & 2 deletions docs/notebooks/Use_case-facility_location.html
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,9 @@
}
</style>
<div class="admonition note">
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/blob/master/docsrc/notebooks/Use_case-facility_location.ipynb">blob/master/docsrc/notebooks/Use_case-facility_location.ipynb</a>.
<p>This page was generated from <a class="reference external" href="https://github.com/pysal/spaghetti/tree/master/docsrc/notebooks/Use_case-facility_location.ipynb">tree/master/docsrc/notebooks/Use_case-facility_location.ipynb</a>.
Interactive online version:
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=blob/master/docsrc/notebooks/Use_case-facility_location.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
<span class="raw-html"><a href="https://mybinder.org/v2/gh/pysal/spaghetti/master?filepath=tree/master/docsrc/notebooks/Use_case-facility_location.ipynb"><img alt="Binder badge" src="https://mybinder.org/badge_logo.svg" style="vertical-align:text-bottom"></a></span></p>
</div>
<hr class="docutils" />
<p><strong>If any part of this notebook is used in your research, please cite with the reference found in</strong> <a class="reference external" href="https://github.com/pysal/spaghetti#bibtex-citation">README.md</a><strong>.</strong></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/searchindex.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docsrc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def setup(app):

# This is processed by Jinja2 and inserted before each notebook
nbsphinx_prolog = r"""
{% set docname = env.doc2path(env.docname, base='blob/master/docsrc/') %}
{% set docname = env.doc2path(env.docname, base='tree/master/docsrc/') %}
.. only:: html
Expand Down
4 changes: 2 additions & 2 deletions docsrc/notebooks/Advanced_spaghetti_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/2697ff11933bb0ea8b94c4326a540453"
"nbviewer_url": ""
},
"anaconda-cloud": {},
"extensions": {
Expand All @@ -1358,7 +1358,7 @@
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Network_Usage.ipynb",
"description": "",
"public": true
},
"id": "2697ff11933bb0ea8b94c4326a540453"
Expand Down
4 changes: 2 additions & 2 deletions docsrc/notebooks/Use_case-facility_location.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -3170,11 +3170,11 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/a671d31a796e06d9df669d018d5b66ba"
"nbviewer_url": ""
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Facility_Location.ipynb",
"description": "",
"public": true
},
"id": "a671d31a796e06d9df669d018d5b66ba"
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ dependencies:
- seaborn
- pip:
- ortools
- "--editable=git+https://github.com/pysal/spaghetti.git@master"
4 changes: 2 additions & 2 deletions notebooks/Advanced_spaghetti_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/2697ff11933bb0ea8b94c4326a540453"
"nbviewer_url": ""
},
"anaconda-cloud": {},
"extensions": {
Expand All @@ -1358,7 +1358,7 @@
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Network_Usage.ipynb",
"description": "",
"public": true
},
"id": "2697ff11933bb0ea8b94c4326a540453"
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Use_case-facility_location.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -3170,11 +3170,11 @@
],
"metadata": {
"_draft": {
"nbviewer_url": "https://gist.github.com/a671d31a796e06d9df669d018d5b66ba"
"nbviewer_url": ""
},
"gist": {
"data": {
"description": "spaghetti/notebooks/Facility_Location.ipynb",
"description": "",
"public": true
},
"id": "a671d31a796e06d9df669d018d5b66ba"
Expand Down
22 changes: 0 additions & 22 deletions readthedocs.yml

This file was deleted.

0 comments on commit 8e29a4f

Please sign in to comment.