Merge pull request #310 from toolsforexperiments/astafan8/fixmypy

Fix CI: install x11-utils for xvfb workaround, convert "signedinteger[_64Bit]" to int
toolsforexperiments · Jul 14, 2022 · 25143d2 · 25143d2
2 parents 634bcf4 + 1401531
commit 25143d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - name: setup ubuntu-latest xvfb
       run: |
-        sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
+        sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
         /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/plottr/data/datadict.py b/plottr/data/datadict.py
@@ -853,7 +853,7 @@ def expand(self) -> 'DataDict':
             return self.copy()
 
         ishp = self._inner_shapes()
-        size = max([np.prod(s) for s in ishp.values()])
+        size = max([int(np.prod(s)) for s in ishp.values()])
 
         for k, v in self.data_items():
             reps = size // np.prod(ishp[k])