Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #424

Merged
merged 5 commits into from
Jan 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 34 additions & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-environment: ipyvolume-test
environment-file: environment-test.yml
python-version: ${{ matrix.python-version }}
mamba-version: "*"
auto-activate-base: false
channels: conda-forge
environment-file: environment-test.yml
environment-name: ipyvolume-test
extra-specs: |
python=3.9
pytest=${{ matrix.pytest }}

- name: Python PEP8 check
run: flake8 ipyvolume
Expand All @@ -41,15 +40,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-environment: ipyvolume-test
environment-file: environment-test.yml
python-version: ${{ matrix.python-version }}
mamba-version: "*"
auto-activate-base: false
channels: conda-forge
environment-file: environment-test.yml
environment-name: ipyvolume-test
extra-specs: |
python=${{ matrix.python-version }}

- name: Install the package
run: |
Expand Down Expand Up @@ -112,15 +109,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-environment: ipyvolume-test
environment-file: environment-test.yml
python-version: 3.9
mamba-version: "*"
auto-activate-base: false
channels: conda-forge
environment-name: ipyvolume-test
extra-specs: |
python=3.9
pytest=${{ matrix.pytest }}

- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -176,15 +172,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-environment: ipyvolume-test
environment-file: environment-test.yml
python-version: ${{ matrix.python-version }}
mamba-version: "*"
auto-activate-base: false
channels: conda-forge
environment-file: environment-test.yml
environment-name: ipyvolume-test
extra-specs: |
python=${{ matrix.python-version }}

- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -226,20 +220,24 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
- name: Install node
uses: actions/setup-node@v1
with:
node-version: "14.x"
registry-url: "https://registry.npmjs.org"

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge

- uses: actions/download-artifact@v2
with:
name: dist ${{ github.run_number }}
path: ./dist

- name: Install JupyterLab 2
run: mamba install yarn jupyterlab=2 nodejs=14
run: pip install jupyterlab==2

- name: Install the labextension
run: jupyter labextension install dist/ipyvolume*.tgz --debug
2 changes: 1 addition & 1 deletion environment-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- pip
- python
- yarn
- nodejs=12
- nodejs=14.*
- ipywidgets >=5.2.2
- traitlets >=4.3.0
- traittypes >=0.0.6
Expand Down
5 changes: 2 additions & 3 deletions ipyvolume/bokeh.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
from __future__ import absolute_import

import ipywidgets as widgets
from traitlets import Unicode
from bokeh.models import CustomJS
from traitlets import Unicode

import ipyvolume


semver_range_frontend = "~" + ipyvolume._version.__version_js__


@widgets.register('ipyvolume.WidgetManagerHack')
@widgets.register
class WidgetManagerHackModel(widgets.Widget):
_model_name = Unicode('WidgetManagerHackModel').tag(sync=True)
_model_module = Unicode('ipyvolume').tag(sync=True)
Expand Down
1 change: 1 addition & 0 deletions requirements_rtd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ vaex-viz
# see https://github.com/sphinx-doc/sphinx/issues/9727#issuecomment-952289876
docutils==0.17.1
bokeh
ipython_genutils
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def read(fname):
'requests',
'ipyvuetify',
'ipyvue>=1.7.0',
'pythreejs>=2.0.0',
'pythreejs>=2.4.0',
'matplotlib'
],
license='MIT',
Expand Down
Binary file added ui-tests/reference-output/screenshots/6
Binary file not shown.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/lighting_ipynb_cell_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui-tests/reference-output/screenshots/scatter_ipynb_cell_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.