Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
dimastbk committed Nov 9, 2022
2 parents 5748061 + 1472c24 commit c4b99e6
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 35 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand All @@ -26,15 +26,15 @@ jobs:
uses: messense/maturin-action@v1
with:
target: x86_64
args: -i python --release --out dist
args: -i python --release --out dist --sdist
- name: Install built wheel - x86_64
run: |
pip install python-calamine --no-index --find-links dist --force-reinstall
- name: Build wheels - universal2
if: ${{ matrix.python-version != '3.7' }}
uses: messense/maturin-action@v1
with:
args: -i python --release --universal2 --out dist --no-sdist
args: -i python --release --universal2 --out dist
- name: Install built wheel - universal2
if: ${{ matrix.python-version != '3.7' }}
run: |
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
uses: messense/maturin-action@v1
with:
target: ${{ matrix.target }}
args: -i python --release --out dist --no-sdist
args: -i python --release --out dist
- name: Install built wheel
run: |
pip install python-calamine --no-index --find-links dist --force-reinstall
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: auto
args: -i python${{ matrix.python-version }} --release --out dist --no-sdist
args: -i python${{ matrix.python-version }} --release --out dist
- name: Python UnitTest
if: matrix.target == 'x86_64'
run: |
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "python-calamine"
version = "0.0.4"
version = "0.0.5"
authors = ["Dmitriy <dimastbk@yandex.ru>"]
description = "Python binding for Rust's library for reading excel and odf file - calamine"
edition = "2018"
Expand All @@ -15,11 +15,12 @@ crate-type = ["cdylib"]

[dependencies]
calamine = {version = "0.19.1", features = ["dates", "chrono"] }
pyo3 = {version = "0.17.2", features = ["extension-module", "chrono"] }
pyo3 = {version = "0.17.3", features = ["extension-module", "chrono"] }
chrono = { version = "0.4.22", features = ["serde"] }

[build-dependencies]
pyo3-build-config = "0.17.2"

[package.metadata.maturin]
python-source = "python"
name = "python_calamine._python_calamine"
45 changes: 22 additions & 23 deletions poetry.lock

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

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]

[build-system]
requires = ["maturin>=0.11,<0.12"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[tool.poetry]
name = "python-calamine"
version = "0.0.4"
version = "0.0.5"
description = ""
authors = ["Dmitriy <dimastbk@yandex.ru>"]

Expand Down
1 change: 0 additions & 1 deletion python/__init__.py

This file was deleted.

1 change: 1 addition & 0 deletions python/python_calamine/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from ._python_calamine import get_sheet_data, get_sheet_names # noqa: F401
File renamed without changes.
2 changes: 1 addition & 1 deletion python/pandas.py → python/python_calamine/pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pandas.io.excel import ExcelFile
from pandas.io.excel._base import BaseExcelReader, inspect_excel_format

from .python_calamine import get_sheet_data, get_sheet_names
from ._python_calamine import get_sheet_data, get_sheet_names


class __calamine__:
Expand Down
Empty file added python/python_calamine/py.typed
Empty file.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fn get_sheet_names(path: &str) -> PyResult<Vec<String>> {
}

#[pymodule]
fn python_calamine(py: Python, m: &PyModule) -> PyResult<()> {
fn _python_calamine(py: Python, m: &PyModule) -> PyResult<()> {
m.add_function(wrap_pyfunction!(get_sheet_data, m)?)?;
m.add_function(wrap_pyfunction!(get_sheet_names, m)?)?;
m.add("CalamineError", py.get_type::<CalamineError>())?;
Expand Down

0 comments on commit c4b99e6

Please sign in to comment.