Skip to content

Commit

Permalink
Merge pull request #540 from jGaboardi/libpysal_req
Browse files Browse the repository at this point in the history
Libpysal req
  • Loading branch information
jGaboardi committed Oct 25, 2020
2 parents 0cc13b8 + 9fa984f commit 1add1ee
Show file tree
Hide file tree
Showing 39 changed files with 79 additions and 81 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Using `conda`, `spaghetti` can be installed as follows:
$ conda config --set channel_priority strict
$ conda install --channel conda-forge spaghetti
```
Also, `geopandas` provides [a nice example](https://geopandas.org/install.html#creating-a-new-environment) to create a fresh environment for working with spatial data.
Also, `geopandas` provides [a nice example](https://geopandas.readthedocs.io/en/latest/getting_started/install.html#creating-a-new-environment) to create a fresh environment for working with spatial data.

**Installing with [`PyPI`](https://pypi.org/project/spaghetti/)**
```
Expand All @@ -66,15 +66,16 @@ $ pip install git+https://github.com/pysal/spaghetti

## Requirements

- [`esda`](https://esda.readthedocs.io/en/latest/)
- [`libspatialindex`](https://libspatialindex.org/index.html)
- [`esda`](https://pysal.org/esda/)
- [`libpysal`](https://pysal.org/libpysal/)
- [`libspatialindex`](https://libspatialindex.org/en/latest/)
- [`numpy`](https://numpy.org/devdocs/)
- [`rtree`](http://toblerity.org/rtree/install.html)
- [`rtree`](https://rtree.readthedocs.io/en/latest/)
- [`scipy`](http://scipy.github.io/devdocs/)

## Soft Dependencies

- [`geopandas`](http://geopandas.org/install.html)
- [`geopandas`](https://geopandas.readthedocs.io/en/latest/index.html)
- [`shapely`](https://shapely.readthedocs.io/en/latest/)

## Contribute
Expand Down Expand Up @@ -122,4 +123,3 @@ This project is/was partially funded through:
[<img align="middle" src="docs/_static/images/ardc_logo.png" width="150">](https://atlantardc.wordpress.com) Atlanta Research Data Center: [A Polygon-Based Approach to Spatial Network Allocation](https://atlantardc.files.wordpress.com/2018/05/ardc-newsletter_2018_2.pdf)

[<img align="middle" src="docs/_static/images/nsf_logo.png" width="100">](https://www.nsf.gov/index.jsp) National Science Foundation Award #1825768: [National Historical Geographic Information System](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1825768&HistoricalAwards=false)

2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 58d840357c14ebc84c3c7a5c3328e0c4
config: 56a8d604ecfb6bc5ded6444e7c6f8973
tags: 645f666f9bcd5a90fca523b33c5a78b7
4 changes: 2 additions & 2 deletions docs/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &#8212; spaghetti v1.5.2 Manual</title>
<title>Overview: module code &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -41,7 +41,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
9 changes: 4 additions & 5 deletions docs/_modules/spaghetti/network.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.network &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.network &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../../_static/pysal-styles.css" />
Expand Down Expand Up @@ -41,7 +41,7 @@
</button>
<a class="navbar-brand" href="../../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down Expand Up @@ -1010,8 +1010,7 @@ <h1>Source code for spaghetti.network</h1><div class="highlight"><pre>

<span class="sd"> &gt;&gt;&gt; w = ntw.contiguityweights(graph=False)</span>

<span class="sd"> Using the ``W`` object, access to</span>
<span class="sd"> `esda &lt;https://esda.readthedocs.io/en/latest/index.html&gt;`_</span>
<span class="sd"> Using the ``W`` object, access to `esda &lt;https://pysal.org/esda/&gt;`_</span>
<span class="sd"> functionality is provided. First, a vector of attributes is</span>
<span class="sd"> created for all edges with observations.</span>

Expand All @@ -1030,7 +1029,7 @@ <h1>Source code for spaghetti.network</h1><div class="highlight"><pre>
<span class="sd"> 3.0</span>

<span class="sd"> Next, a standard call to</span>
<span class="sd"> `esda.Moran &lt;https://esda.readthedocs.io/en/latest/generated/esda.Moran.html#esda.Moran&gt;`_</span>
<span class="sd"> `esda.Moran &lt;https://pysal.org/esda/generated/esda.Moran.html#esda.Moran&gt;`_</span>
<span class="sd"> is made and the result placed into ``res``.</span>

<span class="sd"> &gt;&gt;&gt; res = esda.moran.Moran(y, w, permutations=99)</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/installation.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ You can also fork_ the `pysal/spaghetti`_ repo and create a local clone of your
.. _3.7: https://docs.python.org/3.7/
.. _3.8: https://docs.python.org/3.8/
.. _spaghetti-feedstock: https://github.com/conda-forge/spaghetti-feedstock
.. _a nice example: https://geopandas.org/install.html#creating-a-new-environment
.. _a nice example: https://geopandas.readthedocs.io/en/latest/getting_started/install.html#creating-a-new-environment
.. _conda: https://docs.conda.io/en/latest/
.. _conda-forge: https://conda-forge.org
.. _Anaconda Distribution: https://docs.continuum.io/anaconda/
Expand Down
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.5.2',
VERSION: '1.5.3',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
4 changes: 2 additions & 2 deletions docs/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>API reference &#8212; spaghetti v1.5.2 Manual</title>
<title>API reference &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
9 changes: 4 additions & 5 deletions docs/generated/spaghetti.Network.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.Network &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.Network &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down Expand Up @@ -746,8 +746,7 @@ <h1>spaghetti.Network<a class="headerlink" href="#spaghetti-network" title="Perm
<div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">w</span> <span class="o">=</span> <span class="n">ntw</span><span class="o">.</span><span class="n">contiguityweights</span><span class="p">(</span><span class="n">graph</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
</pre></div>
</div>
<p>Using the <code class="docutils literal notranslate"><span class="pre">W</span></code> object, access to
<a class="reference external" href="https://esda.readthedocs.io/en/latest/index.html">esda</a>
<p>Using the <code class="docutils literal notranslate"><span class="pre">W</span></code> object, access to <a class="reference external" href="https://pysal.org/esda/">esda</a>
functionality is provided. First, a vector of attributes is
created for all edges with observations.</p>
<div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">w</span> <span class="o">=</span> <span class="n">ntw</span><span class="o">.</span><span class="n">contiguityweights</span><span class="p">(</span><span class="n">graph</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
Expand All @@ -766,7 +765,7 @@ <h1>spaghetti.Network<a class="headerlink" href="#spaghetti-network" title="Perm
</pre></div>
</div>
<p>Next, a standard call to
<a class="reference external" href="https://esda.readthedocs.io/en/latest/generated/esda.Moran.html#esda.Moran">esda.Moran</a>
<a class="reference external" href="https://pysal.org/esda/generated/esda.Moran.html#esda.Moran">esda.Moran</a>
is made and the result placed into <code class="docutils literal notranslate"><span class="pre">res</span></code>.</p>
<div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">res</span> <span class="o">=</span> <span class="n">esda</span><span class="o">.</span><span class="n">moran</span><span class="o">.</span><span class="n">Moran</span><span class="p">(</span><span class="n">y</span><span class="p">,</span> <span class="n">w</span><span class="p">,</span> <span class="n">permutations</span><span class="o">=</span><span class="mi">99</span><span class="p">)</span>
<span class="gp">&gt;&gt;&gt; </span><span class="nb">type</span><span class="p">(</span><span class="n">res</span><span class="p">)</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.Network.loadnetwork.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.Network.loadnetwork &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.Network.loadnetwork &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.Network.savenetwork.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.Network.savenetwork &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.Network.savenetwork &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.PointPattern.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.PointPattern &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.PointPattern &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.element_as_gdf.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.element_as_gdf &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.element_as_gdf &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.extract_component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.extract_component &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.extract_component &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.regular_lattice.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.regular_lattice &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.regular_lattice &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/spaghetti.spanning_tree.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti.spanning_tree &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti.spanning_tree &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Index &#8212; spaghetti v1.5.2 Manual</title>
<title>Index &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="_static/pysal-styles.css" />
Expand Down Expand Up @@ -41,7 +41,7 @@
</button>
<a class="navbar-brand" href="index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spaghetti &#8212; spaghetti v1.5.2 Manual</title>
<title>spaghetti &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="_static/pysal-styles.css" />
Expand Down Expand Up @@ -42,7 +42,7 @@
</button>
<a class="navbar-brand" href="#">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Installation &#8212; spaghetti v1.5.2 Manual</title>
<title>Installation &#8212; spaghetti v1.5.3 Manual</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="_static/pysal-styles.css" />
Expand Down Expand Up @@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.5.2</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.5.3</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down Expand Up @@ -153,7 +153,7 @@ <h2>Installing with <code class="docutils literal notranslate"><span class="pre"
$ conda install --channel conda-forge spaghetti
</pre></div>
</div>
<p>Also, <code class="docutils literal notranslate"><span class="pre">geopandas</span></code> provides <a class="reference external" href="https://geopandas.org/install.html#creating-a-new-environment">a nice example</a> to create a fresh environment for working with spatial data.</p>
<p>Also, <code class="docutils literal notranslate"><span class="pre">geopandas</span></code> provides <a class="reference external" href="https://geopandas.readthedocs.io/en/latest/getting_started/install.html#creating-a-new-environment">a nice example</a> to create a fresh environment for working with spatial data.</p>
</div>
<div class="section" id="installing-with-python-package-index">
<h2>Installing with <a class="reference external" href="https://pypi.org/project/spaghetti/">Python Package Index</a><a class="headerlink" href="#installing-with-python-package-index" title="Permalink to this headline"></a></h2>
Expand Down

0 comments on commit 1add1ee

Please sign in to comment.