Merge pull request #17 from gambitproject/gambit-layout

Integrate Gambit layout functionality

Author: edwardchalstrey1

.github/workflows/test.yml

@@ -21,11 +21,17 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+    
+    - name: Install LaTeX
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y texlive-full
         
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -e .[dev]
+        pip install git+https://github.com/gambitproject/gambit.git # TODO: add pygambit to dev dependencies after 16.5 release.
         
     - name: Test with pytest
       run: |

.gitignore

@@ -155,4 +155,5 @@ temp*
 .temp*
 
 # .ef files generated from .efg files (the test suite)
-games/efg/*.ef
+games/efg/*.ef
+tutorial/*.ef

pyproject.toml

@@ -29,7 +29,7 @@ keywords = ["game theory", "tikz", "visualization", "trees", "economics"]
 dependencies = ["jupyter-tikz", "ipykernel"]
 
 [project.optional-dependencies]
-dev = ["pytest>=7.0.0", "pytest-cov"]
+dev = ["pytest>=7.0.0", "pytest-cov", "nbformat", "nbclient", "ipykernel"]
 
 [project.scripts]
 draw_tree = "draw_tree.cli:main"

src/draw_tree/__init__.py

@@ -15,9 +15,11 @@
     generate_png,
     ef_to_tex,
     latex_wrapper,
-    efg_to_ef
+    efg_dl_ef
 )
 
+from .gambit_layout import gambit_layout_to_ef
+
 __all__ = [
     "draw_tree",
     "generate_tikz",
@@ -26,5 +28,6 @@
     "generate_png",
     "ef_to_tex",
     "latex_wrapper",
-    "efg_to_ef"
+    "efg_dl_ef",
+    "gambit_layout_to_ef"
 ]