Skip to content

Commit c82be08

Browse files
committed
remove importliner from project
1 parent b2bb5b5 commit c82be08

File tree

2 files changed

+4
-56
lines changed

2 files changed

+4
-56
lines changed

.github/workflows/lint.yml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,3 @@ jobs:
1717
run: jlpm
1818
- name: Lint TypeScript source
1919
run: jlpm lerna run lint:check
20-
21-
lint_py_imports:
22-
name: Lint Python imports
23-
runs-on: ubuntu-latest
24-
steps:
25-
- uses: actions/checkout@v4
26-
- name: Echo environment details
27-
run: |
28-
which python
29-
which pip
30-
python --version
31-
pip --version
32-
33-
# see #546 for context on why this is necessary
34-
- name: Create venv
35-
run: |
36-
python -m venv lint_py_imports
37-
38-
- name: Install job dependencies
39-
run: |
40-
source ./lint_py_imports/bin/activate
41-
pip install jupyterlab~=4.0
42-
pip install import-linter~=1.12.1
43-
44-
- name: Install Jupyter AI packages from source
45-
run: |
46-
source ./lint_py_imports/bin/activate
47-
jlpm install
48-
jlpm install-from-src
49-
50-
- name: Lint Python imports
51-
run: |
52-
source ./lint_py_imports/bin/activate
53-
lint-imports

pyproject.toml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ name = "jupyter_ai_monorepo"
77
dynamic = ["version", "description", "authors", "urls", "keywords"]
88
requires-python = ">=3.9"
99
dependencies = [
10-
"jupyter-ai-magics @ {root:uri}/packages/jupyter-ai-magics",
11-
"jupyter-ai @ {root:uri}/packages/jupyter-ai"
10+
"jupyter-ai-magics @ {root:uri}/packages/jupyter-ai-magics",
11+
"jupyter-ai @ {root:uri}/packages/jupyter-ai",
1212
]
1313

1414
[project.optional-dependencies]
@@ -26,10 +26,7 @@ source = "nodejs"
2626
path = "package.json"
2727

2828
[tool.hatch.build]
29-
packages = [
30-
"packages/jupyter-ai-magics",
31-
"packages/jupyter-ai"
32-
]
29+
packages = ["packages/jupyter-ai-magics", "packages/jupyter-ai"]
3330

3431
[tool.hatch.metadata]
3532
allow-direct-references = true
@@ -40,23 +37,8 @@ ignore = [".*"]
4037
[tool.check-wheel-contents]
4138
ignore = ["W002"]
4239

43-
[tool.importlinter]
44-
root_packages = ["jupyter_ai", "jupyter_ai_magics"]
45-
include_external_packages = true
46-
47-
[[tool.importlinter.contracts]]
48-
key = "pydantic"
49-
name = "Forbid `pydantic`. (note: Developers should import Pydantic from `langchain.pydantic_v1` instead for compatibility.)"
50-
type = "forbidden"
51-
source_modules = ["jupyter_ai", "jupyter_ai_magics"]
52-
forbidden_modules = ["pydantic"]
53-
# TODO: get `langchain` to export `ModelMetaclass` to avoid needing this statement
54-
ignore_imports = ["jupyter_ai_magics.providers -> pydantic"]
55-
5640
[tool.pytest.ini_options]
5741
addopts = "--ignore packages/jupyter-ai-module-cookiecutter"
5842

5943
[tool.mypy]
60-
exclude = [
61-
"tests"
62-
]
44+
exclude = ["tests"]

0 commit comments

Comments
 (0)