From 3773d05e2798c8dfb1e9818e0c05f852e8e268dc Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:02:49 -0400 Subject: [PATCH 1/7] updated supported python versions --- doc/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.rst b/doc/installation.rst index 3cb61781..eeab65c7 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -1,6 +1,6 @@ .. Installation -spaghetti supports python `3.5`_ and `3.6`_ only. Please make sure that you are +spaghetti supports python `3.6`_ and `3.7`_ only. Please make sure that you are operating in a python 3 environment. Installation From ef1b4ff0ae8367a1f16b7bf3d18f83979c7ff888 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:03:47 -0400 Subject: [PATCH 2/7] updated supported python version links --- doc/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.rst b/doc/installation.rst index eeab65c7..953f6d5d 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -33,8 +33,8 @@ to `pysal/spaghetti`_, you can contribute to the giddy development. | -.. _3.5: https://docs.python.org/3.5/ .. _3.6: https://docs.python.org/3.6/ +.. _3.7: https://docs.python.org/3.6/ .. _Python Package Index: https://pypi.org/project/spaghetti/ .. _pysal/spaghetti: https://github.com/pysal/spaghetti .. _fork: https://help.github.com/articles/fork-a-repo/ \ No newline at end of file From ad09584148a0161fcb4cffe6ecb44cac7e8a87ec Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:05:19 -0400 Subject: [PATCH 3/7] add conda-forge link --- doc/installation.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/installation.rst b/doc/installation.rst index 953f6d5d..da733ba0 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -14,6 +14,9 @@ Install the latest stable of spaghetti from the `Python Package Index`_ with $ pip install spaghetti +Install the latest stable of spaghetti via `conda-forge`_ by running: + + or download the source distribution (``.tar.gz``) and decompress it to your selected destination. Open a command shell and navigate to the decompressed folder:: @@ -36,5 +39,6 @@ to `pysal/spaghetti`_, you can contribute to the giddy development. .. _3.6: https://docs.python.org/3.6/ .. _3.7: https://docs.python.org/3.6/ .. _Python Package Index: https://pypi.org/project/spaghetti/ +.. _conda-forge: https://github.com/conda-forge/spaghetti-feedstock .. _pysal/spaghetti: https://github.com/pysal/spaghetti .. _fork: https://help.github.com/articles/fork-a-repo/ \ No newline at end of file From 09e958bb6f3855c8345002467181c39cb07f8582 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:05:53 -0400 Subject: [PATCH 4/7] add conda-forge install instruct --- doc/installation.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/installation.rst b/doc/installation.rst index da733ba0..d9d214d1 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -16,6 +16,7 @@ Install the latest stable of spaghetti from the `Python Package Index`_ with Install the latest stable of spaghetti via `conda-forge`_ by running: + $ conda install --channel conda-forge spaghetti or download the source distribution (``.tar.gz``) and decompress it to your selected destination. Open a command shell and navigate to the decompressed From 98ab477de91244d71eb5af00c7a034eedbd18e04 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:11:58 -0400 Subject: [PATCH 5/7] update conda-forge install instruct --- doc/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.rst b/doc/installation.rst index d9d214d1..04cd1e81 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -14,7 +14,7 @@ Install the latest stable of spaghetti from the `Python Package Index`_ with $ pip install spaghetti -Install the latest stable of spaghetti via `conda-forge`_ by running: +Install the latest stable of spaghetti via `conda-forge`_ by running:: $ conda install --channel conda-forge spaghetti From c35b8e887b7797c8160fe0fa3d52e244f16134c2 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:12:13 -0400 Subject: [PATCH 6/7] adding citation information --- doc/index.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/index.rst b/doc/index.rst index 3503d4db..7d6f6156 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -51,6 +51,23 @@ the analysis of network events. +Citing spaghetti +---------------- + +If you use PySAL-spaghetti in a scientific publication, we would appreciate citations to the following paper: + + Bibtex entry:: + + @misc{Gaboardi2018, + author = {Gaboardi, James D. and Laura, Jay and Rey, Sergio and Wolf, Levi John and Folch, David C. and Kang, Wei and Stephens, Philip and Schmidt, Charles}, + month = {oct}, + year = {2018}, + title = {pysal/spaghetti}, + url = {https://github.com/pysal/spaghetti}, + keywords = {graph-theory,network-analysis,python,spatial-networks,topology} + } + + .. toctree:: :hidden: :maxdepth: 3 From 91f4d868a8688d9f737a2ee9ed73ed22c0045f0f Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 13 May 2019 18:58:08 -0400 Subject: [PATCH 7/7] py3.6 --> 3.7 link --- doc/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.rst b/doc/installation.rst index 04cd1e81..a1698c1c 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -38,7 +38,7 @@ to `pysal/spaghetti`_, you can contribute to the giddy development. | .. _3.6: https://docs.python.org/3.6/ -.. _3.7: https://docs.python.org/3.6/ +.. _3.7: https://docs.python.org/3.7/ .. _Python Package Index: https://pypi.org/project/spaghetti/ .. _conda-forge: https://github.com/conda-forge/spaghetti-feedstock .. _pysal/spaghetti: https://github.com/pysal/spaghetti