openstack/oslo.utils
Code Issues Proposed changes

Bump monotonic to 0.3 to remove exception catching on import

Browse Source 
Related-Bug: 1476588

Depends-on: Ia3d4b01b665c8d97161164c89b1c92a5eb61d5b2

Change-Id: Iab6cc15f7871c25cf93c8fed1bd46773563a026e
This commit is contained in:
Kevin Houdebert 2015-08-07 16:49:55 +02:00
parent ae32983198
commit 67b318add1
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oslo_utils/timeutils.py
View File

@ -23,13 +23,7 @@ import time
from debtcollector import removals from debtcollector import removals
import iso8601 import iso8601
try: from monotonic import monotonic as now # noqa
from monotonic import monotonic as now # noqa
except RuntimeError:
try:
now = time.monotonic
except AttributeError:
now = time.time
from pytz import timezone from pytz import timezone
import six import six

2
requirements.txt
View File

@ -12,7 +12,7 @@ Babel>=1.3
six>=1.9.0 six>=1.9.0
iso8601>=0.1.9 iso8601>=0.1.9
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0
monotonic>=0.1 # Apache-2.0 monotonic>=0.3 # Apache-2.0
pytz>=2013.6 pytz>=2013.6
netaddr>=0.7.12 netaddr>=0.7.12
netifaces>=0.10.4 netifaces>=0.10.4