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

Add Cell tag-based style UI #40

Draft
wants to merge 55 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8aa38f7
bump some deps
bollwyvl Dec 22, 2022
0e97aa7
more widgets
bollwyvl Dec 22, 2022
e0a0112
more lite deps
bollwyvl Dec 22, 2022
0fccebd
fix broken shields
bollwyvl Dec 22, 2022
4d53662
fix rtd link
bollwyvl Dec 22, 2022
8edfa82
clean up github env paths
bollwyvl Dec 22, 2022
2424003
don't use conda cache
bollwyvl Dec 22, 2022
cd652f9
handle newer .conda packages
bollwyvl Dec 22, 2022
5d22935
update more envs, README
bollwyvl Dec 22, 2022
08ec730
linting
bollwyvl Dec 22, 2022
75f5136
fix pages ci
bollwyvl Dec 22, 2022
9dcaccf
linting, relock yarn
bollwyvl Dec 22, 2022
db4f306
spelling
bollwyvl Dec 22, 2022
f9808dc
spelling
bollwyvl Dec 22, 2022
ccc57bb
start design manager, hoist layover
bollwyvl Dec 24, 2022
bf4dd8c
move part styles
bollwyvl Dec 24, 2022
0e7ee7e
move fonts to design
bollwyvl Dec 24, 2022
41f6021
move style presets to design
bollwyvl Dec 24, 2022
cb73854
fix settings, move hideLayover
bollwyvl Dec 24, 2022
e53a093
hoist sort comparator
bollwyvl Dec 24, 2022
e3e1290
hoist more to public exports
bollwyvl Dec 24, 2022
e00fa71
normalize plugin structure
bollwyvl Dec 24, 2022
36bf221
start toolmanager
bollwyvl Dec 24, 2022
ea68734
start refactor of design tools
bollwyvl Dec 24, 2022
0b0dd12
add layover tool
bollwyvl Dec 24, 2022
bb1f001
work on selector
bollwyvl Dec 25, 2022
948c532
more work on selector, style, nulls
bollwyvl Dec 26, 2022
3162ef0
update selector atest
bollwyvl Dec 27, 2022
6158693
use box shadow, border radius for selectors
bollwyvl Dec 27, 2022
5789726
add onDisposed to button
bollwyvl Dec 27, 2022
a2bfead
some work on cleanup
bollwyvl Dec 27, 2022
51b0479
start sliders
bollwyvl Dec 29, 2022
9af4acc
wire up sliders
bollwyvl Dec 29, 2022
4ec3974
clean up slider tests
bollwyvl Jan 2, 2023
643907f
remove old design tools
bollwyvl Jan 4, 2023
e81055f
move slide type out to notebook plugin
bollwyvl Jan 10, 2023
1786e37
show multi-cell ops
bollwyvl Jan 10, 2023
6c097b1
work on selected command
bollwyvl Feb 25, 2023
a99d17b
resolve frontend
bollwyvl Feb 25, 2023
99bbc20
more env work
bollwyvl Feb 25, 2023
2529c35
test multi-cell selection slide type commands
bollwyvl Feb 26, 2023
1640fac
remove jupyterlab-myst
bollwyvl Feb 26, 2023
093bbbc
demysting
bollwyvl Feb 26, 2023
f8f2303
bump/test minimum python
bollwyvl Feb 26, 2023
9690304
linting
bollwyvl Feb 26, 2023
43c0d5a
bump minor version, changelog
bollwyvl Feb 26, 2023
070ff87
spelling
bollwyvl Feb 26, 2023
22e5d56
add jupyterlab-markup
bollwyvl Feb 26, 2023
cb9ebd3
fix version
bollwyvl Feb 26, 2023
4866fde
add jsonschema-with-format-nongpl
bollwyvl Feb 26, 2023
dc93d14
clean up harder between tests
bollwyvl Feb 26, 2023
6611a39
some CI tweaks
bollwyvl Feb 26, 2023
32eb975
more keyboard tweaks
bollwyvl Feb 26, 2023
4d54d13
more keyboard tuning
bollwyvl Feb 26, 2023
fb4d878
wuks
bollwyvl Feb 27, 2023
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
21 changes: 11 additions & 10 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ channels:
- nodefaults

dependencies:
- python >=3.10,<3.11
- python >=3.11,<3.12
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8
- jupyterlab >=3.4.8,<4
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.7,<3.11
- python >=3.8,<3.12
### environment-base.yml ###
### environment-build.yml ###
# runtimes
- nodejs >=16,<17
- nodejs >=16,!=17.*,<19
# host app
- ipywidgets >=8
- ipywidgets >=8.0.4
# build
- flit >=3.7.1
- twine
Expand All @@ -37,9 +39,7 @@ dependencies:
### environment-docs.yml ###
# demo
- ipydrawio
- jupyter-videochat
- jupyterlab-myst
- jupyterlab-webrtc-docprovider
- jupyterlab-markup
# docs
- docutils >=0.18
- pydata-sphinx-theme
Expand All @@ -53,8 +53,9 @@ dependencies:
- pytest-check-links
# lite cruft
- pkginfo
- python-libarchive-c
- pip:
- jupyterlite ==0.1.0b14
- jupyterlite ==0.1.0b18
### environment-docs.yml ###
### environment-test.yml ###
# test
Expand Down
9 changes: 0 additions & 9 deletions .github/environment-base.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--
Thanks for contributing to jupikchr!
Please fill out the following items to submit a pull request.
See the contributing guidelines for more information:
https://github.com/deathbeds/jupikchr/blob/main/CONTRIBUTING.md
-->

## References

<!-- Note issue numbers this pull request addresses (should be at least one, see contributing guidelines above). -->

<!-- Note any other pull requests that address this issue and how this pull request is different. -->

## Code changes

<!-- Describe the code changes and how they address the issue. -->

## User-facing changes

<!-- Describe any visual or user interaction changes and how they address the issue. -->

<!-- For visual changes, include before and after screenshots here. -->

## Backwards-incompatible changes

<!-- Describe any backwards-incompatible changes to JupyterLite public APIs. -->
11 changes: 11 additions & 0 deletions .github/reqs/environment-base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
dependencies:
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.8,<3.12
### environment-base.yml ###
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ channels:
- nodefaults

dependencies:
- python >=3.10,<3.11
- python >=3.11,<3.12
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8
- jupyterlab >=3.4.8,<4
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.7,<3.11
- python >=3.8,<3.12
### environment-base.yml ###
### environment-build.yml ###
# runtimes
- nodejs >=16,<17
- nodejs >=16,!=17.*,<19
# host app
- ipywidgets >=8
- ipywidgets >=8.0.4
# build
- flit >=3.7.1
- twine
Expand Down
21 changes: 11 additions & 10 deletions .github/environment-docs.yml → .github/reqs/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ channels:
- nodefaults

dependencies:
- python >=3.10,<3.11
- python >=3.11,<3.12
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8
- jupyterlab >=3.4.8,<4
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.7,<3.11
- python >=3.8,<3.12
### environment-base.yml ###
### environment-build.yml ###
# runtimes
- nodejs >=16,<17
- nodejs >=16,!=17.*,<19
# host app
- ipywidgets >=8
- ipywidgets >=8.0.4
# build
- flit >=3.7.1
- twine
### environment-build.yml ###
### environment-docs.yml ###
# demo
- ipydrawio
- jupyter-videochat
- jupyterlab-myst
- jupyterlab-webrtc-docprovider
- jupyterlab-markup
# docs
- docutils >=0.18
- pydata-sphinx-theme
Expand All @@ -42,6 +42,7 @@ dependencies:
- pytest-check-links
# lite cruft
- pkginfo
- python-libarchive-c
- pip:
- jupyterlite ==0.1.0b14
- jupyterlite ==0.1.0b18
### environment-docs.yml ###
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ channels:
- nodefaults

dependencies:
- python >=3.10,<3.11
- python >=3.11,<3.12
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8
- jupyterlab >=3.4.8,<4
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.7,<3.11
- python >=3.8,<3.12
### environment-base.yml ###
### environment-build.yml ###
# runtimes
- nodejs >=16,<17
- nodejs >=16,!=17.*,<19
# host app
- ipywidgets >=8
- ipywidgets >=8.0.4
# build
- flit >=3.7.1
- twine
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ dependencies:
# a more precise python pin is added in CI
### environment-base.yml ###
- doit-with-toml
- ipywidgets >=8
- jupyterlab >=3.4.8,<4
- ipywidgets >=8.0.4
- jsonschema-with-format-nongpl
- jupyterlab >=3.6.1,<4
- jupyterlab_widgets >=3.0.5
- jupyterlab-fonts >=2.1.1
- pip
- python >=3.7,<3.11
- python >=3.8,<3.12
### environment-base.yml ###
### environment-build.yml ###
# runtimes
- nodejs >=16,<17
- nodejs >=16,!=17.*,<19
# host app
- ipywidgets >=8
- ipywidgets >=8.0.4
# build
- flit >=3.7.1
- twine
Expand Down
File renamed without changes.
32 changes: 32 additions & 0 deletions .github/workflows/badges.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Badges

on:
pull_request_target:
types: [opened]

permissions:
pull-requests: write

jobs:
binder:
runs-on: ubuntu-latest
steps:
- name: Add Demo comment
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const PR_NUMBER = context.issue.number
const { PR_HEAD_REF, PR_HEAD_USERREPO } = process.env;

const LITE = `https://jupyterlite.rtfd.io/en/latest/_static/badge.svg`;
const BND = `https://mybinder.org/badge_logo.svg`;
const RTD = `https://jupyterlab-deck--${PR_NUMBER}.org.readthedocs.build/en/${PR_NUMBER}/_static/lab/index.html?path=README.ipynb`;
const BH = `https://mybinder.org/v2/gh/${PR_HEAD_USERREPO}/${PR_HEAD_REF}?urlpath=lab/tree/examples/README.ipynb`;

github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `Try it on [![](${LITE})](${RTD}) :arrow_left: ReadTheDocs or Binder :arrow_right: [![](${BND})](${BH})`
});
44 changes: 16 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu]
python-version: ['3.10']
python-version: ['3.11']
defaults:
run:
shell: bash -l {0}
Expand All @@ -53,7 +53,7 @@ jobs:
with:
path: ~/.cache/pip
key: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-pip-build-${{ hashFiles('.github/requirements-build.txt') }}
${{ env.CACHE_EPOCH }}-${{ runner.os }}-pip-build-${{ hashFiles('.github/reqs/requirements-build.txt') }}
restore-keys: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-pip-build-

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
run: pip install -U pip wheel setuptools

- name: setup (pip build)
run: pip install -U -v -r .github/requirements-build.txt
run: pip install -U -v -r .github/reqs/requirements-build.txt

- name: check (pip)
run: |
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
strategy:
matrix:
os: [ubuntu]
python-version: ['3.10']
python-version: ['3.11']
env:
WITH_JS_COV: 1
defaults:
Expand All @@ -121,15 +121,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: cache (conda)
uses: actions/cache@v3
with:
path: ~/conda_pkgs_dir
key: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-lint-${{ matrix.python-version }}-${{ hashFiles('.binder/environment.yml') }}
restore-keys: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-lint-${{ matrix.python-version }}-

- name: Cache (node_modules)
uses: actions/cache@v3
id: cache-node-modules
Expand All @@ -143,7 +134,6 @@ jobs:
with:
environment-file: .binder/environment.yml
miniforge-variant: Mambaforge
use-only-tar-bz2: true
use-mamba: true

- name: Lint
Expand Down Expand Up @@ -182,6 +172,10 @@ jobs:
verbose: true
flags: front-end

- name: Rename uncached conda packages
shell: bash
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"

test:
needs: [build]
name: ${{ matrix.os }} ${{ matrix.python-version }}
Expand All @@ -190,11 +184,11 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu', 'macos', 'windows']
python-version: ['3.7', '3.10']
python-version: ['3.8', '3.11']
include:
- python-version: '3.7'
- python-version: '3.8'
CI_ARTIFACT: 'sdist'
- python-version: '3.10'
- python-version: '3.11'
CI_ARTIFACT: 'wheel'
env:
TESTING_IN_CI: '1'
Expand All @@ -206,22 +200,12 @@ jobs:
- name: checkout
uses: actions/checkout@v3

- name: cache (conda)
uses: actions/cache@v3
with:
path: ~/conda_pkgs_dir
key: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-test-${{ matrix.python-version }}-${{ hashFiles('.github/environment-test.yml') }}
restore-keys: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-conda-test-${{ matrix.python-version }}-

- name: install (conda)
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: Mambaforge
python-version: ${{ matrix.python-version }}
environment-file: .github/environment-test.yml
use-only-tar-bz2: true
environment-file: .github/reqs/environment-test.yml
use-mamba: true

- name: download (dist)
Expand Down Expand Up @@ -263,3 +247,7 @@ jobs:
name: |-
jupyterlab-deck-test-${{ matrix.os }}-${{matrix.python-version }}-${{ github.run_number }}
path: ./build/reports

- name: Rename uncached conda packages
shell: bash
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
Loading