Skip to content

Commit

Permalink
Merge pull request #118 from pyexcel/dev
Browse files Browse the repository at this point in the history
release 0.6.7
  • Loading branch information
chfw authored Nov 9, 2024
2 parents 7fea448 + 2627ee0 commit bd676aa
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 55 deletions.
1 change: 1 addition & 0 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
python-version: '3.7'
- name: check changes
run: |
pip install markupsafe==2.0.1
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
moban
git status
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/pythonpackage.yml

This file was deleted.

19 changes: 12 additions & 7 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@ on:
types: [created]

jobs:
deploy:
pypi-publish:
name: upload release to PyPI
runs-on: ubuntu-latest
# Specifying a GitHub environment is optional, but strongly encouraged
environment: pypi
permissions:
# IMPORTANT: this permission is mandatory for trusted publishing
id-token: write
steps:
# retrieve your distributions here
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
Expand All @@ -16,11 +23,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
pip install setuptools wheel
- name: Build
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
name: Run unit tests on Windows and Mac
name: Run unit tests on Windows, Ubuntu and Mac

on: [push, pull_request]

jobs:

test:
name: ${{ matrix.os }} / ${{ matrix.python_version }}
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
os: [macOs-latest, ubuntu-latest, windows-latest]
exclude:
- os: macOs-latest
python-version: 3.6
fail-fast: false
matrix:
os: [Ubuntu]
python_version: ["3.9.16"]

runs-on: ${{ matrix.os }}
name: run tests
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.python_version }}
architecture: x64

- name: install
run: |
pip --use-deprecated=legacy-resolver install -r requirements.txt
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Change log
================================================================================

0.6.7 - 09.11.2024
--------------------------------------------------------------------------------

**updated**

#. `#115 <https://github.com/pyexcel/pyexcel-io/issues/115>`_: Pathnames with .
cause file_name error in get_writer.
#. `#117 <https://github.com/pyexcel/pyexcel-io/issues/117>`_: fix a typo in
license.

0.6.6 - 31.1.2022
--------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ that the following conditions are met:
and/or other materials provided with the distribution.

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

THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ sqlalchemy supported databases. Its supported file formats are extended to cover
======================== ======================= =================
Package name Supported file formats Dependencies
======================== ======================= =================
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
tsvz [#f2]_
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
xlsm(read only) `xlwt`_
Expand Down
7 changes: 7 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: pyexcel-io
organisation: pyexcel
releases:
- changes:
- action: updated
details:
- "`#115`: Pathnames with . cause file_name error in get_writer."
- "`#117`: fix a typo in license."
version: 0.6.7
date: 09.11.2024
- changes:
- action: updated
details:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ For individual excel file formats, please install them as you wish:
======================== ======================= =================
Package name Supported file formats Dependencies
======================== ======================= =================
`pyexcel-io`_ csv, csvz [#f1]_, tsv,
`pyexcel-io`_ csv, csvz [#f1]_, tsv, csvz,tsvz readers depends on `chardet`
tsvz [#f2]_
`pyexcel-xls`_ xls, xlsx(read only), `xlrd`_,
xlsm(read only) `xlwt`_
Expand Down
3 changes: 3 additions & 0 deletions pyexcel-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ test_dependencies:
- pyexcel-xls==0.5.9
- SQLAlchemy
- pyexcel-xlsxw
- chardet
extra_dependencies:
- extra:
- chardet
- xls:
- pyexcel-xls>=0.6.0
- xlsx:
Expand Down
6 changes: 5 additions & 1 deletion pyexcel_io/readers/csvz.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
import zipfile
from io import BytesIO

import chardet
try:
import chardet
except ImportError:
print("Please install chardet so as to use csvz")
raise
from pyexcel_io import constants
from pyexcel_io.sheet import NamedContent
from pyexcel_io._compact import StringIO
Expand Down
2 changes: 1 addition & 1 deletion pyexcel_io/writers/csv_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(

def get_writer(self):
if self._sheet_name != constants.DEFAULT_SHEET_NAME:
names = self._native_book.split(".")
names = self._native_book.rsplit(".", 1)
file_name = "%s%s%s%s%s.%s" % (
names[0],
constants.DEFAULT_MULTI_CSV_SEPARATOR,
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
URL = "https://github.com/pyexcel/pyexcel-io"
DOWNLOAD_URL = "%s/archive/0.6.6.tar.gz" % URL
FILES = ["README.rst", "CHANGELOG.rst"]
FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
KEYWORDS = [
"python",
"API",
Expand All @@ -68,6 +68,7 @@

'License :: OSI Approved :: BSD License',
'Programming Language :: Python :: Implementation :: PyPy'

]

PYTHON_REQUIRES = ">=3.6"
Expand All @@ -79,6 +80,7 @@

PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests", "tests.*"])
EXTRAS_REQUIRE = {
"extra": ['chardet'],
"xls": ['pyexcel-xls>=0.6.0'],
"xlsx": ['pyexcel-xlsx>=0.6.0'],
"ods": ['pyexcel-ods3>=0.6.0'],
Expand Down
1 change: 1 addition & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ pyexcel
pyexcel-xls==0.5.9
SQLAlchemy
pyexcel-xlsxw
chardet

0 comments on commit bd676aa

Please sign in to comment.