Merge 863f32d into d242ab0

pyomeca · Jan 10, 2021 · cf33806 · cf33806
2 parents d242ab0 + 863f32d
commit cf33806
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
     name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@master

diff --git a/environment.yml b/environment.yml
@@ -9,4 +9,4 @@ dependencies:
   - ezc3d >= 1.3.2
   - matplotlib
   - bottleneck
-  - xlrd
+  - openpyxl
diff --git a/pyomeca/io/read.py b/pyomeca/io/read.py
@@ -95,6 +95,7 @@ def read_csv_or_excel(
             sheet_name=sheet_name,
             header=header,
             skiprows=skip_rows,
+            engine="openpyxl",
             **pandas_kwargs,
         )
 

diff --git a/tests/data/markers.xlsx b/tests/data/markers.xlsx