Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxbro committed Apr 20, 2023
1 parent b3012d3 commit d2ec764
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -60,7 +60,7 @@ jobs:
steps:
- uses: pyviz-dev/holoviz_tasks/install@v0.1a9
with:
name: unit_test_suite_bokeh${{ matrix.bokeh-version }}_pandas${{ matrix.pandas-version }}
name: unit_test_suite_bokeh${{ matrix.bokeh-version }}
python-version: ${{ matrix.python-version }}
channel-priority: strict
channels: pyviz/label/dev,conda-forge,nodefaults
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]

Expand Down Expand Up @@ -140,11 +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",
"setuptools >=30.3.0",
Expand Down

0 comments on commit d2ec764

Please sign in to comment.