solve conflict

niekveldhuis · May 31, 2024 · b6b947e · b6b947e
2 parents 2f317b0 + 46957e7
commit b6b947e
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 35 deletions.
diff --git a/2_1_Data_Acquisition_ORACC/2_1_3_basic_ORACC-JSON_parser.ipynb b/2_1_Data_Acquisition_ORACC/2_1_3_basic_ORACC-JSON_parser.ipynb
@@ -83,7 +83,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {
     "tags": []
    },
@@ -114,14 +114,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 7,
    "metadata": {
     "tags": [
      "remove-output"
     ]
    },
    "outputs": [
     {
+<<<<<<< HEAD
      "ename": "SSLError",
      "evalue": "HTTPSConnectionPool(host='oracc.museum.upenn.edu', port=443): Max retries exceeded with url: /obmc/json/obmc.zip (Caused by SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1129)')))",
      "output_type": "error",
@@ -155,11 +156,32 @@
       "\u001b[1;32m~\\anaconda3\\lib\\site-packages\\requests\\adapters.py\u001b[0m in \u001b[0;36msend\u001b[1;34m(self, request, stream, timeout, verify, cert, proxies)\u001b[0m\n\u001b[0;32m    512\u001b[0m             \u001b[1;32mif\u001b[0m \u001b[0misinstance\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0me\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mreason\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0m_SSLError\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    513\u001b[0m                 \u001b[1;31m# This branch is for urllib3 v1.22 and later.\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 514\u001b[1;33m                 \u001b[1;32mraise\u001b[0m \u001b[0mSSLError\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0me\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mrequest\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mrequest\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m    515\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    516\u001b[0m             \u001b[1;32mraise\u001b[0m \u001b[0mConnectionError\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0me\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mrequest\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mrequest\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
       "\u001b[1;31mSSLError\u001b[0m: HTTPSConnectionPool(host='oracc.museum.upenn.edu', port=443): Max retries exceeded with url: /obmc/json/obmc.zip (Caused by SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1129)')))"
      ]
+=======
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Saving http://oracc.ub.uni-muenchen.de/saao/saa01/json/saao-saa01.zip as jsonzip/saao-saa01.zip.\n"
+     ]
+    },
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "e947364074aa474880d48c052742ab79",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "saao/saa01: |          | 0.00/0.00 [00:00<?, ?B/s]"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+>>>>>>> 46957e72bfe12a2de0e19b213c0ca1a6b11d4f1b
     }
    ],
    "source": [
     "project_list = utils.format_project_list(projects.value)\n",
-    "project_list = utils.oracc_download(project_list)"
+    "project_list = utils.oracc_download(project_list, server = 'lmu')"
    ]
   },
   {
@@ -1096,7 +1118,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
+<<<<<<< HEAD
    "version": "3.9.7"
+=======
+   "version": "3.7.9"
+>>>>>>> 46957e72bfe12a2de0e19b213c0ca1a6b11d4f1b
   },
   "toc-autonumbering": false
  },

diff --git a/4_Networking_Treasure_Archive/4_1_Build-Treasure-network.ipynb b/4_Networking_Treasure_Archive/4_1_Build-Treasure-network.ipynb
@@ -1729,7 +1729,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.8"
+   "version": "3.7.9"
   },
   "toc-autonumbering": true,
   "toc-showcode": false,