Skip to content

Commit

Permalink
datetime issue
Browse files Browse the repository at this point in the history
  • Loading branch information
inkenbrandt committed May 29, 2018
1 parent 13aed6a commit 54130d8
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 42 deletions.
79 changes: 41 additions & 38 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.5
0.5.6
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
setup(name='wellapplication',
description = 'Interface with xle files; analyze hydrographs; plot hydrographs; download USGS data',
long_description = long_description,
version = '0.5.5',
version = '0.5.6',
author = 'Paul Inkenbrandt',
author_email = '[email protected]',
url = 'https://github.com/inkenbrandt/WellApplication',
Expand Down
2 changes: 1 addition & 1 deletion wellapplication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .ros import *
from .arcpy_functions import *

__version__ = '0.5.5'
__version__ = '0.5.6'
__author__ = 'Paul Inkenbrandt'
__name__ = 'wellapplication'

Expand Down
2 changes: 1 addition & 1 deletion wellapplication/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ def fix_drift(well, manualfile, meas='Level', corrwl='corrwl', manmeas='Measured
for i in range(len(breakpoints) - 1):
# Break up pandas dataframe time series into pieces based on timing of manual measurements
bracketedwls[i] = well.loc[
(well.index.to_datetime() > breakpoints[i]) & (well.index.to_datetime() < breakpoints[i + 1])]
(pd.to_datetime(well.index) > breakpoints[i]) & (pd.to_datetime(well.index) < breakpoints[i + 1])]
df = bracketedwls[i]
if len(df) > 0:
df.sort_index(inplace=True)
Expand Down

0 comments on commit 54130d8

Please sign in to comment.