Created
July 16, 2018 07:07
-
-
Save delevaa/ffb0916a1939e772fccfd45baa1731bc to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc src/ggrc/models/mixins/stateful.py | |
index c2e2041,f0603c7..0000000 | |
--- a/src/ggrc/models/mixins/stateful.py | |
+++ b/src/ggrc/models/mixins/stateful.py | |
@@@ -9,8 -9,7 +9,12 @@@ from __future__ import absolute_impor | |
from enum import Enum | |
from enum import unique | |
++<<<<<<< HEAD | |
+from six.moves import map | |
+from six.moves import zip | |
++======= | |
+ import six | |
++>>>>>>> release/v2.20.1 | |
from sqlalchemy.ext.declarative import declared_attr | |
from sqlalchemy.ext.hybrid import hybrid_property | |
from sqlalchemy.orm import validates | |
diff --cc src/ggrc/services/history_log/history_log.py | |
index ed20310,8a9cc08..0000000 | |
--- a/src/ggrc/services/history_log/history_log.py | |
+++ b/src/ggrc/services/history_log/history_log.py | |
@@@ -260,11 -266,14 +266,20 @@@ class HistoryLog(object) | |
old_ca_definitions = self._index_by(old_ca_definitions, u'id') | |
new_ca_definitions = self._index_by(new_ca_definitions, u'id') | |
++<<<<<<< HEAD | |
+ all_ca_definitions = dict(chain( | |
+ six.iteritems(old_ca_definitions), six.iteritems(new_ca_definitions) | |
+ )) | |
++======= | |
+ all_ca_definitions = dict( | |
+ chain( | |
+ six.iteritems(old_ca_definitions), | |
+ six.iteritems(new_ca_definitions) | |
+ ) | |
+ ) | |
++>>>>>>> release/v2.20.1 | |
- for ca_def_id, ca_def in all_ca_definitions.iteritems(): | |
+ for ca_def_id, ca_def in six.iteritems(all_ca_definitions): | |
old_val = old_ca_values.get(ca_def_id, {}).get(u'attribute_value') | |
new_val = new_ca_values.get(ca_def_id, {}).get(u'attribute_value') | |
if old_val != new_val: | |
diff --cc src/ggrc/services/jira/api.py | |
index 67f9f8b,e11cb8a..0000000 | |
--- a/src/ggrc/services/jira/api.py | |
+++ b/src/ggrc/services/jira/api.py | |
@@@ -264,7 -263,6 +264,10 @@@ class JiraApi(object) | |
data=json.dumps(data) | |
) | |
except JIRAError as exc: | |
++<<<<<<< HEAD | |
+ print(exc) | |
++======= | |
++>>>>>>> release/v2.20.1 | |
raise JiraClientError('JiraApi edit_issue error: %s' % exc, | |
error=exc) | |
diff --cc src/ggrc_risks/models/risk.py | |
index d0141d3,58daab6..0000000 | |
--- a/src/ggrc_risks/models/risk.py | |
+++ b/src/ggrc_risks/models/risk.py | |
@@@ -9,8 -9,7 +9,12 @@@ | |
from __future__ import absolute_import | |
++<<<<<<< HEAD | |
+from six.moves import range | |
+from six.moves import zip | |
++======= | |
+ import six | |
++>>>>>>> release/v2.20.1 | |
from sqlalchemy import and_ | |
from sqlalchemy import case | |
from sqlalchemy.ext.hybrid import hybrid_property | |
@@@ -175,9 -177,9 +182,15 @@@ class Risk(HasObjectState, CustomAttrib | |
@classmethod | |
def _filter_by_likelihood(cls, predicate): | |
++<<<<<<< HEAD | |
+ dropdown_options = list( | |
+ zip(RiskConfig.get_key('likelihood_options_labels'), | |
+ RiskConfig.get_key('valid_likelihood_values')) | |
++======= | |
+ dropdown_options = six.moves.zip( | |
+ RiskConfig.get_key('likelihood_options_labels'), | |
+ RiskConfig.get_key('valid_likelihood_values') | |
++>>>>>>> release/v2.20.1 | |
) | |
return QueryFilterMacros.get_dropdown_filter(cls.comp_likelihood, | |
dropdown_options, | |
@@@ -185,9 -187,9 +198,15 @@@ | |
@classmethod | |
def _filter_by_impact(cls, predicate): | |
++<<<<<<< HEAD | |
+ dropdown_options = list( | |
+ zip(RiskConfig.get_key('impact_options_labels'), | |
+ RiskConfig.get_key('valid_impact_values')) | |
++======= | |
+ dropdown_options = six.moves.zip( | |
+ RiskConfig.get_key('impact_options_labels'), | |
+ RiskConfig.get_key('valid_impact_values') | |
++>>>>>>> release/v2.20.1 | |
) | |
return QueryFilterMacros.get_dropdown_filter(cls.impact, dropdown_options, | |
predicate) | |
@@@ -196,7 -198,7 +215,11 @@@ | |
def _filter_by_likelihood_part_1(cls, predicate): | |
labels = RiskConfig.get_key('likelihood_parts_options_labels') | |
num_keys = len(labels) | |
++<<<<<<< HEAD | |
+ dropdown_options = list(zip(labels, range(num_keys))) | |
++======= | |
+ dropdown_options = six.moves.zip(labels, range(num_keys)) | |
++>>>>>>> release/v2.20.1 | |
return QueryFilterMacros.get_dropdown_filter(cls.likelihood_part_1, | |
dropdown_options, | |
predicate) | |
@@@ -205,7 -207,7 +228,11 @@@ | |
def _filter_by_likelihood_part_2(cls, predicate): | |
labels = RiskConfig.get_key('likelihood_parts_options_labels') | |
num_keys = len(labels) | |
++<<<<<<< HEAD | |
+ dropdown_options = list(zip(labels, range(num_keys))) | |
++======= | |
+ dropdown_options = six.moves.zip(labels, range(num_keys)) | |
++>>>>>>> release/v2.20.1 | |
return QueryFilterMacros.get_dropdown_filter(cls.likelihood_part_2, | |
dropdown_options, | |
predicate) | |
diff --cc src/ggrc_workflows/models/cycle_task_group_object_task.py | |
index 18254de,9f39da4..0000000 | |
--- a/src/ggrc_workflows/models/cycle_task_group_object_task.py | |
+++ b/src/ggrc_workflows/models/cycle_task_group_object_task.py | |
@@@ -13,7 -13,7 +13,11 @@@ from __future__ import absolute_impor | |
from datetime import datetime | |
++<<<<<<< HEAD | |
+from six.moves.urllib.parse import urljoin | |
++======= | |
+ import six | |
++>>>>>>> release/v2.20.1 | |
from sqlalchemy import orm | |
from sqlalchemy.ext.associationproxy import association_proxy | |
from sqlalchemy.ext.hybrid import hybrid_property | |
diff --cc src/zen_configurator/loaders/yaml/default.yaml | |
index 71c34e6,c607fa3..0000000 | |
--- a/src/zen_configurator/loaders/yaml/default.yaml | |
+++ b/src/zen_configurator/loaders/yaml/default.yaml | |
@@@ -165,7 -157,7 +165,11 @@@ settings | |
DO_LOGGING: true | |
HOST: 0.0.0.0 | |
MAX_INSTANCES: '3' # Front-end API request batching | |
++<<<<<<< HEAD | |
+ VERSION: v3.0-DEV | |
++======= | |
+ VERSION: v2.20.1-RC6 | |
++>>>>>>> release/v2.20.1 | |
FULLTEXT_INDEXER: ggrc.fulltext.mysql.MysqlIndexer | |
## DataDog APM Settings ## | |
diff --cc test/unit/ggrc_risks/models/test_risk.py | |
index ef20139,d62d888..0000000 | |
--- a/test/unit/ggrc_risks/models/test_risk.py | |
+++ b/test/unit/ggrc_risks/models/test_risk.py | |
@@@ -10,7 -10,8 +10,12 @@@ from __future__ import absolute_impor | |
from unittest import TestCase | |
import mock | |
++<<<<<<< HEAD | |
+from six.moves import range | |
++======= | |
+ from six.moves import zip | |
+ from six.moves.builtins import range | |
++>>>>>>> release/v2.20.1 | |
from ggrc_risks.models import Risk | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment