Bring back resolution definitions and move whatnew to 0.20

jisantuc · jisantuc · commit fb422d36d6ef · 2016-10-27T11:01:26.000-04:00
diff --git a/doc/source/whatsnew/v0.19.1.txt b/doc/source/whatsnew/v0.19.1.txt
@@ -81,4 +81,3 @@ Bug Fixes
 
 - Bug in ``pd.pivot_table`` may raise ``TypeError`` or ``ValueError`` when ``index`` or ``columns``
   is not scalar and ``values`` is not specified (:issue:`14380`)
-- Bug in multiple offset aliases with decimal points regarded as ints (e.g. 0.5s as 5s) (:issue:`8419`)
diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
@@ -30,6 +30,7 @@ New features
 Other enhancements
 ^^^^^^^^^^^^^^^^^^
 
+- Multiple offset aliases with decimal points no longer regarded as ints (e.g. 0.5s as 5s) (:issue:`8419`)
 
 
 
diff --git a/pandas/tseries/frequencies.py b/pandas/tseries/frequencies.py
@@ -49,9 +49,12 @@ class FreqGroup(object):
 
 class Resolution(object):
 
-    # defined in period.pyx
-    # note that these are different from freq codes
-    RESOS = [RESO_NS, RESO_US, RESO_MS, RESO_SEC, RESO_MIN, RESO_HR, RESO_DAY]
+      RESO_US = RESO_US
+      RESO_MS = RESO_MS
+      RESO_SEC = RESO_SEC
+      RESO_MIN = RESO_MIN
+      RESO_HR = RESO_HR
+      RESO_DAY = RESO_DAY
 
     _reso_str_map = {
         RESO_NS: 'nanosecond',

Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,3 @@ Bug Fixes`
`81`	`81`
`82`	`82`	- Bug in ``pd.pivot_table`` may raise ``TypeError`` or ``ValueError`` when ``index`` or ``columns``
`83`	`83`	is not scalar and ``values`` is not specified (:issue:`14380`)
`84`		-- Bug in multiple offset aliases with decimal points regarded as ints (e.g. 0.5s as 5s) (:issue:`8419`)
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ New features`
`30`	`30`	`Other enhancements`
`31`	`31`	`^^^^^^^^^^^^^^^^^^`
`32`	`32`
	`33`	+- Multiple offset aliases with decimal points no longer regarded as ints (e.g. 0.5s as 5s) (:issue:`8419`)
`33`	`34`
`34`	`35`
`35`	`36`