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

Major features #44

Merged
merged 26 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
88026f1
chore: setting up py & node
kirangadhave Apr 27, 2023
3757cfa
chore: test
kirangadhave Apr 30, 2023
0d7e423
refactor: udpating to altair 5
kirangadhave May 12, 2023
845f1f4
chore(removing subproject): removeing subprojecth
kirangadhave May 12, 2023
31aafda
chore: updated altair 5
kirangadhave May 12, 2023
58ed5d9
feat: updating to jupyterlab 4 + altair 5
kirangadhave May 14, 2023
669e559
Update
kirangadhave May 14, 2023
d3adc55
update
kirangadhave May 24, 2023
29dcef9
switch
kirangadhave May 25, 2023
ecaeeae
filter working with new layering logic
kirangadhave May 29, 2023
231499c
udpate to support aggregate (left with adding in the aggregate)
kirangadhave May 29, 2023
d74ddd2
Added aggregate functionality
kirangadhave May 30, 2023
542ba0a
Testing with multiple charts
kirangadhave May 30, 2023
ad12f79
Basic dataframe generation for static & dynamic node
kirangadhave Jun 8, 2023
6728583
tested dataframe generation for layered charts.
kirangadhave Jun 13, 2023
e5516d0
updating agg object for better defaults
kirangadhave Jun 17, 2023
800b1d9
preparing for release
kirangadhave Jun 20, 2023
1930fc5
Merge branch 'main' into kg/alt-update-approach
kirangadhave Jun 20, 2023
0dbb3c3
ran linter
kirangadhave Jun 20, 2023
c08e6f6
fixed lint errors
kirangadhave Jun 20, 2023
250c703
fixed lint errors
kirangadhave Jun 20, 2023
0f4dafe
removed labextension check
kirangadhave Jun 20, 2023
f2e99c0
removed labextension
kirangadhave Jun 20, 2023
927a2cd
updated deps
kirangadhave Jun 20, 2023
7b9a933
Revert "updated deps"
kirangadhave Jun 20, 2023
31d933c
update
kirangadhave Jun 20, 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
14 changes: 14 additions & 0 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v4.0.6
_src_path: https://github.com/jupyterlab/extension-template
author_email: kirangadhave2@gmail.com
author_name: Kiran Gadhave
has_binder: true
has_settings: true
kind: frontend
labextension_name: interactivede
project_short_description: A JupyterLab extension.
python_name: interactivede
repository: https://github.com/kirangadhave/interactivede
test: false

8 changes: 0 additions & 8 deletions .eslintignore

This file was deleted.

40 changes: 0 additions & 40 deletions .eslintrc.js

This file was deleted.

17 changes: 2 additions & 15 deletions .github/workflows/binder-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ jobs:
permissions:
pull-requests: write
steps:
- name: comment on PR with Binder link
uses: actions/github-script@v6
- uses: jupyterlab/maintainer-tools/.github/actions/binder-link@v1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
var PR_HEAD_USERREPO = process.env.PR_HEAD_USERREPO;
var PR_HEAD_REF = process.env.PR_HEAD_REF;
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/${PR_HEAD_USERREPO}/${PR_HEAD_REF}) :point_left: Launch a binder notebook on branch _${PR_HEAD_USERREPO}/${PR_HEAD_REF}_`
})
env:
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
PR_HEAD_USERREPO: ${{ github.event.pull_request.head.repo.full_name }}
github_token: ${{ secrets.github_token }}
136 changes: 65 additions & 71 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,89 +2,83 @@ name: Build

on:
push:
branches: [main]
branches: main
pull_request:
branches: ['*']
branches: '*'

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U jupyterlab~=3.6

- name: Lint the extension
run: |
set -eux
jlpm
jlpm run lint
jlpm run lint:check

- name: Build the extension
run: |
set -eux
python -m pip install .[test]

jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "interactivede.*OK"
python -m jupyterlab.browser_check

- name: Package the extension
run: |
set -eux

pip install build
python -m build
pip uninstall -y "interactivede" jupyterlab

- name: Upload extension packages
uses: actions/upload-artifact@v3
with:
name: extension-artifacts
path: dist/interactivede*
if-no-files-found: warn

- name: Upload extension packages
uses: actions/upload-artifact@v3
with:
name: extension-artifacts
path: interactivede/dist/interactivede*
if-no-files-found: warn
- name: Checkout
uses: actions/checkout@v3

- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U "jupyterlab>=4.0.0,<5"

- name: Lint the extension
run: |
set -eux
jlpm
jlpm run lint:check

- name: Build the extension
run: |
set -eux
python -m pip install .[test]

# jupyter labextension list
# jupyter labextension list 2>&1 | grep -ie "interactivede.*OK"
python -m jupyterlab.browser_check

- name: Package the extension
run: |
set -eux

pip install build
python -m build
pip uninstall -y "interactivede" jupyterlab

- name: Upload extension packages
uses: actions/upload-artifact@v3
with:
name: extension-artifacts
path: dist/interactivede*
if-no-files-found: error

test_isolated:
needs: build
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
architecture: 'x64'
- uses: actions/download-artifact@v3
with:
name: extension-artifacts
- name: Install and Test
run: |
set -eux
# Remove NodeJS, twice to take care of system and locally installed node versions.
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab~=3.6" interactivede*.whl


jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "interactivede.*OK"
python -m jupyterlab.browser_check --no-chrome-test
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
architecture: 'x64'
- uses: actions/download-artifact@v3
with:
name: extension-artifacts
- name: Install and Test
run: |
set -eux
# Remove NodeJS, twice to take care of system and locally installed node versions.
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab>=4.0.0,<5" interactivede*.whl


# jupyter labextension list
# jupyter labextension list 2>&1 | grep -ie "interactivede.*OK"
python -m jupyterlab.browser_check --no-browser-test


check_links:
name: Check Links
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Check Release
on:
push:
branches: ['main']
branches: ["main"]
pull_request:
branches: ['*']
branches: ["*"]

jobs:
check_release:
Expand All @@ -16,10 +16,10 @@ jobs:
- name: Install Dependencies
run: |
pip install -e .

- name: Check Release
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
with:

token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Distributions
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/enforce-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Enforce PR label

on:
pull_request:
types: [labeled, unlabeled, opened, edited, synchronize]
jobs:
enforce-label:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: enforce-triage-label
uses: jupyterlab/maintainer-tools/.github/actions/enforce-label@v1
16 changes: 8 additions & 8 deletions .github/workflows/prep-release.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
name: 'Step 1: Prep Release'
name: "Step 1: Prep Release"
on:
workflow_dispatch:
inputs:
version_spec:
description: 'New Version Specifier'
default: 'next'
description: "New Version Specifier"
default: "next"
required: false
branch:
description: 'The branch to target'
description: "The branch to target"
required: false
post_version_spec:
description: 'Post Version Specifier'
description: "Post Version Specifier"
required: false
since:
description: 'Use PRs with activity since this date or git reference'
description: "Use PRs with activity since this date or git reference"
required: false
since_last_stable:
description: 'Use PRs with activity since the last stable git tag'
description: "Use PRs with activity since the last stable git tag"
required: false
type: boolean
jobs:
Expand All @@ -37,6 +37,6 @@ jobs:
since: ${{ github.event.inputs.since }}
since_last_stable: ${{ github.event.inputs.since_last_stable }}

- name: '** Next Step **'
- name: "** Next Step **"
run: |
echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"
12 changes: 6 additions & 6 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: 'Step 2: Publish Release'
name: "Step 2: Publish Release"
on:
workflow_dispatch:
inputs:
branch:
description: 'The target branch'
description: "The target branch"
required: false
release_url:
description: 'The URL of the draft GitHub release'
description: "The URL of the draft GitHub release"
required: false
steps_to_skip:
description: 'Comma separated list of steps to skip'
description: "Comma separated list of steps to skip"
required: false

jobs:
Expand Down Expand Up @@ -41,13 +41,13 @@ jobs:
target: ${{ github.event.inputs.target }}
release_url: ${{ steps.populate-release.outputs.release_url }}

- name: '** Next Step **'
- name: "** Next Step **"
if: ${{ success() }}
run: |
echo "Verify the final release"
echo ${{ steps.finalize-release.outputs.release_url }}

- name: '** Failure Message **'
- name: "** Failure Message **"
if: ${{ failure() }}
run: |
echo "Failed to Publish the Draft Release Url:"
Expand Down
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@ node_modules/
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
labextension/
interactivede/labextension
# Version file is handled by hatchling
_version.py

# Integration tests
*/ui-tests/test-results/
*/ui-tests/playwright-report/
interactivede/_version.py

# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python
Expand Down Expand Up @@ -84,6 +80,9 @@ docs/_build/
# PyBuilder
target/

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

Expand Down Expand Up @@ -118,4 +117,5 @@ dmypy.json
# OSX files
.DS_Store

package-lock.json
# Yarn cache
.yarn/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18.16.0
6 changes: 0 additions & 6 deletions .prettierrc

This file was deleted.

Loading