Skip to content

Commit

Permalink
Merge pull request #42 from splunk/develop
Browse files Browse the repository at this point in the history
Merge for release
  • Loading branch information
Ryan Faircloth authored Oct 8, 2020
2 parents 6c26a0a + 7b7ef15 commit 8dd4a73
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 88 deletions.
3 changes: 1 addition & 2 deletions .python-version
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
3.7.4
2.7.18
3.7.8
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ By the running the `ucc-gen` command, the following steps came in action:

| File Name | Description | Output directory in ucc build |
|----------------------|-------------------------------------|-------------------------------|
| requirements.txt | Python2/python3 compatible packages | output/<package_ID>/lib |
| requirements_py2.txt | Only Python2 compatible packages | output/<package_ID>/lib/py2 |
| requirements_py3.txt | Only python3 compatible packages | output/<package_ID>/lib/py3 |
| lib/requirements.txt | Python2/python3 compatible packages | output/<package_ID>/lib |
| lib/py2/requirements.txt | Only Python2 compatible packages | output/<package_ID>/lib/py2 |
| lib/py3/requirements.txt | Only python3 compatible packages | output/<package_ID>/lib/py3 |

7. Replace tokens in views
8. Copy addon's `package/*` to `output/<package_ID>/*` directory
Expand All @@ -69,4 +69,4 @@ splunk-add-on-ucc-framework supports the following params:
|------------|----------------------------------------------------------------------------------------------------------|
| source | Folder containing the app.manifest and app source |
| config | Path to the configuration file, Defaults to GlobalConfig.json in the parent directory of source provided |
| ta-version | Current version of TA, Default version is version specified in globalConfig.json |
| ta-version | Optional override Current version of TA, Default version is version specified in globalConfig.json a Splunkbase compatible version of SEMVER will be used by default |
27 changes: 13 additions & 14 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ lxml = "^4.3"
future = "^0"
splunktaucclib = "^4.0"
wheel = "*"
dunamai = "*"

[tool.poetry.dev-dependencies]
pytest = "^5.4"
Expand Down
46 changes: 0 additions & 46 deletions script/packagingScript.sh

This file was deleted.

Loading

0 comments on commit 8dd4a73

Please sign in to comment.