upgrade pandas & no support for python>3.8

This commit is contained in:
davidpagnon 2023-10-18 12:56:15 +02:00
parent 654b01f404
commit 7d7e86aaa4
9 changed files with 11 additions and 11 deletions

View File

@ -1,7 +1,7 @@
# This workflow will install Python dependencies, run tests and lint on several OS with a several versions of Python
# See: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
name: Build on Win-MacOS-Ubuntu with Python 3.7-3.11
name: Build on Win-MacOS-Ubuntu with Python 3.8-3.12
on:
push:
@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
include:
- os: ubuntu-latest
path: ~/.cache/pip

View File

@ -77,7 +77,7 @@ def save_to_csv_or_h5(kpt_list, output_folder, video_name, to_csv, to_h5):
if to_csv:
csv_file = os.path.join(output_folder, video_name+'.csv')
df.to_csv(csv_file, sep=',', index=True, line_terminator='\n')
df.to_csv(csv_file, sep=',', index=True, lineterminator='\n')
if to_h5:
h5_file = os.path.join(output_folder, video_name+'.h5')

View File

@ -73,7 +73,7 @@ def trc_Zup_to_Yup_func(*args):
[trc_o.write(line) for line in header]
Q_Yup.insert(0, 'Frame#', frames_col)
Q_Yup.insert(1, 'Time', time_col)
Q_Yup.to_csv(trc_o, sep='\t', index=False, header=None, line_terminator='\n')
Q_Yup.to_csv(trc_o, sep='\t', index=False, header=None, lineterminator='\n')
if __name__ == '__main__':
parser = argparse.ArgumentParser()

View File

@ -121,7 +121,7 @@ def trc_from_header_data(Header, Data, combined_path):
with open(combined_path, 'w') as trc_o:
trc_o.write(header_trc+'\n')
Data.to_csv(trc_o, sep='\t', index=False, header=None, line_terminator='\n')
Data.to_csv(trc_o, sep='\t', index=False, header=None, lineterminator='\n')
def trc_combine_func(*args):

View File

@ -74,7 +74,7 @@ def trc_desample_func(*args):
# write trc
with open(trc_desampled_path, 'w') as trc_o:
[trc_o.write(line) for line in header]
Q.to_csv(trc_o, sep='\t', index=False, header=None, line_terminator='\n')
Q.to_csv(trc_o, sep='\t', index=False, header=None, lineterminator='\n')
if __name__ == '__main__':

View File

@ -340,7 +340,7 @@ def trc_filter_func(**args):
[trc_o.write(line) for line in header]
Q_filt.insert(0, 'Frame#', frames_col)
Q_filt.insert(1, 'Time', time_col)
Q_filt.to_csv(trc_o, sep='\t', index=False, header=None, line_terminator='\n')
Q_filt.to_csv(trc_o, sep='\t', index=False, header=None, lineterminator='\n')
if __name__ == '__main__':

View File

@ -496,7 +496,7 @@ def filter_all(config):
[trc_o.write(line) for line in header]
Q_filt.insert(0, 'Frame#', frames_col)
Q_filt.insert(1, 'Time', time_col)
Q_filt.to_csv(trc_o, sep='\t', index=False, header=None, line_terminator='\n')
Q_filt.to_csv(trc_o, sep='\t', index=False, header=None, lineterminator='\n')
# Recap
recap_filter3d(config, trc_path_out)

View File

@ -170,7 +170,7 @@ def make_trc(config, Q, keypoints_names, f_range):
trc_path = os.path.join(pose3d_dir, trc_f)
with open(trc_path, 'w') as trc_o:
[trc_o.write(line+'\n') for line in header_trc]
Q.to_csv(trc_o, sep='\t', index=True, header=None, line_terminator='\n')
Q.to_csv(trc_o, sep='\t', index=True, header=None, lineterminator='\n')
return trc_path

View File

@ -1,6 +1,6 @@
[metadata]
name = pose2sim
version = 0.4.6
version = 0.4.7
author = David Pagnon
author_email = contact@david-pagnon.com
description = Perform a markerless kinematic analysis from multiple calibrated views as a unified workflow from an OpenPose input to an OpenSim result.
@ -41,7 +41,7 @@ install_requires =
PyQt5
tqdm
anytree
pandas<1.5
pandas>=1.5
scipy
statsmodels
filterpy