Skip to content

Commit d99c96d

Browse files
Replace PyO3 with IPC approach for Python/project information (#214)
1 parent 31b0308 commit d99c96d

File tree

39 files changed

+910
-703
lines changed

39 files changed

+910
-703
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380
4343
with:
4444
target: ${{ matrix.platform.target }}
45-
args: --release --out dist --find-interpreter --features extension-module
45+
args: --release --out dist --find-interpreter
4646
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
4747
manylinux: auto
4848

@@ -78,7 +78,7 @@ jobs:
7878
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380
7979
with:
8080
target: ${{ matrix.platform.target }}
81-
args: --release --out dist --find-interpreter --features extension-module
81+
args: --release --out dist --find-interpreter
8282
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
8383
manylinux: musllinux_1_2
8484

@@ -111,7 +111,7 @@ jobs:
111111
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380
112112
with:
113113
target: ${{ matrix.platform.target }}
114-
args: --release --out dist --find-interpreter --features extension-module
114+
args: --release --out dist --find-interpreter
115115
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
116116

117117
- name: Upload wheels
@@ -142,7 +142,7 @@ jobs:
142142
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380
143143
with:
144144
target: ${{ matrix.platform.target }}
145-
args: --release --out dist --find-interpreter --features extension-module
145+
args: --release --out dist --find-interpreter
146146
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
147147

148148
- name: Upload wheels

.lazy.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
vim.lsp.config["djls"] = {
2-
cmd = { "uvx", "lsp-devtools", "agent", "--", "djls", "serve" },
2+
cmd = { "uvx", "lsp-devtools", "agent", "--", "./target/debug/djls", "serve" },
33
filetypes = { "htmldjango" },
44
root_markers = { "manage.py", "pyproject.toml" },
55
}

Cargo.lock

Lines changed: 3 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ resolver = "2"
55
[workspace.dependencies]
66
djls = { path = "crates/djls" }
77
djls-conf = { path = "crates/djls-conf" }
8-
djls-dev = { path = "crates/djls-dev" }
98
djls-project = { path = "crates/djls-project" }
109
djls-server = { path = "crates/djls-server" }
1110
djls-templates = { path = "crates/djls-templates" }
1211
djls-workspace = { path = "crates/djls-workspace" }
1312

1413
# core deps, pin exact versions
15-
pyo3 = "0.25.0"
16-
pyo3-build-config = { version = "0.25.0", features = ["resolve-config"] }
1714
salsa = "0.23.0"
1815
tower-lsp-server = { version = "0.22.0", features = ["proposed"] }
1916

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,10 @@ All feature requests should ideally start out as a discussion topic, to gather f
156156

157157
### Development
158158

159-
The project is written in Rust using PyO3 for Python integration. Here is a high-level overview of the project and the various crates:
159+
The project is written in Rust with IPC for Python communication. Here is a high-level overview of the project and the various crates:
160160

161161
- Main CLI interface ([`crates/djls/`](./crates/djls/))
162162
- Configuration management ([`crates/djls-conf/`](./crates/djls-conf/))
163-
- Development tools ([`crates/djls-dev/`](./crates/djls-dev/))
164163
- Django and Python project introspection ([`crates/djls-project/`](./crates/djls-project/))
165164
- LSP server implementation ([`crates/djls-server/`](./crates/djls-server/))
166165
- Template parsing ([`crates/djls-templates/`](./crates/djls-templates/))

crates/djls-dev/Cargo.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

crates/djls-dev/src/bin/djls-tmux.rs

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)