diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index ce3d943..89c4061 100644 --- 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 index b3fcd32..5ed027b 100644 --- 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 index d67eb10..f4cb96d 100644 --- 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 index b3e53ac..52fc603 100644 Binary files a/tests/data/markers.xlsx and b/tests/data/markers.xlsx differ