From 6965d2b2bea0fef824e885fec33a8e0e6bd50a97 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Thu, 16 Mar 2023 16:46:08 -0400 Subject: [PATCH] :package: Require joblib directly --- PyPEER/create_peer.py | 1 - PyPEER/estimate_eyemove.py | 1 - PyPEER/peer_func.py | 2 +- requirements.txt | 1 + setup.py | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PyPEER/create_peer.py b/PyPEER/create_peer.py index 6962ced..a41b8f2 100644 --- a/PyPEER/create_peer.py +++ b/PyPEER/create_peer.py @@ -15,7 +15,6 @@ import pandas as pd import nibabel as nib from sklearn.svm import SVR -from sklearn.externals import joblib from peer_func import * diff --git a/PyPEER/estimate_eyemove.py b/PyPEER/estimate_eyemove.py index 974a6f5..af63ef7 100644 --- a/PyPEER/estimate_eyemove.py +++ b/PyPEER/estimate_eyemove.py @@ -15,7 +15,6 @@ import pandas as pd import nibabel as nib from sklearn.svm import SVR -from sklearn.externals import joblib from peer_func import * diff --git a/PyPEER/peer_func.py b/PyPEER/peer_func.py index 57dd9b3..bc7c863 100644 --- a/PyPEER/peer_func.py +++ b/PyPEER/peer_func.py @@ -11,11 +11,11 @@ import sys import csv import json +import joblib import numpy as np import pandas as pd import nibabel as nib from sklearn.svm import SVR -from sklearn.externals import joblib def scaffolding(): diff --git a/requirements.txt b/requirements.txt index c6ae037..284d068 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +joblib numpy pandas nibabel diff --git a/setup.py b/setup.py index 14d25be..f048984 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup setup(name='PyPEER', - version='1.0', + version='1.1', description='Predictive Eye Estimation Regression', url='https://github.com/ChildMindInstitute/PyPEER', author='Jake Son',