Skip to content

Commit 3fb3d3a

Browse files
frreissfrreiss
authored
Merge pull request #229 from frreiss/branch-0_1
Release process for version 0.1
2 parents 03e6fa3 + 69d75c9 commit 3fb3d3a

13 files changed

+10839
-1860
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ $ conda activate myenv
130130

131131
To run tests, navigate to the root of your local copy and run:
132132
```
133-
pytest
133+
pytest text_extensions_for_pandas
134134
```
135135

136136
To build pip and source code packages:

‎config/dev_reqs.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,9 @@ ipywidgets
1414
ibm-watson
1515
twine
1616

17+
# The following libraries are currently only used in our example notebooks
18+
# but may also be called from related regression tests in the future.
19+
nltk
20+
ray[default]
21+
1722

‎config/jupyter_reqs.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ nodejs
1111
ipywidgets
1212
matplotlib
1313

14-
ray
15-

‎notebooks/Analyze_Model_Outputs.ipynb

Lines changed: 2160 additions & 183 deletions
Large diffs are not rendered by default.

‎notebooks/Analyze_Text.ipynb

Lines changed: 2194 additions & 198 deletions
Large diffs are not rendered by default.

‎notebooks/Integrate_NLP_Libraries.ipynb

Lines changed: 2449 additions & 480 deletions
Large diffs are not rendered by default.

‎notebooks/Text_Extensions_for_Pandas_Overview.ipynb

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4601,11 +4601,40 @@
46014601
" <td>King Arthur</td>\n",
46024602
" </tr>\n",
46034603
"\n",
4604+
" </tbody>\n",
4605+
" </table>\n",
4606+
" <p style='\n",
4607+
" padding: 1em;\n",
4608+
" line-height: calc(var(--jp-content-line-height, 1.6) * 1.6);\n",
4609+
" '>\n",
4610+
"\n",
4611+
" In AD 932, \n",
4612+
"\n",
4613+
" <span class='mark btn-primary' style='padding:0.4em;border-radius:0.35em;background-color: #a0c4ff;color:black;'>King Arthur</span>\n",
4614+
" and his squire, Patsy, travel throughout Britain searching for men to join the Knights of the Round Table. Along the way, he recruits Sir Bedevere the Wise, Sir Lancelot the Brave, Sir Galahad the Pure, Sir Robin the Not-Quite-So-Brave-as-Sir-Lancelot, and Sir Not-Appearing-in-this-Film, along with their squires and Robin&#39;s troubadours.\n",
4615+
" </p>\n",
4616+
" </div>\n",
4617+
"\n",
4618+
" <div class='document'>\n",
4619+
" <table style='\n",
4620+
" table-layout: auto;\n",
4621+
" overflow: hidden;\n",
4622+
" width: 100%;\n",
4623+
" border-collapse: collapse;\n",
4624+
" '>\n",
4625+
" <thead style='font-variant-caps: all-petite-caps;'>\n",
4626+
" <th></th>\n",
4627+
" <th>begin</th>\n",
4628+
" <th>end</th>\n",
4629+
" <th style='text-align:right;width:100%'>context</th>\n",
4630+
" </tr></thead>\n",
4631+
" <tbody>\n",
4632+
"\n",
46044633
" <tr>\n",
4605-
" <td><b>1</b></td>\n",
4634+
" <td><b>0</b></td>\n",
46064635
" <td>0</td>\n",
46074636
" <td>15</td>\n",
4608-
" <td>In AD 932, King</td>\n",
4637+
" <td>Second document</td>\n",
46094638
" </tr>\n",
46104639
"\n",
46114640
" </tbody>\n",
@@ -4615,30 +4644,10 @@
46154644
" line-height: calc(var(--jp-content-line-height, 1.6) * 1.6);\n",
46164645
" '>\n",
46174646
"\n",
4618-
" In AD 932, \n",
4619-
"\n",
4620-
" <span class='mark btn-primary' style='padding:0.4em;border-radius:0.35em;background-color: #a0c4ff;color:black;'>King Arthur</span>\n",
46214647
"\n",
46224648
"\n",
4649+
" <span class='mark btn-primary' style='padding:0.4em;border-radius:0.35em;background-color: #a0c4ff;color:black;'>Second document</span>\n",
46234650
"\n",
4624-
" <span class='mark btn-info complex-set' style='\n",
4625-
" padding:0.4em;\n",
4626-
" border-radius:0.35em;\n",
4627-
" background:linear-gradient(to right, #a0c4ff, #ffadad);\n",
4628-
" color: black;\n",
4629-
" '>In AD 932, King Arthur\n",
4630-
" <span class='mark-tag' style='\n",
4631-
" font-weight: bolder;\n",
4632-
" font-size: 0.8em;\n",
4633-
" font-variant: small-caps;\n",
4634-
" font-variant-caps: small-caps;\n",
4635-
" font-variant-caps: all-small-caps;\n",
4636-
" margin-left: 8px;\n",
4637-
" text-transform: uppercase;\n",
4638-
" color: black;\n",
4639-
" '>Set</span>\n",
4640-
" </span>\n",
4641-
" and his squire, Patsy, travel throughout Britain searching for men to join the Knights of the Round Table. Along the way, he recruits Sir Bedevere the Wise, Sir Lancelot the Brave, Sir Galahad the Pure, Sir Robin the Not-Quite-So-Brave-as-Sir-Lancelot, and Sir Not-Appearing-in-this-Film, along with their squires and Robin&#39;s troubadours.\n",
46424651
" </p>\n",
46434652
" </div>\n",
46444653
"\n",
@@ -4651,11 +4660,17 @@
46514660
" const documents = []\n",
46524661
"\n",
46534662
" {\n",
4654-
" const doc_spans = Span.arrayFromSpanArray([[11,22],[0,15]])\n",
4663+
" const doc_spans = Span.arrayFromSpanArray([[11,22]])\n",
46554664
" const doc_text = 'In AD 932, King Arthur and his squire, Patsy, travel throughout Britain searching for men to join the Knights of the Round Table. Along the way, he recruits Sir Bedevere the Wise, Sir Lancelot the Brave, Sir Galahad the Pure, Sir Robin the Not-Quite-So-Brave-as-Sir-Lancelot, and Sir Not-Appearing-in-this-Film, along with their squires and Robin\\'s troubadours.'\n",
46564665
" documents.push({doc_text: doc_text, doc_spans: doc_spans})\n",
46574666
" }\n",
46584667
"\n",
4668+
" {\n",
4669+
" const doc_spans = Span.arrayFromSpanArray([[0,15]])\n",
4670+
" const doc_text = 'Second document'\n",
4671+
" documents.push({doc_text: doc_text, doc_spans: doc_spans})\n",
4672+
" }\n",
4673+
"\n",
46594674
" const instance = new window.SpanArray.SpanArray(documents, true, script_context)\n",
46604675
" instance.render()\n",
46614676
" }\n",
@@ -5057,7 +5072,7 @@
50575072
" [4, 5],\n",
50585073
" [6, 7],\n",
50595074
" [8, 9]]),\n",
5060-
" <text_extensions_for_pandas.array.tensor.TensorDtype at 0x7fb59860c3a0>)"
5075+
" <text_extensions_for_pandas.array.tensor.TensorDtype at 0x7f9ae00cadc0>)"
50615076
]
50625077
},
50635078
"execution_count": 22,
@@ -5438,17 +5453,17 @@
54385453
" <tr>\n",
54395454
" <th>0</th>\n",
54405455
" <td>[0, 2): 'In'</td>\n",
5441-
" <td>[1, 0, 0, 0]</td>\n",
5456+
" <td>[0, 0, 0, 1]</td>\n",
54425457
" </tr>\n",
54435458
" <tr>\n",
54445459
" <th>1</th>\n",
54455460
" <td>[3, 5): 'AD'</td>\n",
5446-
" <td>[0, 1, 0, 0]</td>\n",
5461+
" <td>[0, 0, 0, 1]</td>\n",
54475462
" </tr>\n",
54485463
" <tr>\n",
54495464
" <th>2</th>\n",
54505465
" <td>[6, 9): '932'</td>\n",
5451-
" <td>[1, 0, 0, 0]</td>\n",
5466+
" <td>[0, 1, 0, 0]</td>\n",
54525467
" </tr>\n",
54535468
" <tr>\n",
54545469
" <th>3</th>\n",
@@ -5458,19 +5473,19 @@
54585473
" <tr>\n",
54595474
" <th>4</th>\n",
54605475
" <td>[16, 22): 'Arthur'</td>\n",
5461-
" <td>[0, 0, 1, 0]</td>\n",
5476+
" <td>[0, 1, 0, 0]</td>\n",
54625477
" </tr>\n",
54635478
" </tbody>\n",
54645479
"</table>\n",
54655480
"</div>"
54665481
],
54675482
"text/plain": [
54685483
" span features\n",
5469-
"0 [0, 2): 'In' [1, 0, 0, 0]\n",
5470-
"1 [3, 5): 'AD' [0, 1, 0, 0]\n",
5471-
"2 [6, 9): '932' [1, 0, 0, 0]\n",
5484+
"0 [0, 2): 'In' [0, 0, 0, 1]\n",
5485+
"1 [3, 5): 'AD' [0, 0, 0, 1]\n",
5486+
"2 [6, 9): '932' [0, 1, 0, 0]\n",
54725487
"3 [11, 15): 'King' [1, 0, 0, 0]\n",
5473-
"4 [16, 22): 'Arthur' [0, 0, 1, 0]"
5488+
"4 [16, 22): 'Arthur' [0, 1, 0, 0]"
54745489
]
54755490
},
54765491
"execution_count": 32,
@@ -5530,17 +5545,17 @@
55305545
" <tr>\n",
55315546
" <th>0</th>\n",
55325547
" <td>[0, 2): 'In'</td>\n",
5533-
" <td>[1, 0, 0, 0]</td>\n",
5548+
" <td>[0, 0, 0, 1]</td>\n",
55345549
" </tr>\n",
55355550
" <tr>\n",
55365551
" <th>1</th>\n",
55375552
" <td>[3, 5): 'AD'</td>\n",
5538-
" <td>[0, 1, 0, 0]</td>\n",
5553+
" <td>[0, 0, 0, 1]</td>\n",
55395554
" </tr>\n",
55405555
" <tr>\n",
55415556
" <th>2</th>\n",
55425557
" <td>[6, 9): '932'</td>\n",
5543-
" <td>[1, 0, 0, 0]</td>\n",
5558+
" <td>[0, 1, 0, 0]</td>\n",
55445559
" </tr>\n",
55455560
" <tr>\n",
55465561
" <th>3</th>\n",
@@ -5550,19 +5565,19 @@
55505565
" <tr>\n",
55515566
" <th>4</th>\n",
55525567
" <td>[16, 22): 'Arthur'</td>\n",
5553-
" <td>[0, 0, 1, 0]</td>\n",
5568+
" <td>[0, 1, 0, 0]</td>\n",
55545569
" </tr>\n",
55555570
" </tbody>\n",
55565571
"</table>\n",
55575572
"</div>"
55585573
],
55595574
"text/plain": [
55605575
" span features\n",
5561-
"0 [0, 2): 'In' [1, 0, 0, 0]\n",
5562-
"1 [3, 5): 'AD' [0, 1, 0, 0]\n",
5563-
"2 [6, 9): '932' [1, 0, 0, 0]\n",
5576+
"0 [0, 2): 'In' [0, 0, 0, 1]\n",
5577+
"1 [3, 5): 'AD' [0, 0, 0, 1]\n",
5578+
"2 [6, 9): '932' [0, 1, 0, 0]\n",
55645579
"3 [11, 15): 'King' [1, 0, 0, 0]\n",
5565-
"4 [16, 22): 'Arthur' [0, 0, 1, 0]"
5580+
"4 [16, 22): 'Arthur' [0, 1, 0, 0]"
55665581
]
55675582
},
55685583
"execution_count": 34,
@@ -5613,9 +5628,9 @@
56135628
],
56145629
"metadata": {
56155630
"kernelspec": {
5616-
"display_name": "pd",
5631+
"display_name": "Python 3",
56175632
"language": "python",
5618-
"name": "pd"
5633+
"name": "python3"
56195634
},
56205635
"language_info": {
56215636
"codemirror_mode": {

‎setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@
2424

2525
setuptools.setup(
2626
name="text_extensions_for_pandas",
27-
version="0.1b4",
27+
version="0.1",
2828
author="IBM",
29-
author_email="frreiss@example.com",
29+
author_email="frreiss@us.ibm.com",
3030
description="Natural language processing support for Pandas dataframes.",
3131
long_description=long_description,
3232
long_description_content_type="text/markdown",
33-
# Note that this URL is where the project *will* be, not where it currently is.
3433
url="https://github.com/CODAIT/text-extensions-for-pandas",
3534
install_requires=requirements,
3635
packages=setuptools.find_packages(),

0 commit comments

Comments
 (0)