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.

Sign up for GitHub

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

Jump to bottom

Upgrade fro JupyterLab 4 #209

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Upgrade fro JupyterLab 4 #209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5ef63c
Fix TS build
fcollonval Nov 26, 2023
1ac844d
Lin the code
fcollonval Nov 26, 2023
341635e
Fix jest tests
fcollonval Nov 26, 2023
bc93298
TO BE UNDONE change version set up
fcollonval Nov 26, 2023
dcce180
some fixes
fcollonval Nov 26, 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
Prev Previous commit
some fixes
  • Loading branch information
@fcollonval
fcollonval committed Nov 26, 2023
commit dcce180796883ebda109ed611370d8d67892aa11
44 changes: 25 additions & 19 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.12"]
# nb_conda_kernels not compatible with 3.12
python-version: ["3.8", "3.11"]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Cache conda
uses: actions/cache@v2
uses: actions/cache@v3
env:
# Increase this value to reset cache
CACHE_NUMBER: 3
Expand All @@ -40,9 +41,12 @@ jobs:
run: |
conda info
conda install -n test_gator --file requirements_dev.txt
python setup.py develop --skip-npm
# Check pip dependencies - broken for Python 3.7
# python -m pip check
# Fake JS assets to avoid building them
touch mamba_gator/labextension/static/style.js
touch mamba_gator/labextension/package.json

pip install -e .
python -m pip check
shell: bash -l {0}
- name: Test the server extension
run: python -m pytest -ra mamba_gator
Expand All @@ -53,13 +57,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# Skip 3.9 as it is used for integration tests
python-version: ["3.8", "3.12"]
# nb_conda_kernels not compatible with 3.12
python-version: ["3.8", "3.11"]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Cache conda
uses: actions/cache@v2
uses: actions/cache@v3
env:
# Increase this value to reset cache if requirements_dev.txt has not changed
CACHE_NUMBER: 1
Expand All @@ -83,9 +87,12 @@ jobs:
run: |
conda info
mamba install -n test_gator --file requirements_dev.txt
python setup.py develop --skip-npm
# Check pip dependencies - broken for Python 3.7
# python -m pip check
# Fake JS assets to avoid building them
touch mamba_gator/labextension/static/style.js
touch mamba_gator/labextension/package.json

pip install -e .
python -m pip check
shell: bash -l {0}
- name: Test the server extension
run: python -m pytest -ra mamba_gator
Expand All @@ -104,10 +111,10 @@ jobs:
- "windows-latest"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cache conda
uses: actions/cache@v2
uses: actions/cache@v3
env:
# Increase this value to reset cache
CACHE_NUMBER: 2
Expand All @@ -122,7 +129,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Setup yarn cache
uses: actions/cache@v2
uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
env:
# Increase this value to reset cache
Expand Down Expand Up @@ -150,8 +157,7 @@ jobs:
run: |
conda info
conda install -n test_gator --file requirements_dev.txt
conda install -n test_gator jupyterlab=3 "nbclassic!=0.3.3"
yarn install
conda install -n test_gator jupyterlab=4
python -m pip install -e .
shell: bash -l {0}

Expand Down Expand Up @@ -255,6 +261,6 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install node
uses: actions/setup-node@v1
with:
Expand Down
2 changes: 2 additions & 0 deletions mamba_gator/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
# - modify
# - track in version control e.g. be sure to add to .gitignore
__version__ = VERSION = '5.2.1'

version_info = tuple(__version__.split('.'))
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"clean": "lerna run clean",
"eslint": "eslint . --fix --ext .ts,.tsx",
"eslint:check": "eslint . --ext .ts,.tsx",
"lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
"lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
"prettier": "npx prettier --write \"packages/**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
"prettier:check": "npx prettier --list-different \"packages/**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
"publish": "yarn run clean && yarn run build && lerna publish",
Expand Down Expand Up @@ -161,6 +163,5 @@
"selector-no-vendor-prefix": null,
"value-no-vendor-prefix": null
}
},
"styleModule": "style/index.js"
}
}
Loading