From e7c5bbc1715c853fd5b82ead0399ca0bfd6011c9 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 19:34:53 -0500 Subject: [PATCH 1/6] make sure data set is downloaded for appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 8e08eeaf..13fa1218 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,4 +62,5 @@ test_script: # this uses condabin/conda.bat because of our PATH modification above - conda activate test - conda list + - python -c 'import libpysal; libpysal.examples.load_example("newHaven")' - pytest spaghetti -v From 66d3bb3717150082e07678c098732e0aff511ae0 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 20:43:38 -0500 Subject: [PATCH 2/6] adding appveyor badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aee10f0e..e04ad470 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Spaghetti is an open-source Python library for the analysis of network-based spa |:---:|:---:|:---:|:---:|:---:| |[![Downloads](https://pepy.tech/badge/spaghetti)](https://pepy.tech/project/spaghetti) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/spaghetti.svg)](https://anaconda.org/conda-forge/spaghetti) | [![Documentation](https://img.shields.io/static/v1.svg?label=docs&message=current&color=9cf)](http://pysal.org/spaghetti/) | [![GitHub issues closed](https://img.shields.io/github/issues-closed/pysal/spaghetti.svg?maxAge=3600)](https://github.com/pysal/spaghetti/issues) | [![Gitter](https://badges.gitter.im/pysal/Spaghetti.svg)](https://gitter.im/pysal/Spaghetti?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | ![Pypi python versions](https://img.shields.io/pypi/pyversions/spaghetti.svg) | [![Conda Recipe](https://img.shields.io/badge/recipe-spaghetti-red.svg)](https://github.com/conda-forge/spaghetti-feedstock) | [![codecov](https://codecov.io/gh/pysal/spaghetti/branch/master/graph/badge.svg)](https://codecov.io/gh/pysal/spaghetti) | ![Github pull requests open](https://img.shields.io/github/issues-pr/pysal/spaghetti.svg) | [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -| [![image](https://travis-ci.org/pysal/spaghetti.svg)](https://travis-ci.org/pysal/spaghetti) | ![conda arch](https://img.shields.io/conda/pn/conda-forge/spaghetti) | [![DOI](https://zenodo.org/badge/88305306.svg)](https://zenodo.org/badge/latestdoi/88305306) | ![Github pull requests closed](https://img.shields.io/github/issues-pr-closed/pysal/spaghetti.svg) | [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) +| [![image](https://travis-ci.org/pysal/spaghetti.svg)](https://travis-ci.org/pysal/spaghetti) | [![Build status](https://ci.appveyor.com/api/projects/status/eymi8wxdcmod95ge?svg=true)](https://ci.appveyor.com/project/pysal/spaghetti) | [![DOI](https://zenodo.org/badge/88305306.svg)](https://zenodo.org/badge/latestdoi/88305306) | ![Github pull requests closed](https://img.shields.io/github/issues-pr-closed/pysal/spaghetti.svg) | [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) Examples From 85df30df656160685b261742a48c5f9b8f17a492 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 20:47:22 -0500 Subject: [PATCH 3/6] moving newHaven import into tests --- spaghetti/tests/test_network.py | 3 +++ spaghetti/tests/test_network_api.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/spaghetti/tests/test_network.py b/spaghetti/tests/test_network.py index 15d43e79..5f20cae6 100644 --- a/spaghetti/tests/test_network.py +++ b/spaghetti/tests/test_network.py @@ -13,6 +13,9 @@ except ImportError: GEOPANDAS_EXTINCT = True +# fetch the New Haven dataset +examples.load_example("newHaven") + class TestNetwork(unittest.TestCase): def setUp(self): diff --git a/spaghetti/tests/test_network_api.py b/spaghetti/tests/test_network_api.py index 79701f50..f561f5ef 100644 --- a/spaghetti/tests/test_network_api.py +++ b/spaghetti/tests/test_network_api.py @@ -12,6 +12,9 @@ except ImportError: GEOPANDAS_EXTINCT = True +# fetch the New Haven dataset +examples.load_example("newHaven") + class TestNetwork(unittest.TestCase): def setUp(self): From 7356055114b0d0a7d6592ad40e2861ac28328ad1 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 20:48:00 -0500 Subject: [PATCH 4/6] removing newHaven import from testing .yml files --- .travis.yml | 1 - appveyor.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f458de45..0c62e3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ script: - python setup.py sdist >/dev/null - echo "check_stable=False" >spaghetti/config.py - python setup.py install - - python -c 'import libpysal; libpysal.examples.load_example("newHaven")' - py.test -v spaghetti --cov=spaghetti -v --doctest-modules --cov-report term-missing; notifications: diff --git a/appveyor.yml b/appveyor.yml index 13fa1218..8e08eeaf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,5 +62,4 @@ test_script: # this uses condabin/conda.bat because of our PATH modification above - conda activate test - conda list - - python -c 'import libpysal; libpysal.examples.load_example("newHaven")' - pytest spaghetti -v From 3f9bac1d4dbfb03888ff418f2543f08e13f78e22 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 21:01:49 -0500 Subject: [PATCH 5/6] miniconda version 3.7->3.8 in appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e08eeaf..fe0dc0a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,11 +23,11 @@ environment: ENV_FILE: "ci/travis/37-latest-conda-forge-GIT.yaml" - PYTHON_VERSION: "3.8" - MINICONDA: C:\Miniconda37-x64 + MINICONDA: C:\Miniconda38-x64 ENV_FILE: "ci/travis/38-latest-conda-forge-PYPI.yaml" - PYTHON_VERSION: "3.8" - MINICONDA: C:\Miniconda37-x64 + MINICONDA: C:\Miniconda38-x64 ENV_FILE: "ci/travis/38-latest-conda-forge-GIT.yaml" From 7f14ece6eefe8f1764bf745d3bd3b8ebc8ee6323 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Mon, 17 Feb 2020 21:26:41 -0500 Subject: [PATCH 6/6] miniconda must be v3.7 then upgrade to v3.8 in appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fe0dc0a6..8e08eeaf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,11 +23,11 @@ environment: ENV_FILE: "ci/travis/37-latest-conda-forge-GIT.yaml" - PYTHON_VERSION: "3.8" - MINICONDA: C:\Miniconda38-x64 + MINICONDA: C:\Miniconda37-x64 ENV_FILE: "ci/travis/38-latest-conda-forge-PYPI.yaml" - PYTHON_VERSION: "3.8" - MINICONDA: C:\Miniconda38-x64 + MINICONDA: C:\Miniconda37-x64 ENV_FILE: "ci/travis/38-latest-conda-forge-GIT.yaml"