Skip to content

Commit 7a623b4

Browse files
authored
Merge pull request #26 from TaylorOshan/master
version/log bump
2 parents 3c31299 + 50453f8 commit 7a623b4

File tree

3 files changed

+64
-92
lines changed

3 files changed

+64
-92
lines changed

CHANGELOG.md

+13-19
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
# Changes
21

3-
Version 1.0.6 (2019-07-22)
2+
# Changes
43

5-
We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.
4+
Version 1.0.7 (2020-09-08)
5+
6+
We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.
67

78
## Issues Closed
9+
- update travis (#25)
10+
- addressing pysal/pysal#1145 (#24)
11+
- bump version for release (#23)
12+
- update log (#22)
813
- Updates (#21)
9-
- correction of JSONUnreadable error (#19)
10-
- fix all doctests and require doctests to pass on travis testing (#18)
11-
- Move np.random.seed into individual testing cases for test_vec_SA.py (#17)
12-
- add changelog (#15)
13-
- pypi files do not include tests (#9)
14-
- Submodule (#14)
1514

1615
## Pull Requests
16+
- update travis (#25)
17+
- addressing pysal/pysal#1145 (#24)
18+
- bump version for release (#23)
19+
- update log (#22)
1720
- Updates (#21)
18-
- correction of JSONUnreadable error (#19)
19-
- fix all doctests and require doctests to pass on travis testing (#18)
20-
- Move np.random.seed into individual testing cases for test_vec_SA.py (#17)
21-
- add changelog (#15)
22-
- Submodule (#14)
2321

2422
The following individuals contributed to this release:
2523

26-
- Tayloroshan
27-
- Dani Arribas-Bel
28-
- James Gaboardi
29-
- Levi John Wolf
30-
- Wei Kang
3124
- Taylor Oshan
25+
- James Gaboardi

spint/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '1.0.6'
1+
__version__ = '1.0.7'
22

33
from .gravity import Gravity, Production, Attraction, Doubly
44
from .utils import CPC, sorensen, srmse

tools/gitcount.ipynb

+50-72
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"outputs": [],
2727
"source": [
2828
"package_name = 'spint'\n",
29-
"release_date = '2019-07-22'\n",
30-
"start_date = '2018-10-31'"
29+
"release_date = '2020-09-08'\n",
30+
"start_date = '2019-07-22'"
3131
]
3232
},
3333
{
@@ -101,7 +101,7 @@
101101
{
102102
"data": {
103103
"text/plain": [
104-
"datetime.datetime(2018, 10, 31, 0, 0)"
104+
"datetime.datetime(2019, 7, 22, 0, 0)"
105105
]
106106
},
107107
"execution_count": 5,
@@ -155,7 +155,7 @@
155155
{
156156
"data": {
157157
"text/plain": [
158-
"24"
158+
"16"
159159
]
160160
},
161161
"execution_count": 8,
@@ -254,7 +254,7 @@
254254
{
255255
"data": {
256256
"text/plain": [
257-
"dict_keys(['Tayloroshan', 'Dani Arribas-Bel', 'James Gaboardi', 'Levi John Wolf', 'Wei Kang', 'Taylor Oshan'])"
257+
"dict_keys(['Taylor Oshan', 'James Gaboardi'])"
258258
]
259259
},
260260
"execution_count": 14,
@@ -434,12 +434,11 @@
434434
{
435435
"data": {
436436
"text/plain": [
437-
"['Updates (#21)',\n",
438-
" 'correction of JSONUnreadable error (#19)',\n",
439-
" 'fix all doctests and require doctests to pass on travis testing (#18)',\n",
440-
" 'Move np.random.seed into individual testing cases for test_vec_SA.py (#17)',\n",
441-
" 'add changelog (#15)',\n",
442-
" 'Submodule (#14)']"
437+
"['update travis (#25)',\n",
438+
" 'addressing pysal/pysal#1145 (#24)',\n",
439+
" 'bump version for release (#23)',\n",
440+
" 'update log (#22)',\n",
441+
" 'Updates (#21)']"
443442
]
444443
},
445444
"execution_count": 20,
@@ -477,7 +476,7 @@
477476
{
478477
"data": {
479478
"text/plain": [
480-
"'We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.'"
479+
"'We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.'"
481480
]
482481
},
483482
"execution_count": 23,
@@ -507,7 +506,7 @@
507506
"name": "stdout",
508507
"output_type": "stream",
509508
"text": [
510-
"We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.\n",
509+
"We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.\n",
511510
"\n",
512511
"## Issues Closed\n",
513512
"\n"
@@ -540,24 +539,21 @@
540539
"name": "stdout",
541540
"output_type": "stream",
542541
"text": [
543-
"We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.\n",
542+
"We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.\n",
544543
"\n",
545544
"## Issues Closed\n",
545+
" - update travis (#25)\n",
546+
" - addressing pysal/pysal#1145 (#24)\n",
547+
" - bump version for release (#23)\n",
548+
" - update log (#22)\n",
546549
" - Updates (#21)\n",
547-
" - correction of JSONUnreadable error (#19)\n",
548-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
549-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
550-
" - add changelog (#15)\n",
551-
" - pypi files do not include tests (#9)\n",
552-
" - Submodule (#14)\n",
553550
"\n",
554551
"## Pull Requests\n",
555-
" - Updates (#21)\n",
556-
" - correction of JSONUnreadable error (#19)\n",
557-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
558-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
559-
" - add changelog (#15)\n",
560-
" - Submodule (#14)\n"
552+
" - update travis (#25)\n",
553+
" - addressing pysal/pysal#1145 (#24)\n",
554+
" - bump version for release (#23)\n",
555+
" - update log (#22)\n",
556+
" - Updates (#21)\n"
561557
]
562558
}
563559
],
@@ -583,12 +579,8 @@
583579
"name": "stdout",
584580
"output_type": "stream",
585581
"text": [
586-
" - Tayloroshan\n",
587-
" - Dani Arribas-Bel\n",
588-
" - James Gaboardi\n",
589-
" - Levi John Wolf\n",
590-
" - Wei Kang\n",
591-
" - Taylor Oshan\n"
582+
" - Taylor Oshan\n",
583+
" - James Gaboardi\n"
592584
]
593585
}
594586
],
@@ -614,33 +606,26 @@
614606
"name": "stdout",
615607
"output_type": "stream",
616608
"text": [
617-
"We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.\n",
609+
"We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.\n",
618610
"\n",
619611
"## Issues Closed\n",
612+
" - update travis (#25)\n",
613+
" - addressing pysal/pysal#1145 (#24)\n",
614+
" - bump version for release (#23)\n",
615+
" - update log (#22)\n",
620616
" - Updates (#21)\n",
621-
" - correction of JSONUnreadable error (#19)\n",
622-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
623-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
624-
" - add changelog (#15)\n",
625-
" - pypi files do not include tests (#9)\n",
626-
" - Submodule (#14)\n",
627617
"\n",
628618
"## Pull Requests\n",
619+
" - update travis (#25)\n",
620+
" - addressing pysal/pysal#1145 (#24)\n",
621+
" - bump version for release (#23)\n",
622+
" - update log (#22)\n",
629623
" - Updates (#21)\n",
630-
" - correction of JSONUnreadable error (#19)\n",
631-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
632-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
633-
" - add changelog (#15)\n",
634-
" - Submodule (#14)\n",
635624
"\n",
636625
"The following individuals contributed to this release:\n",
637626
"\n",
638-
" - Tayloroshan\n",
639-
" - Dani Arribas-Bel\n",
640-
" - James Gaboardi\n",
641-
" - Levi John Wolf\n",
642-
" - Wei Kang\n",
643-
" - Taylor Oshan\n"
627+
" - Taylor Oshan\n",
628+
" - James Gaboardi\n"
644629
]
645630
}
646631
],
@@ -668,35 +653,28 @@
668653
"text": [
669654
"# Changes\n",
670655
"\n",
671-
"Version 1.0.5 (2019-07-22)\n",
656+
"Version 1.0.7 (2020-09-08)\n",
672657
"\n",
673-
"We closed a total of 13 issues (enhancements and bug fixes) through 6 pull requests, since our last release on 2018-10-31.\n",
658+
"We closed a total of 10 issues (enhancements and bug fixes) through 5 pull requests, since our last release on 2019-07-22.\n",
674659
"\n",
675660
"## Issues Closed\n",
661+
" - update travis (#25)\n",
662+
" - addressing pysal/pysal#1145 (#24)\n",
663+
" - bump version for release (#23)\n",
664+
" - update log (#22)\n",
676665
" - Updates (#21)\n",
677-
" - correction of JSONUnreadable error (#19)\n",
678-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
679-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
680-
" - add changelog (#15)\n",
681-
" - pypi files do not include tests (#9)\n",
682-
" - Submodule (#14)\n",
683666
"\n",
684667
"## Pull Requests\n",
668+
" - update travis (#25)\n",
669+
" - addressing pysal/pysal#1145 (#24)\n",
670+
" - bump version for release (#23)\n",
671+
" - update log (#22)\n",
685672
" - Updates (#21)\n",
686-
" - correction of JSONUnreadable error (#19)\n",
687-
" - fix all doctests and require doctests to pass on travis testing (#18)\n",
688-
" - Move np.random.seed into individual testing cases for test_vec_SA.py (#17)\n",
689-
" - add changelog (#15)\n",
690-
" - Submodule (#14)\n",
691673
"\n",
692674
"The following individuals contributed to this release:\n",
693675
"\n",
694-
" - Tayloroshan\n",
695-
" - Dani Arribas-Bel\n",
696-
" - James Gaboardi\n",
697-
" - Levi John Wolf\n",
698-
" - Wei Kang\n",
699-
" - Taylor Oshan\n"
676+
" - Taylor Oshan\n",
677+
" - James Gaboardi\n"
700678
]
701679
}
702680
],
@@ -739,9 +717,9 @@
739717
],
740718
"metadata": {
741719
"kernelspec": {
742-
"display_name": "Python 3",
720+
"display_name": "Python [spacegan]",
743721
"language": "python",
744-
"name": "python3"
722+
"name": "Python [spacegan]"
745723
},
746724
"language_info": {
747725
"codemirror_mode": {
@@ -753,7 +731,7 @@
753731
"name": "python",
754732
"nbconvert_exporter": "python",
755733
"pygments_lexer": "ipython3",
756-
"version": "3.7.1"
734+
"version": "3.6.9"
757735
}
758736
},
759737
"nbformat": 4,

0 commit comments

Comments
 (0)