From bbcf11451ab2069d0412e1e77e097d5f160a1afb Mon Sep 17 00:00:00 2001
From: Matt Reimer <matt@northarrowresearch.com>
Date: Fri, 20 Oct 2023 09:13:13 -0700
Subject: [PATCH] upgrading urlib3 and cleaning a few things

---
 .vscode/launch.json           | 22 ++++++-------
 RiverscapesXML.code-workspace | 10 +++++-
 python/.vscode/launch.json    | 62 +++++++++++++++++++++--------------
 python/requirements.txt       |  2 +-
 4 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4e31af9d..628295db 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,16 +4,16 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "name": "Python: Current File",
-      "type": "python",
-      "request": "launch",
-      "program": "${file}",
-      "cwd": "${workspaceFolder}",
-      "env" : {
-        "PYTHONPATH": "${workspaceFolder}"
-      },
-      "console": "integratedTerminal"
-    }
+    // {
+    //   "name": "Python: Current File",
+    //   "type": "python",
+    //   "request": "launch",
+    //   "program": "${file}",
+    //   "cwd": "${workspaceFolder}",
+    //   "env" : {
+    //     "PYTHONPATH": "${workspaceFolder}"
+    //   },
+    //   "console": "integratedTerminal"
+    // }
   ]
 }
\ No newline at end of file
diff --git a/RiverscapesXML.code-workspace b/RiverscapesXML.code-workspace
index 68ea1f73..eff22415 100644
--- a/RiverscapesXML.code-workspace
+++ b/RiverscapesXML.code-workspace
@@ -51,5 +51,13 @@
     "python.terminal.activateEnvInCurrentTerminal": true,
     "python.terminal.activateEnvironment": true,
     "python.testing.pytestEnabled": true,
-	}
+	},
+  "extensions": {
+    "recommendations": [
+      "ms-python.pylint",
+      "ms-python.python",
+      "njpwerner.autodocstring",
+      "redhat.vscode-xml"
+    ]
+  }
 }
\ No newline at end of file
diff --git a/python/.vscode/launch.json b/python/.vscode/launch.json
index cb759010..b4b8bd3b 100644
--- a/python/.vscode/launch.json
+++ b/python/.vscode/launch.json
@@ -12,38 +12,50 @@
       "console": "integratedTerminal",
     },
     {
-      "name": "Warehouse 3.0: Migration",
+      "name": "🔬Python Test XML",
       "type": "python",
       "request": "launch",
-      "module": "migration.warehouse_migration",
+      // Run test.py
+      "program": "${workspaceFolder}/test.py",
+      "cwd": "${workspaceFolder}/../",
       "console": "integratedTerminal",
-      "envFile": "${workspaceFolder}/.env",
-      "justMyCode": true,
-      "args": [
-        // Note that we're readinf the copy here:
-        "production_01-06-2022.sqlite",
-        "old_xml",
-        "new_xml",
-        "watersheds_for_riverscapes.sqlite",
-        "champ_visit_bounds.sqlite"
-      ],
       "env": {
         "PYTHON_PATH": "${workspaceFolder}",
       }
     },
-    {
-      "name": "Warehouse 3.0: XML_Conversion",
-      "type": "python",
-      "request": "launch",
-      "module": "migration.xml_conversion",
-      "console": "integratedTerminal",
-      "envFile": "${workspaceFolder}/.env",
-      "justMyCode": true,
-      "args": [
-        // Note that we're readinf the copy here:
-        "production_11-05-2022_MIGRATION.sqlite",
-      ]
-    },
+    // {
+    //   "name": "Warehouse 3.0: Migration",
+    //   "type": "python",
+    //   "request": "launch",
+    //   "module": "migration.warehouse_migration",
+    //   "console": "integratedTerminal",
+    //   "envFile": "${workspaceFolder}/.env",
+    //   "justMyCode": true,
+    //   "args": [
+    //     // Note that we're readinf the copy here:
+    //     "production_01-06-2022.sqlite",
+    //     "old_xml",
+    //     "new_xml",
+    //     "watersheds_for_riverscapes.sqlite",
+    //     "champ_visit_bounds.sqlite"
+    //   ],
+    //   "env": {
+    //     "PYTHON_PATH": "${workspaceFolder}",
+    //   }
+    // },
+    // {
+    //   "name": "Warehouse 3.0: XML_Conversion",
+    //   "type": "python",
+    //   "request": "launch",
+    //   "module": "migration.xml_conversion",
+    //   "console": "integratedTerminal",
+    //   "envFile": "${workspaceFolder}/.env",
+    //   "justMyCode": true,
+    //   "args": [
+    //     // Note that we're readinf the copy here:
+    //     "production_11-05-2022_MIGRATION.sqlite",
+    //   ]
+    // },
     // {
     //   // This is a script you should have to run AFTER the XML migration
     //   "name": "Warehouse 3.0: DB Augmentation",
diff --git a/python/requirements.txt b/python/requirements.txt
index 6cf91dcf..5a961044 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -6,4 +6,4 @@ pylint==2.15.0
 pytest==7.2.0
 requests==2.31.0
 toml==0.10.2
-urllib3==1.26.18
+urllib3==2.0.2