-
Notifications
You must be signed in to change notification settings - Fork 40
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
Migrate to Jupyter Lab v4 #135
base: master
Are you sure you want to change the base?
Changes from 7 commits
919975f
2ec7c56
2b644aa
524b819
512bb08
5bac400
ca53993
78f8b1b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,10 +3,10 @@ name: Tests | |
on: | ||
push: | ||
branches: | ||
- master | ||
- master | ||
pull_request: | ||
branches: | ||
- master | ||
- master | ||
|
||
defaults: | ||
run: | ||
|
@@ -23,78 +23,72 @@ jobs: | |
python-version: [3.9] | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Install Conda environment with Micromamba | ||
uses: mamba-org/provision-with-micromamba@main | ||
with: | ||
environment-name: ipywebrtc-dev | ||
environment-file: dev_environment.yml | ||
python-version: ${{ matrix.python-version }} | ||
mamba-version: "*" | ||
auto-activate-base: false | ||
channels: conda-forge | ||
|
||
- name: Test flake8 | ||
run: flake8 ipywebrtc --ignore=E501,F405 | ||
|
||
- name: Install ipywebrtc | ||
run: pip install . | ||
|
||
- name: Check installation files | ||
run: | | ||
test -d $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc | ||
test -f $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc/extension.js | ||
test -f $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc/index.js | ||
test -d $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc | ||
test -f $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc/package.json | ||
|
||
- name: Check nbextension and labextension | ||
run: | | ||
jupyter nbextension list 2>&1 | grep -ie "jupyter-webrtc/extension.*enabled" - | ||
jupyter labextension list 2>&1 | grep -ie "jupyter-webrtc.*enabled.*ok" - | ||
|
||
- name: Run js tests | ||
run: | | ||
npm install | ||
npm run test | ||
working-directory: js | ||
|
||
- name: Build docs (Only on MacOS for build speed) | ||
if: matrix.os == 'macos-latest' | ||
run: | | ||
cd docs/source/ | ||
sphinx-build . _build/html | ||
cd ../.. | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Install Conda environment with Micromamba | ||
uses: mamba-org/setup-micromamba@v1 | ||
with: | ||
environment-file: dev_environment.yml | ||
condarc: | | ||
dependencies: | ||
- python==${{ matrix.python-version }} | ||
|
||
- name: Test flake8 | ||
run: flake8 ipywebrtc --ignore=E501,F405 | ||
|
||
- name: Install ipywebrtc | ||
run: pip install . | ||
|
||
- name: Check installation files | ||
run: | | ||
test -d $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc | ||
test -f $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc/extension.js | ||
test -f $CONDA_PREFIX/share/jupyter/nbextensions/jupyter-webrtc/index.js | ||
test -d $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc | ||
test -f $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc/package.json | ||
|
||
- name: Check nbextension and labextension | ||
run: | | ||
jupyter labextension list 2>&1 | grep -ie "jupyter-webrtc.*enabled.*ok" - | ||
|
||
- name: Run js tests | ||
run: | | ||
npm install | ||
npm run test | ||
working-directory: js | ||
|
||
- name: Build docs (Only on MacOS for build speed) | ||
if: matrix.os == 'macos-latest' | ||
run: | | ||
cd docs/source/ | ||
sphinx-build . _build/html | ||
cd ../.. | ||
|
||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Install Conda environment with Micromamba | ||
uses: mamba-org/provision-with-micromamba@main | ||
with: | ||
environment-name: ipywebrtc-dev | ||
environment-file: dev_environment.yml | ||
python-version: ${{ matrix.python-version }} | ||
mamba-version: "*" | ||
auto-activate-base: false | ||
channels: conda-forge | ||
|
||
- name: Build packages | ||
run: | | ||
python setup.py sdist bdist_wheel | ||
cd dist | ||
sha256sum * | tee SHA256SUMS | ||
- name: Upload builds | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: dist ${{ github.run_number }} | ||
path: ./dist | ||
- name: Install Conda environment with Micromamba | ||
uses: mamba-org/setup-micromamba@v1 | ||
with: | ||
environment-file: dev_environment.yml | ||
condarc: | | ||
dependencies: | ||
- python==${{ matrix.python-version }} | ||
|
||
- name: Build packages | ||
run: | | ||
python setup.py sdist bdist_wheel | ||
cd dist | ||
sha256sum * | tee SHA256SUMS | ||
- name: Upload builds | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: dist ${{ github.run_number }} | ||
path: ./dist | ||
Comment on lines
+71
to
+91
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, very difficult to see what actually changed and what is related to the intention or the PR There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's easier to review hiding the whitespaces changes https://github.com/maartenbreddels/ipywebrtc/pull/135/files?diff=split&w=1 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
install: | ||
runs-on: ${{ matrix.os }}-latest | ||
|
@@ -104,27 +98,24 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
os: [ubuntu, macos, windows] | ||
python: ['3.6', '3.9'] | ||
python: ["3.6", "3.9"] | ||
include: | ||
- python: '3.6' | ||
dist: 'ipywebrtc*.tar.gz' | ||
- python: '3.9' | ||
dist: 'ipywebrtc*.whl' | ||
- python: "3.6" | ||
dist: "ipywebrtc*.tar.gz" | ||
- python: "3.9" | ||
dist: "ipywebrtc*.whl" | ||
Comment on lines
+103
to
+106
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This isn't that bad, because it's not mixed with other changes, but adds noise. |
||
|
||
steps: | ||
|
||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Install Conda environment with Micromamba | ||
uses: mamba-org/provision-with-micromamba@main | ||
uses: mamba-org/setup-micromamba@v1 | ||
with: | ||
environment-name: ipywebrtc-dev | ||
environment-file: dev_environment.yml | ||
python-version: ${{ matrix.python-version }} | ||
mamba-version: "*" | ||
auto-activate-base: false | ||
channels: conda-forge | ||
condarc: | | ||
dependencies: | ||
- python==${{ matrix.python-version }} | ||
|
||
- uses: actions/download-artifact@v2 | ||
with: | ||
|
@@ -145,8 +136,5 @@ jobs: | |
test -f $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc/package.json | ||
test -d $CONDA_PREFIX/share/jupyter/labextensions/jupyter-webrtc/static | ||
|
||
- name: Validate the nbextension | ||
run: jupyter nbextension list 2>&1 | grep "jupyter-webrtc/extension" | ||
|
||
- name: Validate the labextension | ||
run: jupyter labextension list 2>&1 | grep jupyter-webrtc |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,3 +12,5 @@ share | |
|
||
# OS X | ||
.DS_Store | ||
|
||
.yarn/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
name: ipywebrtc-dev | ||
channels: | ||
- conda-forge | ||
- conda-forge | ||
dependencies: | ||
- pip | ||
- nodejs=14.* | ||
- yarn | ||
- jupyter-packaging | ||
- jupyterlab=3 | ||
- notebook | ||
- ipywidgets>=7.6 | ||
- flake8 | ||
- nbsphinx | ||
- sphinx | ||
- sphinx_rtd_theme | ||
- pygments==2.6.1 | ||
- jupyter-sphinx | ||
- pip | ||
- nodejs=14.* | ||
- yarn | ||
- jupyter-packaging | ||
- jupyterlab=4 | ||
- notebook | ||
- ipywidgets>=7.6 | ||
- flake8 | ||
- nbsphinx | ||
- sphinx | ||
- sphinx_rtd_theme | ||
- pygments==2.6.1 | ||
- jupyter-sphinx |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
enableImmutableInstalls: false | ||
nodeLinker: node-modules |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please avoid unneeded changes/reformatting, or put them in a separate PR or top commit first. This makes tracking changes much easier.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand what you're saying, I can do a new PR for style changes.