Merge branch 'master' of github.com:splunk/splunk-sdk-python into develop

Author: amysutedja

.github/workflows/release.yml

@@ -0,0 +1,81 @@
+name: Release
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch: {}
+
+jobs:
+  find_version:
+    name: Find Version
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get-version.outputs.version }}
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2.3.2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Get version
+        id: get-version
+        run: python -c 'import splunklib; print("::set-output name=version::%s" % splunklib.__version__)'
+  tag_version:
+    needs: find_version
+    name: Tag Version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create tag
+        uses: tvdias/github-tagger@v0.0.2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ needs.find_version.outputs.version }}
+  release:
+    needs: [find_version, tag_version]
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2.3.2
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ needs.find_version.outputs.version }}
+          release_name: Release/${{ needs.find_version.outputs.version }}
+          body: |
+            ## Version ${{ needs.find_version.outputs.version }}
+
+            **TODO: Insert CHANGELOG.md contents here.**
+          draft: false
+          prerelease: false
+  publish:
+    needs: release
+    name: Deploy Release to PyPI
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2.3.2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install dependencies
+        run: pip install twine
+      - name: Build package
+        run: python setup.py sdist
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.3.1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+      # Test upload
+      # - name: Publish package to TestPyPI
+      #   uses: pypa/gh-action-pypi-publish@master
+      #   with:
+      #     user: __token__
+      #     password: ${{ secrets.test_pypi_password }}
+      #     repository_url: https://test.pypi.org/legacy/

Makefile

@@ -15,6 +15,8 @@ VERSION := `git describe --tags --dirty 2>/dev/null`
 COMMITHASH := `git rev-parse --short HEAD 2>/dev/null`
 DATE := `date "+%FT%T%z"`
 
+CONTAINER_NAME := 'splunk'
+
 .PHONY: all
 all: build_app test
 
@@ -67,12 +69,26 @@ up:
 	@echo "$(ATTN_COLOR)==> up $(NO_COLOR)"
 	@docker-compose up -d
 
+.PHONY: remove
+remove:
+	@echo "$(ATTN_COLOR)==> rm $(NO_COLOR)"
+	@docker-compose rm -f -s
+
 .PHONY: wait_up
 wait_up:
 	@echo "$(ATTN_COLOR)==> wait_up $(NO_COLOR)"
-	@for i in `seq 0 180`; do if docker exec -it splunk /sbin/checkstate.sh &> /dev/null; then break; fi; printf "\rWaiting for Splunk for %s seconds..." $$i; sleep 1; done
+	@for i in `seq 0 180`; do if docker exec -it $(CONTAINER_NAME) /sbin/checkstate.sh &> /dev/null; then break; fi; printf "\rWaiting for Splunk for %s seconds..." $$i; sleep 1; done
 
 .PHONY: down
 down:
 	@echo "$(ATTN_COLOR)==> down $(NO_COLOR)"
 	@docker-compose stop
+
+.PHONY: start
+start: up wait_up
+
+.PHONY: restart
+restart: down start
+
+.PHONY: refresh
+refresh: remove start

tests/test_app.py

@@ -96,7 +96,8 @@ def test_package(self):
         p = self.app.package()
         self.assertEqual(p.name, self.app_name)
         self.assertTrue(p.path.endswith(self.app_name + '.spl'))
-        self.assertTrue(p.url.endswith(self.app_name + '.spl'))
+        # Assert string due to deprecation of this property in new Splunk versions
+        self.assertIsInstance(p.url, str)
 
     def test_updateInfo(self):
         p = self.app.updateInfo()