Skip to content

Commit

Permalink
Update libraries to DWDataReader_v4_2_0_25 (#63)
Browse files Browse the repository at this point in the history
* Update libraries to DWDataReader_v4_2_0_25

* Add appveyor.yml

* Reduce number of rows by 1 for new library
  • Loading branch information
costerwi authored Sep 8, 2023
1 parent b5c5baf commit e579a23
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 3 deletions.
22 changes: 22 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# appveyor.yml - https://www.appveyor.com/docs/lang/python
---
image:
- Visual Studio 2019
#- Ubuntu

environment:
matrix:
- TOXENV: py27 # https://devguide.python.org/devcycle/#end-of-life-branches
- TOXENV: py37
- TOXENV: py310

build: false

install:
# - py --list
# - python -m ensurepip --upgrade
# - python -m pip install tox
- pip install tox

test_script:
- python -m tox
Binary file modified dwdatareader/DWDataReaderLib.dll
Binary file not shown.
Binary file modified dwdatareader/DWDataReaderLib.so
Binary file not shown.
Binary file modified dwdatareader/DWDataReaderLib64.dll
Binary file not shown.
Binary file modified dwdatareader/DWDataReaderLib64.so
Binary file not shown.
2 changes: 1 addition & 1 deletion dwdatareader/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
print(ch.name, ch.series().mean())
"""
__all__ = ['DWError', 'DWFile', 'getVersion']
__version__ = '0.15.3'
__version__ = '0.15.4'

DLL = None # module variable accessible to other classes
encoding = 'ISO-8859-1' # default encoding
Expand Down
2 changes: 1 addition & 1 deletion test_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def test_dataframe(self):
"""Read all channel data as a single DataFrame."""
with dw.open(self.d7dname) as d7d:
self.assertFalse(d7d.closed, 'd7d did not open')
self.assertEqual((18771, 20), d7d.dataframe().shape)
self.assertEqual((18770, 20), d7d.dataframe().shape)

def test_encoding_uft8(self):
""" Check that encoding is set correcly """
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tox]
envlist = py27,py36,py37,py38,py39,py10
requires = virtualenv<20.22.0
envlist = py27,py37,py10
[testenv]
# install testing framework
# ... or install anything else you might need here
Expand Down

3 comments on commit e579a23

@tomnor
Copy link

@tomnor tomnor commented on e579a23 Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A note in all kindness about the one less in row count. I believe your test did its job and revealed a bug in the latest version of the libs from Dewesoft. It has been acknowledged to me by DS when I reported the problem. I dont know if you can see it but my issue over there is at https://support.dewesoft.com/en/support/tickets/99756 .
I /think/ a hint on this is that if you go the downloads now at DS the description text say v4.2.0.24, (although the version column still say 25). One could experiment and download again and see if the libs are different.

@costerwi
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the latest library available in the developer download section on Dewesoft was published September 1 which is the version included in this commit.

I can't login in to support to see your ticket. Did they say what version should include a fix?

Thanks!

@tomnor
Copy link

@tomnor tomnor commented on e579a23 Sep 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They didn't say what version would include a fix, and I just took it for granted that the next release will include a fix. And that's what I still think.

Please sign in to comment.