Merge fc6cd6c into 938bbec

JaneliaSciComp · Oct 14, 2021 · 8fbfaec · 8fbfaec
2 parents 938bbec + fc6cd6c
commit 8fbfaec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,19 +29,14 @@ jobs:
         python-version: ["3.7", "3.8", "3.9"]
     steps:
       - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/setup-python@v2
         with:
-          auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-      - name: Conda install
-        shell: bash
-        run: |
-          conda install pip pytest numpy
+      - run: |
           pip install -r requirements-dev.txt
-      - name: py_test
-        shell: bash
-        run: py.test -s -v --cov-config .coveragerc --cov=pywavesurfer --flake8
+          py.test -s -v --cov-config .coveragerc --cov=pywavesurfer --flake8
       - name: Coveralls Parallel
+        if: matrix.os == 'ubuntu-latest'
         uses: AndreMiras/coveralls-python-action@develop
         with:
           github-token: ${{ secrets.github_token }}

diff --git a/pywavesurfer/ws.py b/pywavesurfer/ws.py
@@ -39,7 +39,7 @@ def loadDataFile(filename, format_string='double'):
     header = data_file_as_dict["header"]
     if "VersionString" in header:
         version_numpy = header["VersionString"]  # this is a scalar numpy array with a weird datatype
-        version = version_numpy.tostring().decode("utf-8")
+        version = version_numpy.tobytes().decode("utf-8")
         parsed_version = parse_version(version)
         if parsed_version in _over_version_1:
             if parsed_version > parse_version(str(_latest_version)):