Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ jobs:
# windows
- os: windows
target: x86_64
interpreter: 3.10 3.11 3.12 3.13 3.13t 3.14 3.14t
- os: windows
target: i686
interpreter: 3.10 3.11 3.12 3.13 3.14
Expand Down
51 changes: 12 additions & 39 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ crate-type = ["cdylib"]

[dependencies]
calamine = { version = "0.33.0", features = ["chrono"] }
pyo3 = { version = "0.27.1", features = [
pyo3 = { version = "0.28.2", features = [
"extension-module",
"chrono",
"generate-import-lib",
] }
chrono = { version = "0.4.42", features = ["serde"] }
pyo3-file = { git = "https://github.com/omerbenamram/pyo3-file.git", rev = "92e0f505825ea0d33184af35b6c677bda04929bd" }
pyo3-file = { git = "https://github.com/dimastbk/pyo3-file.git", rev = "b0a5b260d13c6df14ea021b06c071a6f389fa805" }

[build-dependencies]
pyo3-build-config = "0.27.1"
pyo3-build-config = "0.28.2"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dev = [
"pre-commit~=4.3",
"mypy~=1.19.0",
"pytest~=9.0",
"pandas[excel]~=3.0",
"pandas[excel]>=2.2",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn load_workbook(
CalamineWorkbook::from_object(py, path_or_filelike, load_tables)
}

#[pymodule(gil_used = false)]
#[pymodule]
fn _python_calamine(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_function(wrap_pyfunction!(load_workbook, m)?)?;
m.add_class::<CalamineWorkbook>()?;
Expand Down
6 changes: 3 additions & 3 deletions src/types/sheet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use pyo3::types::PyList;

use crate::CellValue;

#[pyclass(eq, eq_int)]
#[pyclass(eq, eq_int, from_py_object)]
#[derive(Clone, Debug, PartialEq)]
pub enum SheetTypeEnum {
/// WorkSheet
Expand Down Expand Up @@ -41,7 +41,7 @@ impl From<SheetType> for SheetTypeEnum {
}
}

#[pyclass(eq, eq_int)]
#[pyclass(eq, eq_int, from_py_object)]
#[derive(Clone, Debug, PartialEq)]
pub enum SheetVisibleEnum {
/// Visible
Expand Down Expand Up @@ -70,7 +70,7 @@ impl From<SheetVisible> for SheetVisibleEnum {

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

#[pyclass]
#[pyclass(from_py_object)]
#[derive(Clone, PartialEq)]
pub struct SheetMetadata {
#[pyo3(get)]
Expand Down
2 changes: 1 addition & 1 deletion src/types/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use pyo3::types::PyList;

use crate::CellValue;

#[pyclass]
#[pyclass(from_py_object)]
#[derive(Clone, PartialEq)]
pub struct CalamineTable {
#[pyo3(get)]
Expand Down