8000 Merge pull request #291 from pyexcel/dev · pyexcel/pyexcel@7133dba · GitHub
[go: up one dir, main page]
Skip to content

Commit 7133dba

Browse files
chfwchfw
authored
Merge pull request #291 from pyexcel/dev
release 0.7.3
2 parents e56e2d6 + 78a4a06 commit 7133dba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+892
-466
lines changed

‎CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Change log
22
================================================================================
33

4+
0.7.3 - 12.04.2025
5+
--------------------------------------------------------------------------------
6+
7+
**Fixed**
8+
9+
#. `#263 <https://github.com/pyexcel/pyexcel/issues/263>`_: support pathlib from
10+
python 3.4
11+
#. `#267 <https://github.com/pyexcel/pyexcel/issues/267>`_: better error message
12+
for file_name
13+
414
0.7.2 - 23.03.2025
515
--------------------------------------------------------------------------------
616

‎changelog.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: pyexcel
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: Fixed
6+
details:
7+
- "`#263`: support pathlib from python 3.4"
8+
- "`#267`: better error message for file_name"
9+
version: 0.7.3
10+
date: 12.04.2025
411
- changes:
512
- action: Fixed
613
details:

‎docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
copyright = '2014-2025 Onni Software Ltd.'
2727
author = 'C.W.'
2828
# The short X.Y version
29-
version = '0.7.2'
29+
version = '0.7.3'
3030
# The full version, including alpha/beta/rc tags
31-
release = '0.7.2'
31+
release = '0.7.3'
3232

3333
# -- General configuration ---------------------------------------------------
3434

‎pyexcel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel"
33
nick_name: pyexcel
4-
version: 0.7.2
5-
current_version: 0.7.2
6-
release: 0.7.2
4+
version: 0.7.3
5+
current_version: 0.7.3
6+
release: 0.7.3
77
copyright_year: 2014-2025
88
branch: master
99
is_on_conda: true

‎pyexcel/__init__.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
"""
2-
pyexcel
3-
~~~~~~~~~~~~~~~~~~~
2+
pyexcel
3+
~~~~~~~~~~~~~~~~~~~
44
5-
**pyexcel** is a wrapper library to read, manipulate and
6-
write data in different excel formats: csv, ods, xls, xlsx
7-
and xlsm. It does not support formulas, styles and charts.
5+
**pyexcel** is a wrapper library to read, manipulate and
6+
write data in different excel formats: csv, ods, xls, xlsx
7+
and xlsm. It does not support formulas, styles and charts.
88
9-
:copyright: (c) 2014-2025 by Onni Software Ltd.
10-
:license: New BSD License, see LICENSE for more details
9+
:copyright: (c) 2014-2025 by Onni Software Ltd.
10+
:license: New BSD License, see LICENSE for more details
1111
"""
12+
1213
from .book import Book
1314
from .core import (
1415
save_as,
@@ -23,15 +24,16 @@
2324
iget_records,
2425
save_book_as,
2526
get_book_dict,
26-
isave_book_as
27+
isave_book_as,
2728
)
2829
from .sheet import Sheet
30+
2931
# flake8: noqa
3032
from .cookbook import (
3133
split_a_book,
3234
merge_all_to_a_book,
3335
merge_csv_to_a_book,
34-
extract_a_sheet_from_a_book
36+
extract_a_sheet_from_a_book,
3537
)
3638
from .deprecated import (
3739
Reader,
@@ -43,7 +45,7 @@
4345
load_from_dict,
4446
load_from_memory,
4547
load_from_records,
46-
load_book_from_memory
48+
load_book_from_memory,
4749
)
4850
from .__version__ import __author__, __version__
4951
from .internal.garbagecollector import free_resources

‎pyexcel/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '0.7.2'
1+
__version__ = '0.7.3'
22
__author__ = 'C.W.'

‎pyexcel/_compact.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
"""
2-
pyexcel._compact
3-
~~~~~~~~~~~~~~~~~~~
2+
pyexcel._compact
3+
~~~~~~~~~~~~~~~~~~~
44
5-
Compatibles
5+
Compatibles
66
7-
:copyright: (c) 2014-2025 by Onni Software Ltd.
8-
:license: New BSD License, see LICENSE for more details
7+
:copyright: (c) 2014-2025 by Onni Software Ltd.
8+
:license: New BSD License, see LICENSE for more details
99
"""
10+
1011
# flake8: noqa
1112
# pylint: disable=unused-import
1213
# pylint: disable=import-error
@@ -18,9 +19,9 @@
1819
import warnings
1920
from io import BytesIO, StringIO
2021
from urllib import request
22+
from pathlib import Path
2123
from textwrap import dedent
2224
from itertools import zip_longest
23-
2425
from collections import OrderedDict
2526

2627
PY2 = sys.version_info[0] == 2
@@ -72,3 +73,9 @@ def _doc(func):
7273
return func
7374

7475
return _doc
76+
77+
78+
def get_string_file_name(file_name):
79+
if isinstance(file_name, Path):
80+
file_name = str(file_name.resolve())
81+
return file_name

‎pyexcel/book.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
"""
2-
pyexcel.book
3-
~~~~~~~~~~~~~~~~~~~
2+
pyexcel.book
3+
~~~~~~~~~~~~~~~~~~~
44
5-
Excel book
5+
Excel book
66
7-
:copyright: (c) 2014-2025 by Onni Software Ltd.
8-
:license: New BSD License, see LICENSE for more details
7+
:copyright: (c) 2014-2025 by Onni Software Ltd.
8+
:license: New BSD License, see LICENSE for more details
99
"""
10+
1011
from pyexcel.sheet import Sheet
12+
from pyexcel._compact import OrderedDict
1113
from pyexcel.internal.meta import BookMeta
1214
from pyexcel.internal.common import SheetIterator
13-
from pyexcel._compact import OrderedDict
1415

1516
LOCAL_UUID = 0
1617

‎pyexcel/constants.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
"""
2-
pyexcel.constants
3-
~~~~~~~~~~~~~~~~~~~
2+
pyexcel.constants
3+
~~~~~~~~~~~~~~~~~~~
44
5-
Constants appeared in pyexcel
5+
Constants appeared in pyexcel
66
7-
:copyright: (c) 2015-2022 by Onni Software Ltd.
8-
:license: New BSD License
7+
:copyright: (c) 2015-2025 by Onni Software Ltd.
8+
:license: New BSD License
99
"""
10+
1011
# flake8: noqa
1112
DEFAULT_NA = ""
1213
DEFAULT_NAME = "pyexcel sheet"

0 commit comments

Comments
 (0)
0