Skip to content

Commit 29f85b8

Browse files
committed
Merge pull request pysal#783 from sjsrey/release-1.11.1
Release 1.11.1
2 parents 26c23b0 + a952b79 commit 29f85b8

37 files changed

+1668
-1653
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Thank you for your interest in contributing! We work primarily on Github. Please
2+
review the [contributing procedures](https://github.com/pysal/pysal/wiki/GitHub-Standard-Operating-Procedures) so that we can accept your contributions! Alternatively, contact someone in the [development chat channel](https://gitter.im/pysal.pysal).

.github/ISSUE_TEMPLATE.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Thank you for filing this issue! To help troubleshoot this issue, please follow
2+
the following directions to the best of your ability before submitting an issue.
3+
Feel free to delete this text once you've filled out the relevant requests.
4+
5+
Please include the output of the following in your issue submission. If you don't know how to provide the information, commands to get the relevant information from the Python interpreter will follow each bullet point.
6+
7+
Feel free to delete the commands after you've filled out each bullet.
8+
9+
- Platform information:
10+
```python
11+
>>> import os; print(os.name, os.sys.platform);print(os.uname())
12+
```
13+
- Python version:
14+
```python
15+
>>> import sys; print(sys.version)
16+
```
17+
- SciPy version:
18+
```python
19+
>>> import scpiy; print(scipy.__version__)
20+
```
21+
- NumPy version:
22+
```python
23+
>>> import numpy; print(numpy.__version__)
24+
```
25+
26+
Also, please upload any relevant data as [a file
27+
attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/). Please **do not** upload pickled objects, since it's nearly impossible to troubleshoot them without replicating your exact namespace. Instead, provide the minimal subset of the data required to replicate the problem. If it makes you more comfortable submitting the issue, feel free to:
28+
29+
1. remove personally identifying information from data or code
30+
2. provide only the required subset of the full data or code

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Hello! Please make sure to check all these boxes before submitting a Pull Request
2+
(PR). Once you have checked the boxes, feel free to remove all text except the
3+
justification in point 5.
4+
5+
1. [ ] You have run tests on this submission, either by using [Travis Continuous Integration testing](https://github.com/pysal/pysal/wiki/GitHub-Standard-Operating-Procedures#automated-testing-w-travis-ci) testing or running `nosetests` on your changes?
6+
2. [ ] This pull request is directed to the `pysal/dev` branch.
7+
3. [ ] This pull introduces new functionality covered by
8+
[docstrings](https://en.wikipedia.org/wiki/Docstring#Python) and
9+
[unittests](https://docs.python.org/2/library/unittest.html)?
10+
4. [ ] You have [assigned a
11+
reviewer](https://help.github.com/articles/assigning-issues-and-pull-requests-to-other-github-users/) and added relevant [labels](https://help.github.com/articles/applying-labels-to-issues-and-pull-requests/)
12+
5. [ ] The justification for this PR is:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pysal/examples/south.prj
7777

7878
#Vi
7979
*.swp
80-
80+
.ropeproject/
8181
.eggs/
8282
pysal/contrib/planar/
8383
pysal/esda/.ropeproject/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ before_install:
2020
- if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then rm -rf pysal/contrib; 2to3 -nw pysal/ > /dev/null; fi
2121

2222
install:
23-
- conda install --yes numpy=1.10.2 scipy=0.16.0 nose pip
23+
- conda install --yes numpy scipy nose pip
2424
- pip install -r travis.txt
2525

2626
script:

CHANGELOG.txt

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,77 @@
1+
v<1.11.1>, 2016-04-01
2+
3+
We closed a total of 62 issues, 20 pull requests and 42 regular issues;
4+
this is the full list (generated with the script
5+
:file:`tools/github_stats.py`):
6+
7+
Pull Requests (20):
8+
9+
* :ghpull:`777`: fix minor issues with using stdlib warnings in mapclassify.py
10+
* :ghpull:`766`: Constant check
11+
* :ghpull:`781`: Dev
12+
* :ghpull:`778`: Wkb
13+
* :ghpull:`776`: Updating & find-bin-as-call for Map_Classifiers
14+
* :ghpull:`770`: adding github chrome to make project contributions easier to handle
15+
* :ghpull:`764`: add folium changes needed for notebook to run
16+
* :ghpull:`760`: Update docs for #697
17+
* :ghpull:`763`: docs fix: incorrect array dimensions listed for spatial interaction SpaceTimeEvents
18+
* :ghpull:`756`: B726
19+
* :ghpull:`749`: remove cruft in git root and add gitter badge to the readme
20+
* :ghpull:`748`: Replace deprecated np.rank with np.ndim
21+
* :ghpull:`745`: Lag Categorical & Find Bins
22+
* :ghpull:`741`: fix for #740
23+
* :ghpull:`739`: Dev
24+
* :ghpull:`738`: fixing master version
25+
* :ghpull:`737`: Bumping dev
26+
* :ghpull:`736`: Merge pull request #734 from sjsrey/master
27+
* :ghpull:`735`: Dev in sync with master for 1.11
28+
* :ghpull:`734`: Release 1.11
29+
30+
Issues (42):
31+
32+
* :ghissue:`773`: add isKDTree typecomparison to handle divergent cKDTree and KDTree types
33+
* :ghissue:`777`: fix minor issues with using stdlib warnings in mapclassify.py
34+
* :ghissue:`766`: Constant check
35+
* :ghissue:`782`: Contrib docs
36+
* :ghissue:`781`: Dev
37+
* :ghissue:`762`: viz: folium_mapping.ipynb AttributeError: 'Map' object has no attribute '_build_map'
38+
* :ghissue:`778`: Wkb
39+
* :ghissue:`776`: Updating & find-bin-as-call for Map_Classifiers
40+
* :ghissue:`770`: adding github chrome to make project contributions easier to handle
41+
* :ghissue:`774`: Added a prototype for constructing weights from a list of shapely Polygons
42+
* :ghissue:`772`: knnW user guide doc error
43+
* :ghissue:`765`: potential constant_check bug
44+
* :ghissue:`759`: Fixed code in ipython notebooks
45+
* :ghissue:`752`: [WIP] Add J function to network submodule
46+
* :ghissue:`764`: add folium changes needed for notebook to run
47+
* :ghissue:`760`: Update docs for #697
48+
* :ghissue:`763`: docs fix: incorrect array dimensions listed for spatial interaction SpaceTimeEvents
49+
* :ghissue:`750`: Add gitter badge to README on master branch
50+
* :ghissue:`758`: Fixed code in ipython notebooks
51+
* :ghissue:`755`: add speedup of conditional randomization
52+
* :ghissue:`726`: Compatibility for Scipy 16.1
53+
* :ghissue:`756`: B726
54+
* :ghissue:`749`: remove cruft in git root and add gitter badge to the readme
55+
* :ghissue:`587`: ML Lag
56+
* :ghissue:`748`: Replace deprecated np.rank with np.ndim
57+
* :ghissue:`747`: Replace deprecated np.rank with np.ndim
58+
* :ghissue:`653`: network is returning NAN's on diagonal of distance matrix
59+
* :ghissue:`660`: insert zeros on symmetric matrix diagonal
60+
* :ghissue:`745`: Lag Categorical & Find Bins
61+
* :ghissue:`744`: [REBASED] Update moran.py with much faster iterations
62+
* :ghissue:`732`: Update moran.py with much faster iterations
63+
* :ghissue:`743`: [REBASED]: Update moran.py with much faster iterations
64+
* :ghissue:`742`: Links not working
65+
* :ghissue:`740`: Moran_Local's EI is returned as an array instead of a float
66+
* :ghissue:`741`: fix for #740
67+
* :ghissue:`739`: Dev
68+
* :ghissue:`738`: fixing master version
69+
* :ghissue:`737`: Bumping dev
70+
* :ghissue:`151`: Port pysal to python3
71+
* :ghissue:`736`: Merge pull request #734 from sjsrey/master
72+
* :ghissue:`735`: Dev in sync with master for 1.11
73+
* :ghissue:`734`: Release 1.11
74+
175
v<1.11.0>, 2016-01-27
276

377
GitHub stats for 2015/07/29 - 2016/01/27

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Python Spatial Analysis Library
77
.. image:: https://coveralls.io/repos/pysal/pysal/badge.svg?branch=master
88
:target: https://coveralls.io/r/pysal/pysal?branch=master
99

10+
.. image:: https://badges.gitter.im/pysal/pysal.svg
11+
:target: https://gitter.im/pysal/pysal
1012

1113
PySAL_ is an open source cross-platform library of spatial analysis functions
1214
written in Python. It is intended to support the development of high level

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
# built documents.
5858
#
5959
# The short X.Y version.
60-
version = '1.11.0'
60+
version = '1.11.1'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '1.11.0'
62+
release = '1.11.1'
6363

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

doc/source/developers/guidelines.rst

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ Source Code
3838
PySAL uses `git <http://git-scm.com/>`_ and github for our `code repository <https://github.com/pysal/pysal.git/>`_.
3939

4040

41+
Please see `our procedures and policies for development on GitHub <https://github.com/pysal/pysal/wiki/GitHub-Standard-Operating-Procedures>`_
42+
as well as how to `configure your local git for development
43+
<https://github.com/pysal/pysal/wiki/Example-git-config>`_.
44+
45+
4146
You can setup PySAL for local development following the :doc:`installation instructions </users/installation>`.
4247

4348

@@ -46,7 +51,8 @@ Development Mailing List
4651
------------------------
4752

4853
Development discussions take place on `pysal-dev
49-
<http://groups.google.com/group/pysal-dev>`_.
54+
<http://groups.google.com/group/pysal-dev>`_
55+
and the `gitter room <https://gitter.im/pysal/pysal>`_.
5056

5157

5258
-----------------------
@@ -57,21 +63,6 @@ PySAL development follows a six-month release schedule that is aligned with
5763
the academic calendar.
5864

5965

60-
1.11 Cycle
61-
==========
62-
63-
======== ======== ================= ====================================================
64-
Start End Phase Notes
65-
======== ======== ================= ====================================================
66-
8/1/15 8/14/15 Module Proposals Developers draft PEPs and prototype
67-
8/15/15 8/15/15 Developer vote All developers vote on PEPs
68-
8/16/15 8/16/15 Module Approval BDFL announces final approval
69-
8/17/15 12/30/15 Development Implementation and testing of approved modules
70-
1/1/16 1/1/16 Code Freeze APIs fixed, bug and testing changes only
71-
1/23/16 1/30/16 Release Prep Test release builds, updating svn
72-
1/31/16 1/31/16 Release Official release of 1.11
73-
======== ======== ================= ====================================================
74-
7566
1.12 Cycle
7667
==========
7768

@@ -88,6 +79,21 @@ Start End Phase Notes
8879
======== ======== ================= ====================================================
8980

9081

82+
1.13 Cycle
83+
==========
84+
85+
======== ======== ================= ====================================================
86+
Start End Phase Notes
87+
======== ======== ================= ====================================================
88+
8/1/16 8/14/16 Module Proposals Developers draft PEPs and prototype
89+
8/16/16 8/16/16 Developer vote All developers vote on PEPs
90+
8/16/16 8/16/16 Module Approval BDFL announces final approval
91+
8/17/16 12/30/16 Development Implementation and testing of approved modules
92+
1/1/17 1/1/17 Code Freeze APIs fixed, bug and testing changes only
93+
1/23/17 1/30/17 Release Prep Test release builds, updating svn
94+
1/31/17 1/31/17 Release Official release of 1.13
95+
======== ======== ================= ====================================================
96+
9197

9298
----------
9399
Governance

doc/source/developers/release.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ Prepare the release
1313
- Check all tests pass. See :doc:`testing`.
1414
- Update CHANGELOG::
1515

16-
$ python tools/github_stats.py >> chglog
16+
$ python tools/github_stats.py days >> chglog
1717

18+
- where `days` is the number of days to start the logs at
1819
- Prepend `chglog` to `CHANGELOG` and edit
1920
- Edit THANKS and README and README.md if needed.
2021
- Edit the file `version.py` to update MAJOR, MINOR, MICRO

0 commit comments

Comments
 (0)