fix: Rollout changes in develop branch (#50) (#53)

* fix: Rollout changes in develop branch

* fix: commented app-inspect stage from approval

* fix: Rollout change for develop branch

* fix: Added patch commit for testing

* build(deps-dev): bump six from 1.12.0 to 1.15.0 (#41)

Bumps [six](https://github.com/benjaminp/six) from 1.12.0 to 1.15.0.
- [Release notes](https://github.com/benjaminp/six/releases)
- [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES)
- [Commits](benjaminp/six@1.12.0...1.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump mock from 3.0.5 to 4.0.3 (#42)

Bumps [mock](https://github.com/testing-cabal/mock) from 3.0.5 to 4.0.3.
- [Release notes](https://github.com/testing-cabal/mock/releases)
- [Changelog](https://github.com/testing-cabal/mock/blob/master/CHANGELOG.rst)
- [Commits](testing-cabal/mock@3.0.5...4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(package): remove duplicate SHOULD_LINEMERGE

* build(deps): bump cla-assistant/github-action (#51)

Bumps [cla-assistant/github-action](https://github.com/cla-assistant/github-action) from v2.0.2-alpha to v2.0.3-alpha.
- [Release notes](https://github.com/cla-assistant/github-action/releases)
- [Changelog](https://github.com/cla-assistant/github-action/blob/master/CHANGELOG.md)
- [Commits](contributor-assistant/github-action@v2.0.2-alpha...c89158d)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Devang Mehta (C) <devangm@splunk.com>
Co-authored-by: devangmehta-crest <76550108+devangmehta-crest@users.noreply.github.com>
Co-authored-by: zahrasidhpuri-crest <zsidhpuri@splunk.com>
Co-authored-by: zahrasidhpuri-crest <61701355+zahrasidhpuri-crest@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: zahrasidhpuri-crest <61701355+zahrasidhpuri-crest@users.noreply.github.com>
Co-authored-by: Devang Mehta (C) <devangm@splunk.com>
Co-authored-by: devangmehta-crest <76550108+devangmehta-crest@users.noreply.github.com>
Co-authored-by: zahrasidhpuri-crest <zsidhpuri@splunk.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/cla.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Alpha Release
-        uses: cla-assistant/github-action@v2.0.2-alpha
+        uses: cla-assistant/github-action@v2.0.3-alpha
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

package/default/props.conf

@@ -11,7 +11,6 @@ KV_MODE = NONE
 LEARN_SOURCETYPE = false
 LEARN_MODEL = false
 ANNOTATE_PUNCT = false
-SHOULD_LINEMERGE = false
 
 
 REPORT-fields = ta_cef_for_splunk_v0_fields, ta_cef_for_splunk_v0_cfields, ta_cef_for_splunk_v0_cfields_reverse,ta_cef_for_splunk_v0_flex_field,ta_cef_for_splunk_v0_flex_field_reverse,ta_cef_for_splunk_v0_deviceCustomDate_field

requirements_dev.txt

@@ -14,10 +14,10 @@ pytest-splunk-addon==1.4.0
 pytest-expect==1.1.0
 pytest-splunk-addon-ui-smartx==1.1.1
 pytest-rerunfailures==9.1.1
-mock==3.0.5
+mock==4.0.3
 requests==2.25.1
+six==1.15.0
 u-msgpack-python==2.7.1
-six==1.12.0
 coverage==5.3.1
 splunk-sdk==1.6.14
 future==0.18.2

requirements_py2_dev.txt

@@ -7,4 +7,4 @@ lovely-pytest-docker
 pytest
 pytest-xdist
 pytest-expect
-mock==3.0.5
+mock==4.0.3

tests/knowledge/test_addon.py

@@ -11,6 +11,3 @@
 class Test_App(Basic):
     def empty_method(self):
         pass
-
-
-