Skip to content

Commit 14f4832

Browse files
authored
Merge pull request #1196 from JuliaLang/json-int
Type-assert Int64's from JSON
2 parents 958973a + 1411bdd commit 14f4832

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,17 @@ jobs:
3131
- uses: julia-actions/setup-julia@v2
3232
with:
3333
version: ${{ matrix.julia-version }}
34+
arch: ${{ matrix.arch }}
3435

3536
- uses: julia-actions/cache@v2
37+
38+
# Installing Python on x86 is difficult and IJulia otherwise won't
39+
# precompile, so we just remove PythonCall from the test deps so that the
40+
# extension will never be built.
41+
- name: Remove PythonCall on x86
42+
if: matrix.arch == 'x86'
43+
run: julia --project=test -e 'using Pkg; Pkg.rm("PythonCall")'
44+
3645
- uses: julia-actions/julia-buildpkg@v1
3746
- uses: julia-actions/julia-runtest@v1
3847

docs/src/_changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ CurrentModule = IJulia
77
This documents notable changes in IJulia.jl. The format is based on [Keep a
88
Changelog](https://keepachangelog.com).
99

10+
## Unreleased
11+
12+
### Fixed
13+
- Fixed support for 32bit systems ([#1196]).
14+
1015
## [v1.31.0] - 2025-10-13
1116

1217
### Added

src/handlers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ request](https://jupyter-client.readthedocs.io/en/latest/messaging.html#completi
124124
"""
125125
function complete_request(socket, kernel, msg)
126126
code = msg.content["code"]::String
127-
cursor_chr = msg.content["cursor_pos"]::Int
127+
cursor_chr = msg.content["cursor_pos"]::Int64
128128
cursorpos = chr2ind(msg, code, cursor_chr)
129129
# Ensure that `cursorpos` is within bounds, Jupyter may send a position out
130130
# of bounds when autocompletion is enabled.
@@ -375,7 +375,7 @@ request](https://jupyter-client.readthedocs.io/en/latest/messaging.html#introspe
375375
function inspect_request(socket, kernel, msg)
376376
try
377377
code = msg.content["code"]::String
378-
cursor_pos = msg.content["cursor_pos"]::Int
378+
cursor_pos = msg.content["cursor_pos"]::Int64
379379
s = get_token(code, chr2ind(msg, code, cursor_pos))
380380
if isempty(s)
381381
content = Dict("status" => "ok", "found" => false)

test/runtests.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@ import IJulia
44

55
const TEST_FILES = [
66
"install.jl", "comm.jl", "msg.jl", "execute_request.jl", "stdio.jl",
7-
"inline.jl", "completion.jl", "kernel.jl"
7+
"inline.jl", "completion.jl"
88
]
99

1010
for file in TEST_FILES
1111
println(file)
1212
include(file)
1313
end
1414

15+
# Python is well-nigh impossible to install on 32bit
16+
if Sys.WORD_SIZE != 32
17+
include("kernel.jl")
18+
else
19+
@warn "Skipping the Kernel tests on 32bit"
20+
end
21+
1522
@testset "Aqua.jl" begin
1623
# Note that Pkg and Conda are loaded lazily
1724
Aqua.test_all(IJulia; stale_deps=(; ignore=[:Pkg, :Conda]))

0 commit comments

Comments
 (0)