Skip to content

Commit 81e1d50

Browse files
author
Christopher Doris
committed
compat with julia 1.4-1.5
1 parent 18c87ec commit 81e1d50

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
strategy:
6868
fail-fast: false
6969
matrix:
70-
arch: [x64] # x86 currently unsupported by MicroMamba/CondaPkg
70+
arch: [x64] # x86 unsupported by MicroMamba
7171
os: [ubuntu-latest, windows-latest, macos-latest]
72-
jlversion: ['1','1.6','1.5','1.4','1.3','1.2','1.1','1.0']
72+
jlversion: ['1','1.6','1.5','1.4'] # 1.3 unsupported by MicroMamba
7373
exclude:
7474
- os: macos-latest
7575
arch: x86

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Bringing [**Python®**](https://www.python.org/) and [**Julia**](https://juliala
1313
- Fast non-copying conversion of numeric arrays in either direction: modify Python arrays (e.g. `bytes`, `array.array`, `numpy.ndarray`) from Julia or Julia arrays from Python.
1414
- Helpful wrappers: interpret Python sequences, dictionaries, arrays, dataframes and IO streams as their Julia couterparts, and vice versa.
1515
- Beautiful stack-traces.
16-
- Works anywhere: tested on Windows, MacOS and Linux, 32- and 64-bit, Julia 1.0 upwards and Python 3.5 upwards.
16+
- Supports modern systems: tested on Windows, MacOS and Linux, 64-bit, Julia 1.5 upwards and Python 3.5 upwards.
1717

1818
⭐ If you like this, a GitHub star would be lovely thank you. ⭐
1919

src/pywrap/PyList.jl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,17 @@ Base.@propagate_inbounds function Base.pop!(x::PyList{T}) where {T}
7272
return pyconvert_and_del(T, @py x.pop())
7373
end
7474

75-
Base.@propagate_inbounds function Base.popat!(x::PyList{T}, i::Integer) where {T}
76-
@boundscheck checkbounds(x, i)
77-
return pyconvert_and_del(T, @py x.pop(@jl(i-1)))
75+
if isdefined(Base, :popat!)
76+
Base.@propagate_inbounds function Base.popat!(x::PyList{T}, i::Integer) where {T}
77+
@boundscheck checkbounds(x, i)
78+
return pyconvert_and_del(T, @py x.pop(@jl(i-1)))
79+
end
7880
end
7981

80-
Base.@propagate_inbounds Base.popfirst!(x::PyList) = popat!(x, 1)
82+
Base.@propagate_inbounds function Base.popfirst!(x::PyList{T}) where {T}
83+
@boundscheck checkbounds(x, 1)
84+
return pyconvert_and_del(T, @py x.pop(0))
85+
end
8186

8287
function Base.reverse!(x::PyList)
8388
pydel!(@py x.reverse())

0 commit comments

Comments
 (0)