Skip to content

Commit 7b48a2d

Browse files
sjsreysjsrey
authored
Merge pull request pysal#868 from sjsrey/rc1.12
Release 1.12.0
2 parents 952ea04 + f00cd64 commit 7b48a2d

File tree

169 files changed

+39672
-3739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+39672
-3739
lines changed

‎.travis.yml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@ branches:
44
only:
55
- master
66
python:
7-
- 2.7
8-
#- "2.6"
9-
- 3.4
10-
- 3.5
7+
- "2.7"
8+
- "3.4"
9+
- "3.5"
10+
11+
env:
12+
- PYSAL_PLUS=false
13+
- PYSAL_PLUS=true
1114

1215
before_install:
1316
- wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
1417
- chmod +x miniconda.sh
1518
- ./miniconda.sh -b -p ./miniconda
1619
- export PATH=`pwd`/miniconda/bin:$PATH
1720
- conda update --yes conda
21+
- conda config --add channels conda-forge
1822
- conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION
1923
- source activate test-env
20-
- chmod +x ./.travis_testing.sh
21-
- if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then rm -rf pysal/contrib; 2to3 -nw pysal/ > /dev/null; fi
24+
- if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then 2to3 -nw pysal/ > /dev/null; fi
2225

2326
install:
2427
- conda install --yes numpy scipy nose pip
28+
- if [ "$PYSAL_PLUS" == true ]; then
29+
echo 'plus testing'; conda install --yes --file requirements_plus.txt;
30+
else conda install --yes --file requirements.txt;
31+
fi;
2532
- pip install -r travis.txt
2633

2734
script:
28-
- python -c 'import numpy; print(numpy.__version__)'
29-
- python -c 'import scipy; print(scipy.__version__)'
30-
- python setup.py install >/dev/null
31-
- python -c 'import pysal'
32-
#- python -c 'import multiprocessing as mp; print mp.cpu_count()'
33-
#- pychecker --limit 1000 pysal
3435
- python setup.py sdist >/dev/null
35-
#- nosetests --processes=-1 --process-timeout=60 --verbosity=1 --ignore-files=collection --exclude-dir=pysal/contrib
36-
#- nosetests
3736
- echo "check_stable=False" >pysal/config.py
38-
- ./.travis_testing.sh
37+
- nosetests --with-coverage --cover-package=pysal;
3938
#- cd doc; make pickle; make doctest
4039
notifications:
4140
email:

‎.travis_testing.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then
2-
cd pysal; python -m 'nose';
2+
nosetests --with-coverage --cover-package=pysal --exclude-dir=pysal/contrib
33
else
44
nosetests --with-coverage --cover-package=pysal;
55
fi

‎CHANGELOG.txt‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,115 @@
1+
v<1.12.0>, 2016-09-21
2+
3+
We closed a total of 100 issues, 33 pull requests and 67 regular issues;
4+
this is the full list (generated with the script
5+
:file:`tools/github_stats.py`):
6+
7+
Pull Requests (33):
8+
9+
* :ghpull:`864`: addressing issue #845 and adding tests
10+
* :ghpull:`862`: Memory efficient Gini and tests
11+
* :ghpull:`865`: fix space/tab inconsistency
12+
* :ghpull:`861`: GSOC -SpInt
13+
* :ghpull:`847`: spatial interaction weights
14+
* :ghpull:`863`: B859
15+
* :ghpull:`860`: Incoprate updates to db driver and unittests
16+
* :ghpull:`858`: Dev mltest
17+
* :ghpull:`857`: Fix TabErrors, replace tabs with spaces
18+
* :ghpull:`856`: Make the output and build reproducible
19+
* :ghpull:`851`: fixed typo in test_network.py
20+
* :ghpull:`850`: [REBASE] Distance band speed ups
21+
* :ghpull:`843`: update and clean aesthetic of Network_Usage.ipynb
22+
* :ghpull:`842`: typo correction in network.py
23+
* :ghpull:`841`: [REBASE & REDIRECT] Conditional Database Imports & Docos, #692
24+
* :ghpull:`840`: minor bugfix to #816
25+
* :ghpull:`839`: documentation cleanup on network.analysis.py
26+
* :ghpull:`838`: network.util.py documentation cleanup
27+
* :ghpull:`836`: re: network.py documentation cleanup
28+
* :ghpull:`768`: Modified the way area of a ring is calculated to allow for more precision
29+
* :ghpull:`829`: numba autojit _fisher_jenks_means if numba is available
30+
* :ghpull:`832`: Handling a deprecation warning, and latex errors corrected.
31+
* :ghpull:`834`: Travis testing matrix
32+
* :ghpull:`831`: Refactoring Markov classes for efficiency
33+
* :ghpull:`827`: ESDA Tabular Functions
34+
* :ghpull:`823`: typo and format of docstring of user.py in weights module
35+
* :ghpull:`821`: Pdio
36+
* :ghpull:`817`: D/sur
37+
* :ghpull:`818`: Documentation fix + some PEP8 standardization
38+
* :ghpull:`811`: DistanceBand should correctly handle named weights
39+
* :ghpull:`808`: Dev
40+
* :ghpull:`807`: Updating contrib docs and bumping version for dev
41+
* :ghpull:`797`: working moran plot func
42+
43+
Issues (67):
44+
45+
* :ghissue:`855`: Inefficient Gini Coefficient calculation?
46+
* :ghissue:`864`: addressing issue #845 and adding tests
47+
* :ghissue:`862`: Memory efficient Gini and tests
48+
* :ghissue:`865`: fix space/tab inconsistency
49+
* :ghissue:`861`: GSOC -SpInt
50+
* :ghissue:`847`: spatial interaction weights
51+
* :ghissue:`859`: Wrong there is one disconnected observation (no neighbors)
52+
* :ghissue:`863`: B859
53+
* :ghissue:`860`: Incoprate updates to db driver and unittests
54+
* :ghissue:`858`: Dev mltest
55+
* :ghissue:`857`: Fix TabErrors, replace tabs with spaces
56+
* :ghissue:`854`: handle verication context for githubstats
57+
* :ghissue:`856`: Make the output and build reproducible
58+
* :ghissue:`851`: fixed typo in test_network.py
59+
* :ghissue:`850`: [REBASE] Distance band speed ups
60+
* :ghissue:`846`: DistanceBand speed ups
61+
* :ghissue:`843`: update and clean aesthetic of Network_Usage.ipynb
62+
* :ghissue:`842`: typo correction in network.py
63+
* :ghissue:`692`: Conditional Database Import / Docos
64+
* :ghissue:`841`: [REBASE & REDIRECT] Conditional Database Imports & Docos, #692
65+
* :ghissue:`769`: Windows 7, 64 bit installation issue with visual C++ for python
66+
* :ghissue:`816`: Exception TypeError in geoda_txt.py
67+
* :ghissue:`840`: minor bugfix to #816
68+
* :ghissue:`839`: documentation cleanup on network.analysis.py
69+
* :ghissue:`397`: integrate optimized contiguity builder
70+
* :ghissue:`531`: add user space function to generate numpy arrays
71+
* :ghissue:`654`: meta update for 2-3 conversion
72+
* :ghissue:`676`: Meta not importable from pysal
73+
* :ghissue:`838`: network.util.py documentation cleanup
74+
* :ghissue:`753`: Fix the network ring bug
75+
* :ghissue:`836`: re: network.py documentation cleanup
76+
* :ghissue:`768`: Modified the way area of a ring is calculated to allow for more precision
77+
* :ghissue:`837`: re: network.allneighbordistances() diagonal fill
78+
* :ghissue:`822`: two issues about function choropleth_map in viz module
79+
* :ghissue:`835`: fix deprecation warnings noted in #822
80+
* :ghissue:`829`: numba autojit _fisher_jenks_means if numba is available
81+
* :ghissue:`832`: Handling a deprecation warning, and latex errors corrected.
82+
* :ghissue:`834`: Travis testing matrix
83+
* :ghissue:`825`: Headbanging Median Rate ignores edge correction
84+
* :ghissue:`826`: Spatial Filtering grid definition
85+
* :ghissue:`824`: Direct Age Standardization fails for empty regions
86+
* :ghissue:`833`: PySAL+ optional testing matrix
87+
* :ghissue:`830`: [REBASED] PySAL+ optional testing matrix
88+
* :ghissue:`831`: Refactoring Markov classes for efficiency
89+
* :ghissue:`827`: ESDA Tabular Functions
90+
* :ghissue:`815`: rook case not working in ContiguityWeightsPolygons
91+
* :ghissue:`828`: Fisher_Jenks pure python implementation is too slow
92+
* :ghissue:`814`: Explore Classmethods for alternative constructors
93+
* :ghissue:`795`: switch to scipy.linalg instead of numpy.linalg
94+
* :ghissue:`799`: w_subset(weights:W, ids:np.ndarray) constructs faulty weights object
95+
* :ghissue:`823`: typo and format of docstring of user.py in weights module
96+
* :ghissue:`821`: Pdio
97+
* :ghissue:`794`: spreg ML_lag doesn't always set W in __init__
98+
* :ghissue:`754`: Update README
99+
* :ghissue:`819`: add LIMAs
100+
* :ghissue:`817`: D/sur
101+
* :ghissue:`818`: Documentation fix + some PEP8 standardization
102+
* :ghissue:`809`: Fixed documentation
103+
* :ghissue:`813`: w.remap_ids(ids) never sets w.id_order_set
104+
* :ghissue:`775`: Added a prototype for constructing weights from a list of shapely Polygons
105+
* :ghissue:`810`: DistanceBand fails to accept custom ids
106+
* :ghissue:`811`: DistanceBand should correctly handle named weights
107+
* :ghissue:`780`: Doctests failing on travis
108+
* :ghissue:`801`: ImportError: No module named scipy.spatial
109+
* :ghissue:`808`: Dev
110+
* :ghissue:`807`: Updating contrib docs and bumping version for dev
111+
* :ghissue:`797`: working moran plot func
112+
1113
v<1.11.2>, 2016-05-18
2114

3115
We closed a total of 20 issues, 6 pull requests and 14 regular issues;

‎doc/source/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
# built documents.
4646
#
4747
# The short X.Y version.
48-
version = '1.11.2'
48+
version = '1.12.0'
4949
# The full version, including alpha/beta/rc tags.
50-
release = '1.11.2'
50+
release = '1.12.0'
5151

5252
# The language for content autogenerated by Sphinx. Refer to documentation
5353
# for a list of supported languages.

‎doc/source/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PySAL
2020

2121
.. sidebar:: Releases
2222

23-
- `Stable 1.11.2 (Released 2016-5-18) <users/installation.html>`_
23+
- `Stable 1.12.0 (Released 2016-9-21) <users/installation.html>`_
2424
- `Development <http://github.com/pysal/pysal/tree/dev>`_
2525

2626
PySAL is an open source library of spatial analysis functions written in

‎doc/source/library/contrib/index.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,19 @@ Currently the following contribs are available:
6666
- Path: pysal.contrib.pdutilities
6767
- Requires: `pandas`_
6868

69-
8. Githooks -- Optional hooks for `git` to make development on `PySAL` easier
69+
8. Spatial Interaction -- Tools for spatial interaction (SpInt) modeling.
70+
71+
- .. versionadded:: 1.10
72+
- Path: pysal.contrib.spint
73+
- Requires: `pandas`_
74+
75+
9. Githooks -- Optional hooks for `git` to make development on `PySAL` easier
7076

7177
- .. versionadded:: 1.10
7278
- Path: pysal.contrib.githooks (Note: not importable)
7379
- Requires: `git`
7480

75-
9. Handler -- A model ingester to standardize model extension
81+
10. Handler -- A model ingester to standardize model extension
7682

7783
- .. versionadded:: 1.10
7884
- Path: pysal.contrib.handler

‎doc/source/library/spreg/index.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@
2626
ml_lag
2727
ml_lag_regimes
2828
sur
29+
sur_error
30+
sur_lag
2931

3032

‎doc/source/library/spreg/sur.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:mod:`spreg.sur` --- Seeming Unrelated Regression
2+
=================================================
3+
4+
The :mod:`spreg.sur` module provides SUR estimation.
5+
6+
.. versionadded:: 1.11
7+
8+
9+
.. automodule:: pysal.spreg.sur
10+
:synopsis: Code for spreg SUR
11+
:members:
12+

‎doc/source/library/spreg/sur_error.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:mod:`spreg.sur_error` --- Spatial Error Seeming Unrelated Regression
2+
=====================================================================
3+
4+
The :mod:`spreg.sur_error` module provides SUR estimation for spatial error model
5+
6+
.. versionadded:: 1.11
7+
8+
9+
.. automodule:: pysal.spreg.sur_error
10+
:synopsis: Code for spreg SUR error
11+
:members:
12+

‎doc/source/library/spreg/sur_lag.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:mod:`spreg.sur_lag` --- Spatial Lag Seeming Unrelated Regression
2+
=================================================================
3+
4+
The :mod:`spreg.sur_lag` module provides SUR estimation for spatial lag model
5+
6+
.. versionadded:: 1.11
7+
8+
9+
.. automodule:: pysal.spreg.sur_lag
10+
:synopsis: Code for spreg SUR lag
11+
:members:
12+

0 commit comments

Comments
 (0)