Skip to content

Commit

Permalink
add import linter job in GH Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
dlqqq committed Dec 26, 2023
1 parent 5a93d19 commit 7a1b1f2
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 6 deletions.
24 changes: 20 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: JS Lint
name: Lint
on:
- pull_request

jobs:
js_lint:
name: JS Lint
lint_ts:
name: Lint TypeScript source
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -15,5 +15,21 @@ jobs:
run: pip install jupyterlab~=4.0
- name: Install JS dependencies
run: jlpm
- name: Run JS Lint
- name: Lint TypeScript source
run: jlpm lerna run lint:check

lint_py_imports:
name: Lint Python imports
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install JupyterLab
run: pip install "jupyterlab~=4.0"
- name: Install `import-linter`
run: pip install "import-linter~=1.12.1"
- name: Install Jupyter AI packages from source
run: |
jlpm install
jlpm install-from-src
- name: Lint Python imports
run: lint-imports
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
},
"dev-uninstall": {
"dependsOn": ["clean:labextension"]
},
"install-from-src": {
"dependsOn": ["^install-from-src"]
}
},
"tasksRunnerOptions": {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"dev": "jupyter lab --config playground/config.py",
"dev-install": "lerna run dev-install --stream",
"dev-uninstall": "lerna run dev-uninstall --stream",
"install-from-src": "lerna run install-from-src --stream",
"lint": "jlpm && lerna run prettier && lerna run eslint",
"lint:check": "lerna run prettier:check && lerna run eslint:check",
"watch": "lerna run watch --parallel --stream",
Expand Down
3 changes: 2 additions & 1 deletion packages/jupyter-ai-magics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"scripts": {
"dev-install": "pip install -e \".[dev,all]\"",
"dev-uninstall": "pip uninstall jupyter_ai_magics -y"
"dev-uninstall": "pip uninstall jupyter_ai_magics -y",
"install-from-src": "pip install ."
}
}
3 changes: 2 additions & 1 deletion packages/jupyter-ai/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"watch:src": "tsc -w",
"watch:labextension": "jupyter labextension watch .",
"dev-install": "pip install -e \".[dev,all,test]\" && jupyter labextension develop . --overwrite && jupyter server extension enable jupyter_ai",
"dev-uninstall": "pip uninstall jupyter_ai -y"
"dev-uninstall": "pip uninstall jupyter_ai -y",
"install-from-src": "pip install ."
},
"dependencies": {
"@emotion/react": "^11.10.5",
Expand Down
11 changes: 11 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,14 @@ ignore = [".*"]

[tool.check-wheel-contents]
ignore = ["W002"]

[tool.importlinter]
root_packages = ["jupyter_ai", "jupyter_ai_magics"]
include_external_packages = true

[[tool.importlinter.contracts]]
key = "pydantic"
name = "Forbidden import of `pydantic` package. Please import from `langchain.pydantic_v1` instead for compatibility with both Pydantic v1 and v2."
type = "forbidden"
source_modules = ["jupyter_ai", "jupyter_ai_magics"]
forbidden_modules = ["pydantic"]

0 comments on commit 7a1b1f2

Please sign in to comment.