Skip to content

Commit bd676aa

Browse files
chfwchfw
authored
Merge pull request #118 from pyexcel/dev
release 0.6.7
2 parents 7fea448 + 2627ee0 commit bd676aa

File tree

14 files changed

+58
-55
lines changed

14 files changed

+58
-55
lines changed

‎.github/workflows/moban-update.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
python-version: '3.7'
1616
- name: check changes
1717
run: |
18+
pip install markupsafe==2.0.1
1819
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
1920
moban
2021
git status

‎.github/workflows/pythonpackage.yml

-30
This file was deleted.

‎.github/workflows/pythonpublish.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ on:
55
types: [created]
66

77
jobs:
8-
deploy:
8+
pypi-publish:
9+
name: upload release to PyPI
910
runs-on: ubuntu-latest
11+
# Specifying a GitHub environment is optional, but strongly encouraged
12+
environment: pypi
13+
permissions:
14+
# IMPORTANT: this permission is mandatory for trusted publishing
15+
id-token: write
1016
steps:
17+
# retrieve your distributions here
1118
- uses: actions/checkout@v1
1219
- name: Set up Python
1320
uses: actions/setup-python@v1
@@ -16,11 +23,9 @@ jobs:
1623
- name: Install dependencies
1724
run: |
1825
python -m pip install --upgrade pip
19-
pip install setuptools wheel twine
20-
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
26+
pip install setuptools wheel
27+
- name: Build
2428
run: |
2529
python setup.py sdist bdist_wheel
26-
twine upload dist/*
30+
- name: Publish package distributions to PyPI
31+
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/tests.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
name: Run unit tests on Windows and Mac
1+
name: Run unit tests on Windows, Ubuntu and Mac
22

33
on: [push, pull_request]
44

55
jobs:
6+
67
test:
8+
name: ${{ matrix.os }} / ${{ matrix.python_version }}
9+
runs-on: ${{ matrix.os }}-latest
710
strategy:
8-
fail-fast: false
9-
matrix:
10-
python-version: [3.6, 3.7, 3.8, 3.9]
11-
os: [macOs-latest, ubuntu-latest, windows-latest]
12-
exclude:
13-
- os: macOs-latest
14-
python-version: 3.6
11+
fail-fast: false
12+
matrix:
13+
os: [Ubuntu]
14+
python_version: ["3.9.16"]
1515

16-
runs-on: ${{ matrix.os }}
17-
name: run tests
1816
steps:
1917
- uses: actions/checkout@v2
2018
- name: Set up Python
21-
uses: actions/setup-python@v1
19+
uses: actions/setup-python@v5
2220
with:
23-
python-version: ${{ matrix.python-version }}
21+
python-version: ${{ matrix.python_version }}
22+
architecture: x64
23+
2424
- name: install
2525
run: |
2626
pip --use-deprecated=legacy-resolver install -r requirements.txt

‎CHANGELOG.rst

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Change log
22
================================================================================
33

4+
0.6.7 - 09.11.2024
5+
--------------------------------------------------------------------------------
6+
7+
**updated**
8+
9+
#. `#115 <https://github.com/pyexcel/pyexcel-io/issues/115>`_: Pathnames with .
10+
cause file_name error in get_writer.
11+
#. `#117 <https://github.com/pyexcel/pyexcel-io/issues/117>`_: fix a typo in
12+
license.
13+
414
0.6.6 - 31.1.2022
515
--------------------------------------------------------------------------------
616

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ that the following conditions are met:
1313
and/or other materials provided with the distribution.
1414

1515
* Neither the name of 'pyexcel-io' nor the names of the contributors
16-
may not be used to endorse or promote products derived from this software
16+
may be used to endorse or promote products derived from this software
1717
without specific prior written permission.
1818

1919
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sqlalchemy supported databases. Its supported file formats are extended to cover
7979
======================== ======================= =================
8080
Package name Supported file formats Dependencies
8181
======================== ======================= =================
82-
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
82+
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
8383
tsvz [#f2]_
8484
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
8585
xlsm(read only) `xlwt`_

‎changelog.yml

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: pyexcel-io
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: updated
6+
details:
7+
- "`#115`: Pathnames with . cause file_name error in get_writer."
8+
- "`#117`: fix a typo in license."
9+
version: 0.6.7
10+
date: 09.11.2024
411
- changes:
512
- action: updated
613
details:

‎docs/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ For individual excel file formats, please install them as you wish:
6767
======================== ======================= =================
6868
Package name Supported file formats Dependencies
6969
======================== ======================= =================
70-
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
70+
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
7171
tsvz [#f2]_
7272
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
7373
xlsm(read only) `xlwt`_

‎pyexcel-io.yml

+3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ test_dependencies:
1515
- pyexcel-xls==0.5.9
1616
- SQLAlchemy
1717
- pyexcel-xlsxw
18+
- chardet
1819
extra_dependencies:
20+
- extra:
21+
- chardet
1922
- xls:
2023
- pyexcel-xls>=0.6.0
2124
- xlsx:

‎pyexcel_io/readers/csvz.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
import zipfile
1111
from io import BytesIO
1212

13-
import chardet
13+
try:
14+
import chardet
15+
except ImportError:
16+
print("Please install chardet so as to use csvz")
17+
raise
1418
from pyexcel_io import constants
1519
from pyexcel_io.sheet import NamedContent
1620
from pyexcel_io._compact import StringIO

‎pyexcel_io/writers/csv_sheet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def __init__(
4747

4848
def get_writer(self):
4949
if self._sheet_name != constants.DEFAULT_SHEET_NAME:
50-
names = self._native_book.split(".")
50+
names = self._native_book.rsplit(".", 1)
5151
file_name = "%s%s%s%s%s.%s" % (
5252
names[0],
5353
constants.DEFAULT_MULTI_CSV_SEPARATOR,

‎setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
)
4242
URL = "https://github.com/pyexcel/pyexcel-io"
4343
DOWNLOAD_URL = "%s/archive/0.6.6.tar.gz" % URL
44-
FILES = ["README.rst", "CHANGELOG.rst"]
44+
FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
4545
KEYWORDS = [
4646
"python",
4747
"API",
@@ -68,6 +68,7 @@
6868

6969
'License :: OSI Approved :: BSD License',
7070
'Programming Language :: Python :: Implementation :: PyPy'
71+
7172
]
7273

7374
PYTHON_REQUIRES = ">=3.6"
@@ -79,6 +80,7 @@
7980

8081
PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
8182
EXTRAS_REQUIRE = {
83+
"extra": ['chardet'],
8284
"xls": ['pyexcel-xls>=0.6.0'],
8385
"xlsx": ['pyexcel-xlsx>=0.6.0'],
8486
"ods": ['pyexcel-ods3>=0.6.0'],

‎tests/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ pyexcel
1313
pyexcel-xls==0.5.9
1414
SQLAlchemy
1515
pyexcel-xlsxw
16+
chardet

0 commit comments

Comments
 (0)