Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update code to newer version of Pandas #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update code to newer version of Pandas #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pscore_match/match.py
View file
Open in desktop
Expand Up @@ -397,7 +397,7 @@ def whichMatched(matches, data, show_duplicates = True):
while j>0:
indices.append(i)
j -= 1
return data.ix[indices]
return data.iloc[indices]
else:
dat2 = data.copy()
dat2['weights'] = matches.weights
Expand Down
18 changes: 9 additions & 9 deletions requirements.txt
View file
Open in desktop
@@ -1,9 +1,9 @@
numpy==1.14.1
scipy==0.17.1
nose==1.3.7
coverage==4.2
coveralls==1.1
pandas==0.20.1
statsmodels==0.8.0
matplotlib==1.5.1
plotly==2.0.11
numpy
scipy
nose
coverage
coveralls
pandas
statsmodels
matplotlib
plotly
3 changes: 3 additions & 0 deletions setup.py
View file
Open in desktop
Expand Up @@ -71,6 +71,9 @@ def write_version_py(filename='pscore_match/version.py'):
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Scientific/Engineering',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
Expand Down