Skip to content

Commit e3ac814

Browse files
authored
Merge pull request #188 from dimastbk/pyo3-0.28
fix(deps): update rust crate pyo3 to 0.28.2
2 parents a3bda27 + ec84f30 commit e3ac814

7 files changed

Lines changed: 22 additions & 48 deletions

File tree

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ jobs:
191191
# windows
192192
- os: windows
193193
target: x86_64
194+
interpreter: 3.10 3.11 3.12 3.13 3.13t 3.14 3.14t
194195
- os: windows
195196
target: i686
196197
interpreter: 3.10 3.11 3.12 3.13 3.14

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ crate-type = ["cdylib"]
99

1010
[dependencies]
1111
calamine = { version = "0.33.0", features = ["chrono"] }
12-
pyo3 = { version = "0.27.1", features = [
12+
pyo3 = { version = "0.28.2", features = [
1313
"extension-module",
1414
"chrono",
1515
"generate-import-lib",
1616
] }
1717
chrono = { version = "0.4.42", features = ["serde"] }
18-
pyo3-file = { git = "https://github.com/omerbenamram/pyo3-file.git", rev = "92e0f505825ea0d33184af35b6c677bda04929bd" }
18+
pyo3-file = { git = "https://github.com/dimastbk/pyo3-file.git", rev = "b0a5b260d13c6df14ea021b06c071a6f389fa805" }
1919

2020
[build-dependencies]
21-
pyo3-build-config = "0.27.1"
21+
pyo3-build-config = "0.28.2"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dev = [
2222
"pre-commit~=4.3",
2323
"mypy~=1.19.0",
2424
"pytest~=9.0",
25-
"pandas[excel]~=3.0",
25+
"pandas[excel]>=2.2",
2626
]
2727

2828
[project.urls]

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn load_workbook(
1717
CalamineWorkbook::from_object(py, path_or_filelike, load_tables)
1818
}
1919

20-
#[pymodule(gil_used = false)]
20+
#[pymodule]
2121
fn _python_calamine(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
2222
m.add_function(wrap_pyfunction!(load_workbook, m)?)?;
2323
m.add_class::<CalamineWorkbook>()?;

src/types/sheet.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use pyo3::types::PyList;
88

99
use crate::CellValue;
1010

11-
#[pyclass(eq, eq_int)]
11+
#[pyclass(eq, eq_int, from_py_object)]
1212
#[derive(Clone, Debug, PartialEq)]
1313
pub enum SheetTypeEnum {
1414
/// WorkSheet
@@ -41,7 +41,7 @@ impl From<SheetType> for SheetTypeEnum {
4141
}
4242
}
4343

44-
#[pyclass(eq, eq_int)]
44+
#[pyclass(eq, eq_int, from_py_object)]
4545
#[derive(Clone, Debug, PartialEq)]
4646
pub enum SheetVisibleEnum {
4747
/// Visible
@@ -70,7 +70,7 @@ impl From<SheetVisible> for SheetVisibleEnum {
7070

7171
type MergedCellRange = ((u32, u32), (u32, u32));
7272

73-
#[pyclass]
73+
#[pyclass(from_py_object)]
7474
#[derive(Clone, PartialEq)]
7575
pub struct SheetMetadata {
7676
#[pyo3(get)]

src/types/table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use pyo3::types::PyList;
66

77
use crate::CellValue;
88

9-
#[pyclass]
9+
#[pyclass(from_py_object)]
1010
#[derive(Clone, PartialEq)]
1111
pub struct CalamineTable {
1212
#[pyo3(get)]

0 commit comments

Comments
 (0)