Skip to content

0.7.1 release #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b80ea11
Update custom_README.rst.jj2
chfw Oct 8, 2021
995cfd2
This is an auto-commit, updating project meta data, such as changelog…
chfw Oct 8, 2021
6251ee5
Removed xlsm files from the list due to dropped support from xlrd>=2 …
zazuum Aug 12, 2022
8958454
Merge pull request #52 from zazuum/dev
chfw Sep 16, 2022
d8953c8
update docs and tests
chfw Sep 25, 2022
758f3e5
auto-convert asserts with nose2pytest
pyrox0 Jul 29, 2024
b478029
setUp/tearDown -> setup_method/teardown_method
pyrox0 Jul 29, 2024
a5f989f
nose.SkipTest -> pytest.skip
pyrox0 Jul 29, 2024
32984fe
@raises -> pytest.raises
pyrox0 Jul 29, 2024
d140445
remove nose imports
pyrox0 Jul 29, 2024
9675b43
update requirements files
pyrox0 Jul 29, 2024
517f48c
update test scripts
pyrox0 Jul 29, 2024
7c43ce8
update README
pyrox0 Jul 29, 2024
9f0d480
formatting
pyrox0 Jul 29, 2024
00a660c
Merge pull request #54 from pyrox0/dev
chfw Nov 12, 2024
bc3b1d8
update all docs
chfw Mar 5, 2025
d3d71fe
update version and change log
chfw Mar 5, 2025
ae0989b
add pytest as test dependency
chfw Mar 5, 2025
0a52ccb
This is an auto-commit, updating project meta data, such as changelog…
chfw Mar 5, 2025
05b0dc5
update test tool to pytest
chfw Mar 5, 2025
35d0e70
fix broken test
chfw Mar 5, 2025
0cd5c9a
This is an auto-commit, updating project meta data, such as changelog…
chfw Mar 5, 2025
bbc719b
add current directory in python path
chfw Mar 6, 2025
9c9e946
:books: update documentation
chfw Mar 7, 2025
11f05fa
This is an auto-commit, updating project meta data, such as changelog…
chfw Mar 7, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.11
- name: lint
run: |
pip --use-deprecated=legacy-resolver install flake8
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.11'
- name: check changes
run: |
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
pip install markupsafe==2.0.1
pip install ruamel.yaml moban gitfs2 pypifs moban-jinja2-github moban-ansible
moban
git status
git diff --exit-code
Expand Down
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
27 changes: 14 additions & 13 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
name: run_tests
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
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
- name: test
run: |
pip freeze
nosetests --verbosity=3 --with-coverage --cover-package pyexcel_xls --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_xls
make test

- name: Upload coverage
uses: codecov/codecov-action@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .moban.d/custom_README.rst.jj2
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
Oct 2021 - Update:
===================

1. v0.6.3 removed the pin on xlrd < 2. If you have xlrd >= 2, this
1. v0.7.0 removed the pin on xlrd < 2. If you have xlrd >= 2, this
library will NOT read 'xlsx' format and you need to install pyexcel-xlsx. Othwise,
this library can use xlrd < 2 to read xlsx format for you. So 'xlsx' support
in this library will vary depending on the installed version of xlrd.

2. v0.6.3 can write datetime.timedelta. but when the value is read out,
2. v0.7.0 can write datetime.timedelta. but when the value is read out,
you will get datetime.datetime. so you as the developer decides what to do with it.

Past news
Expand Down
7 changes: 5 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
# Required
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.12"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py
Expand All @@ -13,6 +18,4 @@ sphinx:
formats:
- pdf

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
13 changes: 13 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
Change log
================================================================================

0.7.1 - 07.03.2024
--------------------------------------------------------------------------------

**Removed**

#. `#52 <https://github.com/pyexcel/pyexcel-xls/issues/52>`_: remove xlsm
support for xlrd > 2.0.0

**Updated**

#. `#54 <https://github.com/pyexcel/pyexcel-xls/issues/54>`_: first project in
pyexcel to migrate to pytest

0.7.0 - 07.10.2021
--------------------------------------------------------------------------------

Expand Down
6 changes: 4 additions & 2 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@


3 contributors
5 contributors
================================================================================

In alphabetical order:

* `Ivan Cvitic <https://github.com/zazuum>`_
* `John Vandenberg <https://github.com/jayvdb>`_
* `Peter Carnesciali <https://github.com/pcarn>`_
* `vinraspa <https://github.com/vinraspa>`_
* `Pyrox <https://github.com/pyrox0>`_
* `Vincent Raspal <https://github.com/vinraspa>`_
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015-2021 by Onni Software Ltd. and its contributors
Copyright (c) 2015-2025 by Onni Software Ltd. and its contributors
All rights reserved.

Redistribution and use in source and binary forms of the software as well
Expand All @@ -13,7 +13,7 @@ that the following conditions are met:
and/or other materials provided with the distribution.

* Neither the name of 'pyexcel-xls' 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
32 changes: 13 additions & 19 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ pyexcel-xls - Let you focus on data, instead of xls format
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel-mobans/master/images/awesome-badge.svg
:target: https://awesome-python.com/#specific-formats-processing

.. image:: https://github.com/pyexcel/pyexcel-xls/workflows/run_tests/badge.svg
:target: http://github.com/pyexcel/pyexcel-xls/actions

.. image:: https://codecov.io/gh/pyexcel/pyexcel-xls/branch/master/graph/badge.svg
:target: https://codecov.io/gh/pyexcel/pyexcel-xls

Expand All @@ -20,6 +17,7 @@ pyexcel-xls - Let you focus on data, instead of xls format
.. image:: https://anaconda.org/conda-forge/pyexcel-xls/badges/version.svg
:target: https://anaconda.org/conda-forge/pyexcel-xls


.. image:: https://pepy.tech/badge/pyexcel-xls/month
:target: https://pepy.tech/project/pyexcel-xls

Expand All @@ -42,12 +40,12 @@ You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
Oct 2021 - Update:
===================

1. v0.6.3 removed the pin on xlrd < 2. If you have xlrd >= 2, this
1. v0.7.0 removed the pin on xlrd < 2. If you have xlrd >= 2, this
library will NOT read 'xlsx' format and you need to install pyexcel-xlsx. Othwise,
this library can use xlrd < 2 to read xlsx format for you. So 'xlsx' support
in this library will vary depending on the installed version of xlrd.

2. v0.6.3 can write datetime.timedelta. but when the value is read out,
2. v0.7.0 can write datetime.timedelta. but when the value is read out,
you will get datetime.datetime. so you as the developer decides what to do with it.

Past news
Expand Down Expand Up @@ -75,18 +73,11 @@ Support the project
================================================================================

If your company has embedded pyexcel and its components into a revenue generating
product, please support me on github, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
the project and develop it further.

If you are an individual, you are welcome to support me too and for however long
you feel like. As my backer, you will receive
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
product, please support me on github, or `patreon <https://www.patreon.com/bePatron?u=5537627>`_
maintain the project and develop it further.

And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`.

With your financial support, I will be able to invest
a little bit more time in coding, documentation and writing interesting posts.
With your financial support, I will be able to invest a little bit more time in coding,
documentation and writing interesting posts.


Known constraints
Expand Down Expand Up @@ -372,15 +363,18 @@ and update changelog.yml
.. note::

As to rnd_requirements.txt, usually, it is created when a dependent
library is not released. Once the dependecy is installed
library is not released. Once the dependency is installed
(will be released), the future
version of the dependency in the requirements.txt will be valid.


How to test your contribution
------------------------------
--------------------------------------------------------------------------------

Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
Although `nose` and `doctest` are both used in code testing, it is advisable
that unit tests are put in tests. `doctest` is incorporated only to make sure
the code examples in documentation remain valid across different development
releases.

On Linux/Unix systems, please launch your tests like this::

Expand Down
9 changes: 9 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: pyexcel-xls
organisation: pyexcel
releases:
- changes:
- action: Removed
details:
- "`#52`: remove xlsm support for xlrd > 2.0.0"
- action: Updated
details:
- "`#54`: first project in pyexcel to migrate to pytest"
date: 07.03.2024
version: 0.7.1
- changes:
- action: Removed
details:
Expand Down
11 changes: 6 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
# -- Project information -----------------------------------------------------

project = 'pyexcel-xls'
copyright = '2015-2021 Onni Software Ltd.'
copyright = '2015-2025 Onni Software Ltd.'
author = 'C.W.'
# The short X.Y version
version = '0.7.0'
version = '0.7.1'
# The full version, including alpha/beta/rc tags
release = '0.7.0'
release = '0.7.1'

# -- General configuration ---------------------------------------------------

Expand Down Expand Up @@ -58,7 +58,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'alabaster'
html_theme = 'sphinx_rtd_theme'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand All @@ -69,7 +69,8 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/3/': None}
intersphinx_mapping = {'python': ('https://docs.python.org/3',
'python-inv.txt')}
# TODO: html_theme not configurable upstream
html_theme = 'default'

Expand Down
8 changes: 5 additions & 3 deletions pyexcel-xls.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
overrides: "pyexcel.yaml"
name: "pyexcel-xls"
nick_name: xls
version: 0.7.0
current_version: 0.7.0
release: 0.7.0
version: 0.7.1
current_version: 0.7.1
release: 0.7.1
file_type: xls
is_on_conda: true
dependencies:
Expand All @@ -12,7 +12,9 @@ dependencies:
- xlwt
test_dependencies:
- pyexcel
- pytest
description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format
moban_command: false
python_requires: ">=3.6"
min_python_version: "3.6"
use_pytest: true
2 changes: 2 additions & 0 deletions pyexcel_xls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import xlrd

# flake8: noqa
Expand Down Expand Up @@ -35,6 +36,7 @@ def xlrd_version_2_or_greater():
supported_file_formats = [__FILE_TYPE__, "xlsx", "xlsm"]
if XLRD_VERSION_2_OR_ABOVE:
supported_file_formats.remove("xlsx")
supported_file_formats.remove("xlsm")


IOPluginInfoChainV2(__name__).add_a_reader(
Expand Down
1 change: 1 addition & 0 deletions pyexcel_xls/xlsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import datetime

import xlrd
Expand Down
1 change: 1 addition & 0 deletions pyexcel_xls/xlsw.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import datetime

import xlrd
Expand Down
2 changes: 2 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[pytest]
addopts = --doctest-glob="*.rst" tests/ README.rst docs/source pyexcel_xls
Loading