Merge pull request #249 from frreiss/pandas2

Various changes for Pandas 2.x compability.

.gitignore

@@ -1,3 +1,6 @@
+# VSCode config
+.vscode
+
 # JupyterLab temp files
 .virtual_documents
 

config/dev_reqs.txt

@@ -7,10 +7,11 @@ pytest
 pyyaml
 transformers>=3.0.0
 # SpaCy models aren't stable across point releases
-spacy==3.0.5
+spacy==3.6.0
 ipywidgets
 ibm-watson
 twine
+hypothesis
 
 # Documentation-related requirements have moved to non_36_reqs.txt.
 #sphinx

config/non_36_reqs.txt

@@ -4,8 +4,14 @@
 # This list will probably grow as libraries drop support.
 
 nltk
-ray[default]
-feather
+ray[default] >= 2.0
+
+# *** HACK ALERT ***
+# Feather depends on Numpy being exactly 1.20.2, which breaks Pandas.
+# So we don't include a dependency on it and hope for the best.
+#feather
+# *** END HACK ***
+
 
 sphinx
 sphinxcontrib-apidoc

notebooks/.gitignore

@@ -0,0 +1,2 @@
+CoNLL_u_test_inputs
+

notebooks/Analyze_Model_Outputs.ipynb

@@ -30,7 +30,9 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [],
    "source": [
     "import os\n",
@@ -72,7 +74,9 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [
     {
      "data": {
@@ -323,7 +327,9 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [
     {
      "data": {
@@ -504,7 +510,9 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [
     {
      "data": {
@@ -666,7 +674,9 @@
   {
    "cell_type": "code",
    "execution_count": 5,
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "outputs": [
     {
      "data": {
@@ -4584,12 +4594,12 @@
     }
    ],
    "source": [
-    "from IPython.core.display import display, HTML\n",
-    "display(HTML(\"<h3>PER entities in corpus for document 75:</h3>\"))\n",
-    "display(corpus_person[75])\n",
+    "from IPython import display\n",
+    "display.display(display.HTML(\"<h3>PER entities in corpus for document 75:</h3>\"))\n",
+    "display.display(corpus_person[75])\n",
     "\n",
-    "display(HTML(\"<p><h3>PER entities in model outputs for document 75:</h3>\"))\n",
-    "display(bender_person[75])"
+    "display.display(display.HTML(\"<p><h3>PER entities in model outputs for document 75:</h3>\"))\n",
+    "display.display(bender_person[75])"
    ]
   },
   {
@@ -5382,7 +5392,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.8.17"
   }
  },
  "nbformat": 4,