Skip to content

AMBARI-26567 : Fix pkg_resources deprecation warning in ambari_jinja2 #4099

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.

Sign up for GitHub

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

Open
harshith-21 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

AMBARI-26567 : Fix pkg_resources deprecation warning in ambari_jinja2 #4099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion ambari-agent/src/main/python/ambari_agent/CommandHooksOrchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def build(self, prefix, command, service, role):
if "service" in hook_definition and service is None:
continue

if "role" is hook_definition and role is None:
if "role" == hook_definition and role is None:
continue

yield hook_definition.format(
Expand Down
7 changes: 4 additions & 3 deletions ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@

__docformat__ = "restructuredtext en"
try:
__version__ = __import__("pkg_resources").get_distribution("Jinja2").version
except:
__version__ = "unknown"
from importlib.metadata import version
__version__ = version('Jinja2')
except Exception:
__version__ = 'unknown'

# high level interface
from ambari_jinja2.environment import Environment, Template
Expand Down