Skip to content

Commit

Permalink
small reader fix [build]
Browse files Browse the repository at this point in the history
  • Loading branch information
fzumstein committed Oct 3, 2022
1 parent 890f6dd commit 36f5443
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
options: "--check --diff --color"

pre-build:
if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
if: github.event_name == 'release' || github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[build]')
runs-on: windows-2022
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
build:
needs: pre-build
name: Build wheel
if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
if: github.event_name == 'release' || github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[build]')
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion about.hbs
Expand Up @@ -40,7 +40,7 @@
<div class="intro">
<h1>Third Party Licenses</h1>
<p>This page lists the licenses of the compiled code in xlwings.</p>
<p>The rest of the Open Source licenses are listed under <a href=https://docs.xlwings.org/en/stable/opensource_licenses.html>https://docs.xlwings.org/en/stable/opensource_licenses.html</a></p>
<p>The rest of the Open Source licenses are listed in a <a href=opensource_licenses.html>separate document</a></p>
</div>

<h2>Overview of licenses:</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/_static/opensource_licenses2.html
Expand Up @@ -40,7 +40,7 @@
<div class="intro">
<h1>Third Party Licenses</h1>
<p>This page lists the licenses of the compiled code in xlwings.</p>
<p>The rest of the Open Source licenses are listed under <a href=https://docs.xlwings.org/en/stable/opensource_licenses.html>https://docs.xlwings.org/en/stable/opensource_licenses.html</a></p>
<p>The rest of the Open Source licenses are listed in a <a href=opensource_licenses.html>separate document</a></p>
</div>

<h2>Overview of licenses:</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/opensource_licenses.rst
Expand Up @@ -3,7 +3,7 @@ Open Source Licenses

Depending on the platform and features that you use, xlwings requires various Open Source dependencies.

* The licenses of the compiled code are available in a `separate document </opensource_licenses2.html>`_
* The licenses of the compiled code are available in a `separate document <opensource_licenses2.html>`_
* All other licenses are listed below

pywin32 (Windows only)
Expand Down
8 changes: 7 additions & 1 deletion docs/reader.rst
Expand Up @@ -5,7 +5,13 @@ Excel File Reader :bdg-secondary:`PRO`

This feature requires at least v0.28.0.

xlwings PRO comes with an ultra fast Excel file reader. Compared with ``pandas.read_excel()``, you should be able to see speedups anywhere between 5 to 20 times when reading a single sheet. The exact speed will depend on your content, file format (``xlsx`` / ``xlsb`` / ``xls``), and Python version. Other advantages include:
xlwings PRO comes with an ultra fast Excel file reader. Compared with ``pandas.read_excel()``, you should be able to see speedups anywhere between 5 to 20 times when reading a single sheet. The exact speed will depend on your content, file format, and Python version. The following Excel file formats are supported:

* ``xlsx`` / ``xlsm`` / ``xlam``
* ``xlsb``
* ``xls``

Other advantages include:

* Support for named ranges
* Support for dynamic ranges via ``myrange.expand()`` or ``myrange.options(expand="table")``, respectively.
Expand Down
9 changes: 5 additions & 4 deletions docs/whatsnew.rst
Expand Up @@ -5,19 +5,20 @@ What's New
v0.28.0 (Sep XX, 2022)
----------------------

* :bdg-success:`Feature` :bdg-secondary:`PRO`: xlwings PRO adds an ultra fast file reader, allowing you to read Excel files much faster than via ``pandas.read_excel()``:
* :bdg-success:`Feature` :bdg-secondary:`PRO` xlwings PRO adds an ultra fast file reader, allowing you to read Excel files much faster than via ``pandas.read_excel()``:

.. code-block:: python
with xw.Book("myfile.xlsx", mode="r") as book:
sheet1 = book.sheets[0]
df = sheet1["A1:B2"].options("df", index=False, header=True).value
For more details, see :ref:`Excel File Reader`.
For all the details, see :ref:`Excel File Reader<file_reader>`.

* :bdg-info:`Enhancement` ``Book`` can now be used as context manager (i.e., with the ``with`` statement, see previous bullet point), which will close the book automatically when leaving the body of the context manager.
* :bdg-info:`Enhancement` ``Book`` can now be used as context manager (i.e., with the ``with`` statement, see previous bullet point), which will close the book automatically when leaving the body of the ``with`` statement.
* :bdg-info:`Enhancement` The new option ``err_to_str`` allows you to deliver cell errors like ``#N/A`` as strings instead of ``None`` (default): ``xw.Book("mybook.xlsx").options(err_to_str=True).value``.
* :bdg-danger:`Breaking Change` :bdg-secondary:`PRO` xlwings Server used to deliver cell errors as strings, which wasn't consistent with the rest of xlwings. This has now been fixed. To get the previous behavior, use the ``err_to_str`` options, see the previous bullet point.
* :bdg-danger:`Breaking Change` :bdg-secondary:`PRO` xlwings Server used to deliver cell errors as strings, which wasn't consistent with the rest of xlwings. This has now been fixed by delivering them as ``None`` by default. To get the previous behavior, use the ``err_to_str`` option, see the previous bullet point.
* :bdg-info:`Enhancement` :bdg-secondary:`PRO` The *Remote Interpreter* has been rebranded to *xlwings Server*.

v0.27.15 (Sep 16, 2022)
-----------------------
Expand Down
2 changes: 2 additions & 0 deletions xlwings/pro/_xlcalamine.py
Expand Up @@ -160,6 +160,8 @@ def open(self, filename):
"address": t2.split("!")[1],
"book_scope": True, # TODO: not provided by calamine
}
if t2
else None
for t1, t2 in xlwingslib.get_defined_names(filename)
],
},
Expand Down

0 comments on commit 36f5443

Please sign in to comment.