Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…

…libs-timezones2

pandas/_libs/tslibs/frequencies.pyx

@@ -150,6 +150,10 @@ _period_code_map = {
  "N": 12000, # Nanosecondly
 }
 
+
+_reverse_period_code_map = {
+ _period_code_map[key]: key for key in _period_code_map}
+
 # Yearly aliases; careful not to put these in _reverse_period_code_map
 _period_code_map.update({'Y' + key[1:]: _period_code_map[key]
  for key in _period_code_map

pandas/tseries/frequencies.py

@@ -20,7 +20,10 @@
 
 from pandas._libs import lib, tslib
 from pandas._libs.tslib import Timedelta
-from pandas._libs.tslibs.frequencies import get_freq_code, _base_and_stride
+from pandas._libs.tslibs.frequencies import ( # noqa
+ get_freq_code, _base_and_stride, _period_str_to_code,
+ _INVALID_FREQ_ERROR, opattern, _lite_rule_alias, _dont_uppercase,
+ _period_code_map, _reverse_period_code_map)
 from pytz import AmbiguousTimeError
 
 
@@ -495,12 +498,6 @@ def to_offset(freq):
  return delta
 
 
-# hack to handle WOM-1MON
-opattern = re.compile(
- r'([\-]?\d*|[\-]?\d*\.\d*)\s*([A-Za-z]+([\-][\dA-Za-z\-]+)?)'
-)
-
-
 def get_base_alias(freqstr):
  """
  Returns the base frequency alias, e.g., '5D' -> 'D'

setup.py

@@ -476,8 +476,7 @@ def pxd(name):
  + _pxi_dep['hashtable'])},
  '_libs.tslib': {'pyxfile': '_libs/tslib',
  'pxdfiles': ['_libs/src/util', '_libs/lib'],
- 'depends': tseries_depends + [
- 'pandas/_libs/tslibs/timezones'],
+ 'depends': tseries_depends,
  'sources': ['pandas/_libs/src/datetime/np_datetime.c',
  'pandas/_libs/src/datetime/np_datetime_strings.c',
  'pandas/_libs/src/period_helper.c']},
@@ -493,9 +492,8 @@ def pxd(name):
  '_libs.index': {'pyxfile': '_libs/index',
  'sources': ['pandas/_libs/src/datetime/np_datetime.c',
  'pandas/_libs/src/datetime/np_datetime_strings.c'],
- 'pxdfiles': ['_libs/src/util', '_libs/hashtable'],
- 'depends': _pxi_dep['index'] + [
- 'pandas/_libs/tslibs/timezones']},
+ 'pxdfiles': ['_libs/src/util'],
+ 'depends': _pxi_dep['index']},
  '_libs.algos': {'pyxfile': '_libs/algos',
  'pxdfiles': ['_libs/src/util'],
  'depends': _pxi_dep['algos']},