Skip to content

Commit

Permalink
Merge pull request #21 from TaylorOshan/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
TaylorOshan committed Jul 23, 2019
2 parents 9121632 + ca52940 commit 90d3ae8
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 29 deletions.
37 changes: 19 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
language: python
sudo: false
dist: xenial
sudo: true
branches:
only:
- master
only:
- master
python:
- "3.5"
- "3.6"
- 3.6
- 3.7

env:
- PYSAL_PLUS=false
- PYSAL_PLUS=true
- PYSAL_PYPI=true #testing on dependencies libpysal, esda, mapcalssify on pypi
- PYSAL_PYPI=false

matrix:
allow_failures:
- python: 3.5
env: PYSAL_PYPI=false
- python: 3.6
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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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
24 changes: 18 additions & 6 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion spint/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 90d3ae8

Please sign in to comment.