From 92ce242ffdbe0b33f9646ccaa25fbafed305cf6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= <simon.hansen@me.com>
Date: Thu, 20 Apr 2023 09:15:05 +0200
Subject: [PATCH] Clean up

---
 .github/workflows/test.yaml | 4 ++--
 setup.py                    | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b20c611566..21e05615ea 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: pre-commit
         uses: pre-commit/action@v3.0.0
   test_suite:
-    name: Pytest on ${{ matrix.python-version }}, Bokeh ${{ matrix.bokeh-version }}, Pandas ${{ matrix.pandas-version }}, ${{ matrix.os }}
+    name: Pytest on ${{ matrix.python-version }}, Bokeh ${{ matrix.bokeh-version }}, ${{ matrix.os }}
     needs: [pre_commit]
     runs-on: ${{ matrix.os }}
     strategy:
@@ -50,7 +50,7 @@ jobs:
       run:
         shell: bash -el {0}
     env:
-      DESC: "Python ${{ matrix.python-version }} - Bokeh ${{ matrix.bokeh-version }}"
+      DESC: "Python ${{ matrix.python-version }} - Bokeh ${{ matrix.bokeh-version }} tests"
       PYTHON_VERSION: ${{ matrix.python-version }}
       SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
       DISPLAY: ":99.0"
diff --git a/setup.py b/setup.py
index 26e04201b9..858acacc27 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@
 # Packages not working on python 3.11 because of numba
 if sys.version_info < (3, 11):
     extras_require['tests'] += [
+        'spatialpandas',
         'datashader >=0.11.1',
     ]
 
@@ -140,10 +141,6 @@
 extras_require['bokeh2'] = ["panel <1.0.0a1"]
 extras_require['bokeh3'] = ["panel >=1.0.0a1"]
 
-# Packages not working on python 3.11 because of numba and
-# not working on bokeh 3 because of dask
-if sys.version_info < (3, 11):
-    extras_require['bokeh2'].append("spatialpandas")
 
 extras_require["build"] = [
     "param >=1.7.0",