Merge "Remove dependency on pytz"
This commit is contained in:
commit
8fe3c0f35b
@ -40,7 +40,6 @@ from oslo_utils import netutils
|
|||||||
from oslo_utils import strutils
|
from oslo_utils import strutils
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import psutil
|
import psutil
|
||||||
import pytz
|
|
||||||
|
|
||||||
from ironic.common import exception
|
from ironic.common import exception
|
||||||
from ironic.common.i18n import _
|
from ironic.common.i18n import _
|
||||||
@ -417,7 +416,7 @@ def unix_file_modification_datetime(file_name):
|
|||||||
# normalize time to be UTC without timezone
|
# normalize time to be UTC without timezone
|
||||||
datetime.datetime.fromtimestamp(
|
datetime.datetime.fromtimestamp(
|
||||||
# fromtimestamp will return local time by default, make it UTC
|
# fromtimestamp will return local time by default, make it UTC
|
||||||
os.path.getmtime(file_name), tz=pytz.utc
|
os.path.getmtime(file_name), tz=datetime.timezone.utc
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@ python-cinderclient!=4.0.0,>=3.3.0 # Apache-2.0
|
|||||||
python-glanceclient>=2.8.0 # Apache-2.0
|
python-glanceclient>=2.8.0 # Apache-2.0
|
||||||
keystoneauth1>=4.2.0 # Apache-2.0
|
keystoneauth1>=4.2.0 # Apache-2.0
|
||||||
ironic-lib>=5.5.0 # Apache-2.0
|
ironic-lib>=5.5.0 # Apache-2.0
|
||||||
pytz>=2013.6 # MIT
|
|
||||||
stevedore>=1.29.0 # Apache-2.0
|
stevedore>=1.29.0 # Apache-2.0
|
||||||
oslo.concurrency>=4.2.0 # Apache-2.0
|
oslo.concurrency>=4.2.0 # Apache-2.0
|
||||||
oslo.config>=6.8.0 # Apache-2.0
|
oslo.config>=6.8.0 # Apache-2.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user