Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
25 changes: 15 additions & 10 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
pull_request:
branches: [main, develop]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true

jobs:
compliance-dependencies:
name: Compliance Dependencies
Expand Down Expand Up @@ -121,7 +125,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk-version: ["8.0","8.1","8.2"]
splunk-version: ["8.1","8.2"]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -195,13 +199,22 @@ jobs:

test-splunk-matrix:
name: Test Matrix
needs:
- pre-commit
- compliance-dependencies
- compliance-copyrights
- test-splunk-external
- test-splunk-doc
- test-splunk-unit
- review_secrets
- review-dog-misspell
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7]
splunk-version: [8.0, 8.1, 8.2]
splunk-version: [8.1, 8.2]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -267,15 +280,7 @@ jobs:
publish:
name: publish
needs:
- pre-commit
- compliance-dependencies
- compliance-copyrights
- test-splunk-external
- test-splunk-doc
- test-splunk-matrix
- test-splunk-unit
- review_secrets
- review-dog-misspell
runs-on: ubuntu-latest
env:
NEEDS: ${{ toJson(needs) }}
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ repos:
rev: v4.0.1
hooks:
- id: check-merge-conflict
- id: debug-statements
- repo: https://github.com/psf/black
rev: 21.9b0
hooks:
Expand Down
6 changes: 1 addition & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ Developing

Note: Must install docker desktop, vscode or pycharm pro optional

Note2: Appinspect requires libmagic verify this has been installed correctly each time a new workstation/vm is used https://dev.splunk.com/enterprise/docs/releaseapps/appinspect/splunkappinspectclitool/installappinspect

.. code:: bash

$ git clone --recurse-submodules -j8 [email protected]:splunk/pytest-splunk-addon.git

$ #setup python venv must be 3.7
$ #setup python venv must be 3.7
$ /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 -m venv .venv

$ source .venv/bin/activate
Expand All @@ -57,8 +55,6 @@ Note2: Appinspect requires libmagic verify this has been installed correctly eac

$ pip3 install -r requirements.txt

$ pip3 install https://download.splunk.com/misc/appinspect/splunk-appinspect-latest.tar.gz

$ python setup.py develop


Expand Down
6 changes: 3 additions & 3 deletions docs/api_reference/sample_generation.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
DataGenerator
------------------

EventgenParser
~~~~~~~~~~~~~~~~~~
.. automodule:: standard_lib.sample_generation.eventgen_parser
PytestSplunkAddonDataParser
~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: standard_lib.sample_generation.pytest_splunk_addon_data_parser
:members:
:show-inheritance:

Expand Down
Loading