From 77328b74f4d00df20c3ca26dcf965d31a3f0c60b Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Mon, 8 Apr 2019 15:57:16 +0100 Subject: [PATCH] Add Python Jira module to requirements The Jira module is now available in global-requirements: https://review.openstack.org/#/c/562151/ Since the Jira module is now loaded by default, it always needs to be installed. If a future change prevents loading of the Jira module unless the Jira plugin is enabled then this change can be reverted. Change-Id: I3fea82e681cd49aab5cd6afc29c60302af7b63b7 Story: 2005400 Task: 30394 --- docker/Dockerfile | 2 +- monasca_notification/plugins/jira_notifier.py | 5 ----- requirements.txt | 1 + setup.cfg | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0a78c0a..ef4b6a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ ARG CONSTRAINTS_BRANCH=master ARG COMMON_VERSION=master # Extra Python3 dependencies. -ARG EXTRA_DEPS="netaddr gevent==1.3.5 greenlet jira" +ARG EXTRA_DEPS="netaddr gevent==1.3.5 greenlet" # Always start from `monasca-base` image and use specific tag of it. ARG BASE_TAG=master diff --git a/monasca_notification/plugins/jira_notifier.py b/monasca_notification/plugins/jira_notifier.py index 1f2855c..6ec075b 100644 --- a/monasca_notification/plugins/jira_notifier.py +++ b/monasca_notification/plugins/jira_notifier.py @@ -37,11 +37,6 @@ from monasca_notification.plugins.abstract_notifier import AbstractNotifier notification.address = https:///?project= - Dependency for Jira - 1) Jira plugin requires Jira library. Consumers need to install - JIRA via pip - 2) (i.e) pip install jira - Jira Configuration 1) jira: user: username diff --git a/requirements.txt b/requirements.txt index 30904c4..03b33f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ six>=1.10.0 # MIT monasca-common>=2.7.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 +jira>=1.0.3 # BSD License (2 clause) diff --git a/setup.cfg b/setup.cfg index 98aa16f..c77f045 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,5 +41,4 @@ universal = 1 [extras] jira_plugin = - jira>=1.0.3 Jinja2>=2.10 # BSD License (3 clause)