Merge pull request #55 from pyexcel/dev

0.7.1 release

Author: chfw

.github/workflows/lint.yml

@@ -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

.github/workflows/moban-update.yml

@@ -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

.github/workflows/pythonpublish.yml

@@ -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
@@ -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

.github/workflows/tests.yml

@@ -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:

.moban.d/custom_README.rst.jj2

@@ -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

.readthedocs.yml

@@ -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
@@ -13,6 +18,4 @@ sphinx:
 formats:
   - pdf
 
-# Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7

CHANGELOG.rst

@@ -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
 --------------------------------------------------------------------------------
 

CONTRIBUTORS.rst

@@ -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>`_

LICENSE

@@ -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
@@ -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

README.rst

@@ -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
 
@@ -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
 
@@ -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
@@ -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
@@ -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::
 

changelog.yml

@@ -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:

docs/source/conf.py

@@ -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 ---------------------------------------------------
 
@@ -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,
@@ -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'
 

pyexcel-xls.yml

@@ -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:
@@ -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

pyexcel_xls/__init__.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2016-2021 by Onni Software Ltd
     :license: New BSD License
 """
+
 import xlrd
 
 # flake8: noqa
@@ -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(

pyexcel_xls/xlsr.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2016-2021 by Onni Software Ltd
     :license: New BSD License
 """
+
 import datetime
 
 import xlrd

pyexcel_xls/xlsw.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2016-2021 by Onni Software Ltd
     :license: New BSD License
 """
+
 import datetime
 
 import xlrd

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = --doctest-glob="*.rst" tests/ README.rst docs/source pyexcel_xls