Skip to content

change: remove usage of pkg_resources #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ def read_version():
"protobuf3-to-dict>=0.1.5",
"requests>=2.20.0, <3",
"smdebug-rulesconfig==0.1.2",
"importlib-metadata>=1.4.0",
"packaging>=20.0",
]

# Specific use case dependencies
Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"""Placeholder docstring"""
from __future__ import absolute_import

import pkg_resources
import importlib_metadata

from sagemaker import estimator, parameter, tuner # noqa: F401
from sagemaker.amazon.kmeans import KMeans, KMeansModel, KMeansPredictor # noqa: F401
Expand Down Expand Up @@ -60,4 +60,4 @@
from sagemaker.automl.automl import AutoML, AutoMLJob, AutoMLInput # noqa: F401
from sagemaker.automl.candidate_estimator import CandidateEstimator, CandidateStep # noqa: F401

__version__ = pkg_resources.require("sagemaker")[0].version
__version__ = importlib_metadata.version("sagemaker")
9 changes: 5 additions & 4 deletions src/sagemaker/mxnet/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

import logging

from pkg_resources import parse_version
import packaging.version

from sagemaker import fw_utils

import sagemaker
Expand Down Expand Up @@ -142,9 +143,9 @@ def prepare_container_def(self, instance_type, accelerator_type=None):
dict[str, str]: A container definition object usable with the
CreateModel API.
"""
is_mms_version = parse_version(self.framework_version) >= parse_version(
self._LOWEST_MMS_VERSION
)
is_mms_version = packaging.version.Version(
self.framework_version
) >= packaging.version.Version(self._LOWEST_MMS_VERSION)

deploy_image = self.image
if not deploy_image:
Expand Down
6 changes: 3 additions & 3 deletions src/sagemaker/pytorch/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

import logging
import pkg_resources
import packaging.version
from sagemaker import fw_utils

import sagemaker
Expand Down Expand Up @@ -143,8 +143,8 @@ def prepare_container_def(self, instance_type, accelerator_type=None):
dict[str, str]: A container definition object usable with the
CreateModel API.
"""
lowest_mms_version = pkg_resources.parse_version(self._LOWEST_MMS_VERSION)
framework_version = pkg_resources.parse_version(self.framework_version)
lowest_mms_version = packaging.version.Version(self._LOWEST_MMS_VERSION)
framework_version = packaging.version.Version(self.framework_version)
is_mms_version = framework_version >= lowest_mms_version

deploy_image = self.image
Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/user_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

import platform
import sys
import pkg_resources

import boto3
import botocore
import importlib_metadata

SDK_VERSION = pkg_resources.require("sagemaker")[0].version
SDK_VERSION = importlib_metadata.version("sagemaker")
OS_NAME = platform.system() or "UnresolvedOS"
OS_VERSION = platform.release() or "UnresolvedOSVersion"
PYTHON_VERSION = "{}.{}.{}".format(
Expand Down