From 4551ab8d51a541a361240e393899f88b68505bc0 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 2 Feb 2019 20:50:46 -0500 Subject: [PATCH 1/3] adding pandas as a requirement --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b0eab004..93db60ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ scipy>=0.11 numpy>=1.3 +pandas libpysal esda \ No newline at end of file From d351d219469d1501ffa4050effc6d8a26f385467 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 27 Feb 2019 09:25:18 -0500 Subject: [PATCH 2/3] version bump to __init__ --- spaghetti/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spaghetti/__init__.py b/spaghetti/__init__.py index 25b48b61..5f1f2f57 100644 --- a/spaghetti/__init__.py +++ b/spaghetti/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.1.1post3" +__version__ = "1.2rc1" """ :mod:`spaghetti` --- Spatial Graphs: Networks, Topology, & Inference ==================================================================== From 1228809fee249b48897c2970f82c3ebde0295793 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 27 Feb 2019 09:32:59 -0500 Subject: [PATCH 3/3] updating changelod__ --- tools/changelog_1.2rc1.md | 173 ++++++++++++++++++++++++++ tools/gitcount.ipynb | 251 ++++++++++++++++++++++++++++++++------ 2 files changed, 387 insertions(+), 37 deletions(-) create mode 100644 tools/changelog_1.2rc1.md diff --git a/tools/changelog_1.2rc1.md b/tools/changelog_1.2rc1.md new file mode 100644 index 00000000..2db80a56 --- /dev/null +++ b/tools/changelog_1.2rc1.md @@ -0,0 +1,173 @@ +# Changes + +Version 1.2rc1 (2019-02-27) + +We closed a total of 160 issues (enhancements and bug fixes) through 60 pull requests, since our last release on 2018-11-01. + +## Issues Closed + - Coverage testing (#239) + - update .travis.yml and introduce .coveragerc similar to pysal/giddy#81 (#238) + - Update `bug` template (#237) + - Update issue templates (#236) + - Add .github directory based on libpysal (#234) + - Adding community info (#235) + - remove README.rst (#223) + - Removing README.rst and updating setup.py (#233) + - pysal/giddy#77 (reference labels) (#231) + - Ref docs (#232) + - Api site doc (#230) + - correction in notebooks/Network_Usage.ipynb (#229) + - edges_to_arcs naming convention (#227) + - altering edges_to_arcs crosswalk name (#228) + - Improve in-line docs -- 24PullRequests for Christmas (#202) + - updating utils.py docs (#226) + - updating all analysis.py docs (#224) + - Docs split arcs (#222) + - Docs allneighbordistances (#221) + - updating docs for full_distance_matrix (#220) + - notes for simulate_observations (#219) + - Docs net funcs (#218) + - bug in snapping points? (#125) + - Deprecation: Container-Based Linux Build Environments (#188) + - Remove sorted edges (#216) + - purpose of class SortedEdges(OrderedDict)? (#90) + - geometry notes in _newpoint_coords (#215) + - count_per_link -- updating docs (#214) + - TravisCI error raise ReadTimeoutError(self._pool, None, 'Read timed out.') (#213) + - variable declaration correction in _snap_to_link (#212) + - compute_distance_to_vertices -- in-line doc improvement (#211) + - improved in-line comments in network.Network.distancebandweights (#210) + - improved in-line comments in network.Network.contiguityweights (#209) + - improved in-line comments in network.Network._docs_evaluate_napts (#208) + - improved in-line comments in network.Network._yield_napts (#207) + - improved in-line comments in network.Network.extractgraph (#206) + - improved in-line comments in network.Network.extract_components (#205) + - improved in-line comments in network.Network._round_sig (#204) + - improved in-line comments in network.Network.__init__ (#203) + - improved in-line comments in _extractnetwork (#201) + - minor spaghetti/util.py doc clean (#200) + - update notebooks following #185 (#187) + - README graphic legend update (#197) + - Update notebooks (#199) + - correcting arc -- arcs attribute (#193) + - attribute declaration error (network.Network.arc) (#192) + - (from pysal.network) Edge ID data structure #933 (#176) + - (from pysal.network) network ring bug #655 (#184) + - Debug of data structure/algo that led to ring/graph errors (#185) + - Creating Network instance from road shapefile fails; ValueError: list.remove(x): x not in list (#9) + - (from pysal.network) Revisit graph weights in network module #496 (#186) + - Updating spaghetti ReadTheDocs (#183) + - tree not recorded in same network arc (#180) + - Nearest tree update (#182) + - clean/create more coherent and uniform variable names (#49) + - Updating/standardizing network/graph element naming (#181) + - Dijkstra maintenance (#179) + - [MAINT] dijkstra (#178) + - Adding .png of snapped point to README.md (#177) + - fixing bug in distancebandweights (#175) + - bug in network.Network.distancebandweights (#174) + - determine necessity of test_distance_band_weights (#62) + - updating ReadTheDocs following #172 (#173) + - Pep8 docs review (#172) + - record connected components (#168) + - [WIP] contiguityweights and connected_components (#171) + - add break condition in contiguityweights() (#170) + - Edge Weighting pysal/pysal #609 (#66) + - Merge unittest scripts (#169) + - Further streamline unittests (#157) + - api docs (#162) + - network element as geodataframe (#143) + - Refactor element as gdf (#167) + - Restructure docs (#166) + - Non responsive docs (#165) + - typo in dijkstra reference (#163) + - Update api docs (#164) + - Update api (#161) + - cleaning up notebooks/Snapping_Demonstration.ipynb (#160) + - Update notebooks (#159) + - add minor test for _round_sig (#152) + - Round sig test (#156) + - updating element_as_gdf.rst (#155) + - Update doc element to gdf (#154) + - Streamline unittests (#147) + - Streamline unittests (#153) + - ENH: element_to_gdf() (#145) + - correcting list comp syntax in _round_sig (#151) + - error in _round_sig() when a coordinate is 0.0 (#150) + - [ENH] streets/network and points need to be in the same CRS/EPSG (#71) + - update markdown docs fromSpaghetti_Pointpatterns_Empirical.ipynb (#146) + - updating typo in notebooks/Spaghetti_Pointpatterns_Empirical.ipynb (#149) + - Minor notebook update (#148) + - update spaghetti info on pysal.site (#144) + - fix RuntimeWarning in analysis.py (#140) + - usage of networkx (#141) + - updating notebooks (#142) + - update spaghetti landing site notebook links (#139) + - rerunning notebooks (#138) + - travis build still failing (#127) + +## Pull Requests + - Coverage testing (#239) + - Update `bug` template (#237) + - Update issue templates (#236) + - Adding community info (#235) + - Removing README.rst and updating setup.py (#233) + - Ref docs (#232) + - Api site doc (#230) + - correction in notebooks/Network_Usage.ipynb (#229) + - altering edges_to_arcs crosswalk name (#228) + - updating utils.py docs (#226) + - updating all analysis.py docs (#224) + - Docs split arcs (#222) + - Docs allneighbordistances (#221) + - updating docs for full_distance_matrix (#220) + - notes for simulate_observations (#219) + - Docs net funcs (#218) + - Remove sorted edges (#216) + - geometry notes in _newpoint_coords (#215) + - count_per_link -- updating docs (#214) + - variable declaration correction in _snap_to_link (#212) + - compute_distance_to_vertices -- in-line doc improvement (#211) + - improved in-line comments in network.Network.distancebandweights (#210) + - improved in-line comments in network.Network.contiguityweights (#209) + - improved in-line comments in network.Network._docs_evaluate_napts (#208) + - improved in-line comments in network.Network._yield_napts (#207) + - improved in-line comments in network.Network.extractgraph (#206) + - improved in-line comments in network.Network.extract_components (#205) + - improved in-line comments in network.Network._round_sig (#204) + - improved in-line comments in network.Network.__init__ (#203) + - improved in-line comments in _extractnetwork (#201) + - minor spaghetti/util.py doc clean (#200) + - Update notebooks (#199) + - correcting arc -- arcs attribute (#193) + - Debug of data structure/algo that led to ring/graph errors (#185) + - Updating spaghetti ReadTheDocs (#183) + - Nearest tree update (#182) + - Updating/standardizing network/graph element naming (#181) + - Dijkstra maintenance (#179) + - Adding .png of snapped point to README.md (#177) + - fixing bug in distancebandweights (#175) + - updating ReadTheDocs following #172 (#173) + - Pep8 docs review (#172) + - [WIP] contiguityweights and connected_components (#171) + - Merge unittest scripts (#169) + - Refactor element as gdf (#167) + - Restructure docs (#166) + - Non responsive docs (#165) + - Update api docs (#164) + - Update api (#161) + - cleaning up notebooks/Snapping_Demonstration.ipynb (#160) + - Update notebooks (#159) + - Round sig test (#156) + - updating element_as_gdf.rst (#155) + - Update doc element to gdf (#154) + - Streamline unittests (#153) + - ENH: element_to_gdf() (#145) + - correcting list comp syntax in _round_sig (#151) + - updating typo in notebooks/Spaghetti_Pointpatterns_Empirical.ipynb (#149) + - updating notebooks (#142) + - rerunning notebooks (#138) + +The following individuals contributed to this release: + + - James Gaboardi \ No newline at end of file diff --git a/tools/gitcount.ipynb b/tools/gitcount.ipynb index e2d967ac..631752bc 100644 --- a/tools/gitcount.ipynb +++ b/tools/gitcount.ipynb @@ -22,12 +22,17 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:15.061293Z", + "start_time": "2019-02-27T14:28:15.058023Z" + } + }, "outputs": [], "source": [ "package_name = 'spaghetti'\n", - "release_date = '2018-10-31'\n", - "start_date = '2018-10-30'" + "release_date = '2019-02-27'\n", + "start_date = '2018-11-01'" ] }, { @@ -40,7 +45,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:15.738636Z", + "start_time": "2019-02-27T14:28:15.732729Z" + } + }, "outputs": [], "source": [ "from __future__ import print_function\n", @@ -67,7 +77,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:16.196032Z", + "start_time": "2019-02-27T14:28:16.192605Z" + } + }, "outputs": [], "source": [ "CWD = os.path.abspath(os.path.curdir)" @@ -76,7 +91,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:16.641076Z", + "start_time": "2019-02-27T14:28:16.635682Z" + } + }, "outputs": [], "source": [ "CWD" @@ -85,7 +105,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:17.306463Z", + "start_time": "2019-02-27T14:28:17.299445Z" + } + }, "outputs": [], "source": [ "since_date = '--since=\"{start}\"'.format(start=start_date)\n", @@ -97,7 +122,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:17.687812Z", + "start_time": "2019-02-27T14:28:17.683521Z" + } + }, "outputs": [], "source": [ "# get __version__\n", @@ -118,7 +148,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:19.195472Z", + "start_time": "2019-02-27T14:28:18.961773Z" + } + }, "outputs": [], "source": [ "cmd = ['git', 'log', '--oneline', since_date]\n", @@ -128,7 +163,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:19.946540Z", + "start_time": "2019-02-27T14:28:19.940848Z" + } + }, "outputs": [], "source": [ "ncommits" @@ -151,7 +191,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:21.343041Z", + "start_time": "2019-02-27T14:28:21.337336Z" + } + }, "outputs": [], "source": [ "identities = {'Levi John Wolf': ('ljwolf', 'Levi John Wolf'),\n", @@ -174,7 +219,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:22.119564Z", + "start_time": "2019-02-27T14:28:22.114374Z" + } + }, "outputs": [], "source": [ "author_cmd = ['git', 'log', '--format=* %aN', since_date]" @@ -183,7 +233,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:22.696038Z", + "start_time": "2019-02-27T14:28:22.692768Z" + } + }, "outputs": [], "source": [ "from collections import Counter" @@ -192,7 +247,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:23.274450Z", + "start_time": "2019-02-27T14:28:23.137854Z" + } + }, "outputs": [], "source": [ "\n", @@ -207,7 +267,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:23.504362Z", + "start_time": "2019-02-27T14:28:23.500631Z" + } + }, "outputs": [], "source": [ "unique_authors = counter.keys()" @@ -216,7 +281,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:24.210523Z", + "start_time": "2019-02-27T14:28:24.204912Z" + } + }, "outputs": [], "source": [ "unique_authors" @@ -232,7 +302,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:25.788109Z", + "start_time": "2019-02-27T14:28:25.784284Z" + } + }, "outputs": [], "source": [ "from datetime import datetime, timedelta\n", @@ -245,7 +320,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:26.447328Z", + "start_time": "2019-02-27T14:28:26.431560Z" + } + }, "outputs": [], "source": [ "\n", @@ -341,7 +421,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.748261Z", + "start_time": "2019-02-27T14:28:27.022737Z" + } + }, "outputs": [], "source": [ "\n", @@ -361,7 +446,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.755701Z", + "start_time": "2019-02-27T14:28:34.750672Z" + } + }, "outputs": [], "source": [ "issue_listing = []\n", @@ -373,7 +463,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.764151Z", + "start_time": "2019-02-27T14:28:34.758718Z" + } + }, "outputs": [], "source": [ "pull_listing = []\n", @@ -385,7 +480,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.783194Z", + "start_time": "2019-02-27T14:28:34.768907Z" + } + }, "outputs": [], "source": [ "pull_listing" @@ -394,7 +494,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.792901Z", + "start_time": "2019-02-27T14:28:34.787368Z" + } + }, "outputs": [], "source": [ "message = \"We closed a total of {total} issues (enhancements and bug fixes) through {pr} pull requests\".format(total=n_total, pr=n_pulls)" @@ -403,7 +508,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.802254Z", + "start_time": "2019-02-27T14:28:34.796950Z" + } + }, "outputs": [], "source": [ "message = \"{msg}, since our last release on {previous}.\".format(msg=message, previous=str(start_date))\n" @@ -412,7 +522,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.823599Z", + "start_time": "2019-02-27T14:28:34.805696Z" + } + }, "outputs": [], "source": [ "message" @@ -421,7 +536,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.835703Z", + "start_time": "2019-02-27T14:28:34.827065Z" + } + }, "outputs": [], "source": [ "message += \"\\n\\n## Issues Closed\\n\"" @@ -430,7 +550,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.850116Z", + "start_time": "2019-02-27T14:28:34.841661Z" + } + }, "outputs": [], "source": [ "print(message)" @@ -439,7 +564,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.866831Z", + "start_time": "2019-02-27T14:28:34.853117Z" + } + }, "outputs": [], "source": [ "issues = \"\\n\".join([\" - \"+issue for issue in issue_listing])\n", @@ -452,7 +582,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.875598Z", + "start_time": "2019-02-27T14:28:34.870951Z" + } + }, "outputs": [], "source": [ "print(message)" @@ -461,7 +596,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.885782Z", + "start_time": "2019-02-27T14:28:34.880245Z" + } + }, "outputs": [], "source": [ "people = \"\\n\".join([\" - \"+person for person in unique_authors])" @@ -470,7 +610,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.893395Z", + "start_time": "2019-02-27T14:28:34.888773Z" + } + }, "outputs": [], "source": [ "print(people)" @@ -479,7 +624,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.903594Z", + "start_time": "2019-02-27T14:28:34.899329Z" + } + }, "outputs": [], "source": [ "message +=\"\\n\\nThe following individuals contributed to this release:\\n\\n{people}\".format(people=people)" @@ -488,7 +638,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.911751Z", + "start_time": "2019-02-27T14:28:34.906468Z" + } + }, "outputs": [], "source": [ "print(message)" @@ -497,7 +652,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:34.987085Z", + "start_time": "2019-02-27T14:28:34.983720Z" + } + }, "outputs": [], "source": [ "head = \"# Changes\\n\\nVersion {version} ({release_date})\\n\\n\".format(version=__version__, release_date=release_date)" @@ -506,7 +666,12 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:35.900626Z", + "start_time": "2019-02-27T14:28:35.896581Z" + } + }, "outputs": [], "source": [ "print(head+message)" @@ -515,13 +680,25 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2019-02-27T14:28:38.647262Z", + "start_time": "2019-02-27T14:28:38.635361Z" + } + }, "outputs": [], "source": [ "outfile = 'changelog_{version}.md'.format(version=__version__)\n", "with open(outfile, 'w') as of:\n", " of.write(head+message)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { @@ -540,7 +717,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.6" + "version": "3.6.7" } }, "nbformat": 4,