Skip to content

Commit

Permalink
Merge pull request #30 from renanxcortes/release_106
Browse files Browse the repository at this point in the history
Release 106
  • Loading branch information
renanxcortes authored May 14, 2019
2 parents 3a298c1 + 57b4b89 commit f19fc25
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 142 deletions.
2 changes: 1 addition & 1 deletion segregation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.5"
__version__ = "1.0.6"

"""
:mod:`segregation` --- Spatial/Non-Spatial Segregation Analysis
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def setup_package():
license = 'BSD',
py_modules = ['segregation'],
packages = find_packages(),
setup_requires = ["pytest-runner"],
tests_require = ["pytest"],
# setup_requires = ["pytest-runner"],
# tests_require = ["pytest"],
keywords = ['spatial statistics', 'demography'],
classifiers = [
#'Development Status :: 1 - Alpha',
Expand Down
20 changes: 20 additions & 0 deletions tools/changelog_1.0.6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Changes

Version 1.0.6 (2019-05-14)

We closed a total of 8 issues (enhancements and bug fixes) through 3 pull requests, since our last release on 2019-05-14.

## Issues Closed
- plan for Release 106 (#29)
- update changelog and run gitcount (#28)
- tweaks for 1.0.5 release in setup.py (#27)
- update readme with decompose framework for 1.0.5 release (#26)
- create additional argument for the center in Centralization indexes (#23)

## Pull Requests
- update changelog and run gitcount (#28)
- tweaks for 1.0.5 release in setup.py (#27)
- update readme with decompose framework for 1.0.5 release (#26)

The following individuals contributed to this release:

155 changes: 16 additions & 139 deletions tools/gitcount.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -433,20 +433,9 @@
{
"data": {
"text/plain": [
"['tweaks for 1.0.5 release in setup.py (#27)',\n",
" 'update readme with decompose framework for 1.0.5 release (#26)',\n",
" 'ENH: bump version number for bf release (#24)',\n",
" \" second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\",\n",
" 'BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)',\n",
" 'create changelog and gitcount (#21)',\n",
" 'add RTD yaml (#14)',\n",
" 'add docs reqs (#13)',\n",
" 'begin docs (#12)',\n",
" 'add lorenz (#10)',\n",
" 'add working decomposition func and CDF plotting func (#7)',\n",
" 'start counterfactual (#6)',\n",
" 'directly specifiy Miniconda3 (#3)',\n",
" 'add second install option to README.md (#1)']"
"['update changelog and run gitcount (#28)',\n",
" 'tweaks for 1.0.5 release in setup.py (#27)',\n",
" 'update readme with decompose framework for 1.0.5 release (#26)']"
]
},
"execution_count": 20,
Expand Down Expand Up @@ -484,7 +473,7 @@
{
"data": {
"text/plain": [
"'We closed a total of 33 issues (enhancements and bug fixes) through 14 pull requests, since our last release on 2018-04-10.'"
"'We closed a total of 8 issues (enhancements and bug fixes) through 3 pull requests, since our last release on 2019-05-14.'"
]
},
"execution_count": 23,
Expand Down Expand Up @@ -514,7 +503,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"We closed a total of 33 issues (enhancements and bug fixes) through 14 pull requests, since our last release on 2018-04-10.\n",
"We closed a total of 8 issues (enhancements and bug fixes) through 3 pull requests, since our last release on 2019-05-14.\n",
"\n",
"## Issues Closed\n",
"\n"
Expand Down Expand Up @@ -547,44 +536,19 @@
"name": "stdout",
"output_type": "stream",
"text": [
"We closed a total of 33 issues (enhancements and bug fixes) through 14 pull requests, since our last release on 2018-04-10.\n",
"We closed a total of 8 issues (enhancements and bug fixes) through 3 pull requests, since our last release on 2019-05-14.\n",
"\n",
"## Issues Closed\n",
" - plan for Release 106 (#29)\n",
" - update changelog and run gitcount (#28)\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - create additional argument for the center in Centralization indexes (#23)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - Create Tools for Github release (#20)\n",
" - error when installing using pip (#15)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - Order of connectivity may be incorrect in Spatial_Prox_Prof (#5)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add spatial information theory index (#2)\n",
" - add second install option to README.md (#1)\n",
"\n",
"## Pull Requests\n",
" - update changelog and run gitcount (#28)\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add second install option to README.md (#1)\n"
" - update readme with decompose framework for 1.0.5 release (#26)\n"
]
}
],
Expand All @@ -610,13 +574,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
" - Renan Xavier Cortes\n",
" - Serge Rey\n",
" - Eli Knaap\n",
" - James Gaboardi\n",
" - Ljwolf\n",
" - Wei Kang\n",
" - Levi John Wolf\n"
"\n"
]
}
],
Expand All @@ -642,54 +600,23 @@
"name": "stdout",
"output_type": "stream",
"text": [
"We closed a total of 33 issues (enhancements and bug fixes) through 14 pull requests, since our last release on 2018-04-10.\n",
"We closed a total of 8 issues (enhancements and bug fixes) through 3 pull requests, since our last release on 2019-05-14.\n",
"\n",
"## Issues Closed\n",
" - plan for Release 106 (#29)\n",
" - update changelog and run gitcount (#28)\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - create additional argument for the center in Centralization indexes (#23)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - Create Tools for Github release (#20)\n",
" - error when installing using pip (#15)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - Order of connectivity may be incorrect in Spatial_Prox_Prof (#5)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add spatial information theory index (#2)\n",
" - add second install option to README.md (#1)\n",
"\n",
"## Pull Requests\n",
" - update changelog and run gitcount (#28)\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add second install option to README.md (#1)\n",
"\n",
"The following individuals contributed to this release:\n",
"\n",
" - Renan Xavier Cortes\n",
" - Serge Rey\n",
" - Eli Knaap\n",
" - James Gaboardi\n",
" - Ljwolf\n",
" - Wei Kang\n",
" - Levi John Wolf\n"
"\n"
]
}
],
Expand Down Expand Up @@ -717,56 +644,6 @@
"text": [
"# Changes\n",
"\n",
"Version 1.0.5 (2018-05-14)\n",
"\n",
"We closed a total of 33 issues (enhancements and bug fixes) through 14 pull requests, since our last release on 2018-04-10.\n",
"\n",
"## Issues Closed\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - create additional argument for the center in Centralization indexes (#23)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - Create Tools for Github release (#20)\n",
" - error when installing using pip (#15)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - Order of connectivity may be incorrect in Spatial_Prox_Prof (#5)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add spatial information theory index (#2)\n",
" - add second install option to README.md (#1)\n",
"\n",
"## Pull Requests\n",
" - tweaks for 1.0.5 release in setup.py (#27)\n",
" - update readme with decompose framework for 1.0.5 release (#26)\n",
" - ENH: bump version number for bf release (#24)\n",
" - second step in building a Shapley's decomposition framework (also address many tweaks, typos, etc.) (#16)\n",
" - BUG: adding MANIFEST.in so requirements.txt gets included in sdist (#22)\n",
" - create changelog and gitcount (#21)\n",
" - add RTD yaml (#14)\n",
" - add docs reqs (#13)\n",
" - begin docs (#12)\n",
" - add lorenz (#10)\n",
" - add working decomposition func and CDF plotting func (#7)\n",
" - start counterfactual (#6)\n",
" - directly specifiy Miniconda3 (#3)\n",
" - add second install option to README.md (#1)\n",
"\n",
"The following individuals contributed to this release:\n",
"\n",
" - Renan Xavier Cortes\n",
" - Serge Rey\n",
" - Eli Knaap\n",
" - James Gaboardi\n",
" - Ljwolf\n",
" - Wei Kang\n",
" - Levi John Wolf\n"
]
}
],
Expand Down

0 comments on commit f19fc25

Please sign in to comment.