From aaa293745bcd8a6df4565eabf901226adc4a5d8a Mon Sep 17 00:00:00 2001 From: TaylorOshan Date: Mon, 22 Jul 2019 18:57:36 -0400 Subject: [PATCH 1/5] update python version --- .travis.yml | 25 +++++++++++++------------ setup.py | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index af20ef4..42711d9 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,23 @@ language: python -sudo: false +dist: xenial +sudo: true branches: only: - master python: - - "3.5" - "3.6" + - "3.7" env: - - PYSAL_PLUS=false - - PYSAL_PLUS=true + - PYSAL_PYPI=false + - PYSAL_PYPI=true matrix: allow_failures: - - python: 3.5 - env: PYSAL_PYPI=false - python: 3.6 env: PYSAL_PYPI=false + - python: 3.7 + env: PYSAL_PYPI=false before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh @@ -34,13 +35,13 @@ install: - pip install https://github.com/pysal/splot/archive/master.zip - pip install -r requirements_tests.txt - if "$PYSAL_PYPI"; then - echo 'testing pypi libpysal spreg spglm' && pip install libpysal spreg spglm; + echo 'testing pypi libpysal spreg spglm'; else - echo 'testing git libpysal spreg'; - git clone https://github.com/pysal/libpysal.git; cd libpysal; pip install .; cd ../; - git clone https://github.com/pysal/spreg.git; cd spreg; pip install .; cd ../; - git clone https://github.com/pysal/spglm.git; cd spglm; pip install .; cd ../; - fi; + echo 'testing git libpysal spreg spglm'; + pip install https://github.com/pysal/libpysal/archive/master.zip; + pip install https://github.com/pysal/spreg/archive/master.zip; + pip install https://github.com/pysal/spglm/archive/master.zip; + fi; script: - python setup.py sdist >/dev/null diff --git a/setup.py b/setup.py index f859834..9bef2ba 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def setup_package(): url='https://github.com/pysal/spint', # github repo maintainer='Taylor M. Oshan', maintainer_email='tayoshan@gmail.com', - python_requires='>3.4', + python_requires='>3.5', test_suite='nose.collector', tests_require=['nose'], keywords='spatial statistics', @@ -48,8 +48,8 @@ def setup_package(): 'Topic :: Scientific/Engineering :: GIS', 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6' + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7' ], license='3-Clause BSD', packages=find_packages(), From 0d0daf2620978eb2c1d504ec6de94e1b82f4c770 Mon Sep 17 00:00:00 2001 From: TaylorOshan Date: Mon, 22 Jul 2019 19:03:54 -0400 Subject: [PATCH 2/5] update docs --- readthedocs.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/readthedocs.yml b/readthedocs.yml index ccf884a..0591894 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -1,7 +1,19 @@ +# Required +version: 2 + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: doc/conf.py + +# Optionally build your docs in additional formats such as PDF and ePub +formats: all + python: - version: 3.5 - setup_py_install: true - pip_install: true - extra_requirements: - - tests - - docs + version: 3.7 + install: + - requirements: requirements.txt + - method: pip + path: . + extra_requirements: + - tests + - docs From 3542b565e679e4eaae8f28f54c355426acd93d58 Mon Sep 17 00:00:00 2001 From: TaylorOshan Date: Mon, 22 Jul 2019 19:11:03 -0400 Subject: [PATCH 3/5] version bump --- MANIFEST.in | 2 +- spint/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 90ee6e7..6ad71c2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include LICENSE.txt MANIFEST.in requirements_docs.txt requirements_tests.txt requirements.txt +include LICENSE MANIFEST.in requirements_docs.txt requirements_tests.txt requirements.txt diff --git a/spint/__init__.py b/spint/__init__.py index e73123b..d5699f5 100644 --- a/spint/__init__.py +++ b/spint/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.0.4' +__version__ = '1.0.5' from .gravity import Gravity, Production, Attraction, Doubly from .utils import CPC, sorensen, srmse From dcb864cc66f09245affca088881b1bfb73b7b949 Mon Sep 17 00:00:00 2001 From: TaylorOshan Date: Mon, 22 Jul 2019 19:35:24 -0400 Subject: [PATCH 4/5] troubleshoot travis --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42711d9..60efaa2 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,22 @@ language: python dist: xenial sudo: true branches: -only: - - master + only: + - master python: - - "3.6" - - "3.7" + - 3.6 + - 3.7 env: + - PYSAL_PYPI=true #testing on dependencies libpysal, esda, mapcalssify on pypi - PYSAL_PYPI=false - - PYSAL_PYPI=true matrix: - allow_failures: - - python: 3.6 - env: PYSAL_PYPI=false - - python: 3.7 - env: PYSAL_PYPI=false + allow_failures: + - python: 3.6 + env: PYSAL_PYPI=false + - python: 3.7 + env: PYSAL_PYPI=false before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh From ca529405adbbac27789e58a6df3bf1359136c0d3 Mon Sep 17 00:00:00 2001 From: TaylorOshan Date: Mon, 22 Jul 2019 19:48:54 -0400 Subject: [PATCH 5/5] troubleshoot travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60efaa2..d70703e 100755 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,9 @@ install: echo 'testing pypi libpysal spreg spglm'; else echo 'testing git libpysal spreg spglm'; - pip install https://github.com/pysal/libpysal/archive/master.zip; - pip install https://github.com/pysal/spreg/archive/master.zip; - pip install https://github.com/pysal/spglm/archive/master.zip; + pip install https://github.com/pysal/libpysal/archive/master.zip; + pip install https://github.com/pysal/spreg/archive/master.zip; + pip install https://github.com/pysal/spglm/archive/master.zip; fi; script: