Skip to content

Commit

Permalink
Merge pull request #25 from rbiswas4/Issue#23/makepython3compatible
Browse files Browse the repository at this point in the history
Works on python 3
  • Loading branch information
rbiswas4 authored Jan 18, 2018
2 parents eeaa9df + 463f2ca commit 9123eaf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions obscond/historicalWeatherData.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from __future__ import print_function, absolute_import
__all__ = ['WeatherData']
import os
import pandas as pd
import sys
import numpy as np
from .constants import *
from .io import *

__all__ = ['WeatherData']

SeeingFile = os.path.join(example_data_dir, 'SeeingPachon.txt')
CloudFile = os.path.join(example_data_dir, 'CloudTololo.txt')
Expand Down Expand Up @@ -55,10 +56,10 @@ def fromTxtFiles(cls,
seeingColNames = ['days', 'seeing']

cloudHistory = pd.read_csv(CloudTxtFile, delim_whitespace=True)
print (len(cloudHistory))
print(len(cloudHistory))
stripLeadingPoundFromHeaders(cloudHistory)

print cloudHistory.columns
print(cloudHistory.columns)
cloudHistory['days'] = cloudHistory['c_date'] / DAY_IN_SEC
cloudHistory.rename(columns={'cloud': 'cloudFraction'}, inplace=True)
cloudColNames = ['days', 'cloudFraction']
Expand Down
2 changes: 1 addition & 1 deletion obscond/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.1"
__version__ = "0.5.0"

0 comments on commit 9123eaf

Please sign in to comment.