revoke need to import catalog separately

Author: edwardchalstrey1

doc/tutorials/01_quickstart.ipynb

@@ -431,7 +431,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 13,
    "id": "701aa52a",
    "metadata": {},
    "outputs": [
@@ -441,15 +441,34 @@
        "['PrisonersDilemma']"
       ]
      },
+     "execution_count": 13,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "gbt.catalog.games(game_type=\"nfg\", num_players=2)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "id": "d89eff93-d9f3-4de0-ab61-6a2b8d2397b3",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "\"Prisoner's Dilemma game.\""
+      ]
+     },
      "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "from pygambit import catalog\n",
-    "\n",
-    "catalog.games(game_type=\"nfg\", num_players=2)"
+    "gbt.catalog.PrisonersDilemma.description"
    ]
   },
   {
@@ -482,7 +501,7 @@
     }
    ],
    "source": [
-    "g = catalog.PrisonersDilemma()\n",
+    "g = gbt.catalog.PrisonersDilemma()\n",
     "g"
    ]
   },
@@ -502,7 +521,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 16,
    "id": "f58eaa77",
    "metadata": {},
    "outputs": [],
@@ -520,7 +539,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 17,
    "id": "4119a2ac",
    "metadata": {},
    "outputs": [],

doc/tutorials/02_extensive_form.ipynb

@@ -1123,9 +1123,7 @@
     }
    ],
    "source": [
-    "from pygambit import catalog\n",
-    "\n",
-    "catalog.games(game_type=\"efg\", num_players=2)"
+    "gbt.catalog.games(game_type=\"efg\", num_players=2)"
    ]
   },
   {
@@ -1139,31 +1137,29 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 15,
    "id": "2933061a-a2eb-4ca7-8ce3-f350bc0678ce",
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "\n",
-      "    The unique_NE_variant makes Trust a dominant strategy, replacing the\n",
-      "    non-singleton equilibrium component from the standard version of the game\n",
-      "    where the Buyer plays \"Not Trust\" and the seller can play any mixture with\n",
-      "    < 0.5 probability on Honor with a unique NE where the Buyer plays Trust and\n",
-      "    the Seller plays Abuse.\n",
-      "    \n"
+      "The unique_NE_variant makes Trust a dominant strategy, replacing the\n",
+      "non-singleton equilibrium component from the standard version of the game\n",
+      "where the Buyer plays \"Not Trust\" and the seller can play any mixture with\n",
+      "< 0.5 probability on Honor with a unique NE where the Buyer plays Trust and\n",
+      "the Seller plays Abuse.\n"
      ]
     }
    ],
    "source": [
-    "print(catalog.OneShotTrust.description)"
+    "print(gbt.catalog.OneShotTrust.description)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 16,
    "id": "4556c0bf",
    "metadata": {},
    "outputs": [
@@ -1342,13 +1338,13 @@
        "<IPython.core.display.SVG object>"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "draw_tree(catalog.OneShotTrust(unique_NE_variant=True))"
+    "draw_tree(gbt.catalog.OneShotTrust(unique_NE_variant=True))"
    ]
   },
   {
@@ -1368,7 +1364,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 17,
    "id": "37c51152",
    "metadata": {},
    "outputs": [],
@@ -1386,7 +1382,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 18,
    "id": "0d86a750",
    "metadata": {},
    "outputs": [],
@@ -1405,7 +1401,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 19,
    "id": "1bab777f-8a0b-4f1e-9c0c-270690288243",
    "metadata": {},
    "outputs": [],
@@ -1417,7 +1413,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 20,
    "id": "2b715221-e427-4092-ad2f-9f4f2b548fa4",
    "metadata": {},
    "outputs": [],

src/pygambit/__init__.py

@@ -26,6 +26,7 @@
     nash,  # noqa: F401
     qre,  # noqa: F401
     supports,  # noqa: F401
+    catalog,  # noqa: F401
 )
 
 import importlib.metadata