Merge branch 'v3' into develop

.travis.yml

@@ -5,20 +5,28 @@ cache: pip
 
 python:
   - 3.8
+  - 3.9
   - 3.7
   - 3.6
   - 3.5
   - 3.4
   - 2.7
 
 env:
-  - PIKA_VERSION=0.13.1
-  - PIKA_VERSION=1.1.0
+  global:
+  # DOCKER_USERNAME
+  - secure: sHTdtcjB0o3WtBklzQViGrnFq6AAV8mDqdo3pwteLtQi2wVVkSYj7gZqyMKx+4DmdgtDBwcBaqmgfpWXsBd/xTMYt895VivYqQnsFcbyLh3m/AuWvuh4lTymi1YwyfHSc3bMVpb5hA+bm9QQt6RRntSHY1dAu5J9uaYRYUrIe94IEJANVGLc85S3ns/Iwxlsi69eVLDqjjvYyXX6ZeaUCekB96sjXJYNxzV8S8l0IqvVKKv2dcTLJTiYsONwQlM775sW+gWn+MA7yHgvh92ehPfK7GRpo5fgbZaOKnN9J/pISLwJIUGDY3uNhBayY6d6gSv9MbV+jBazNBZl8u53LSc9pSxC5yP3eBAr+RxX+WSm4xp/1TrD78n4tRgOlzIt41LPCFVje8Te22/iaAAXI+78Mglm282tkA/JAIqdPz9WB+9ZqJZ5QT0JUZsLp32nnI69Zg4cejciVHjKaD4U4NP1Ob7lRnoLYIbLSQIVL/OsUnHZkE1FymRq8c7j8vv8qg29bCIfvIl+6cFPMkY7mf1M7Tjbh7nUaBzhG7CdCbp45VQwTha9n0XUI5KkkY119NsPDQ/DocJVCH9toY1/C/eaaZIvgeRmFgvyuK45v+iFeHQ8eoEYmCODkmdOnc29peuPpTdYDDdn/thIoD8BCS1JbgL67Xqc8Vf//jFyZGM=
+  # DOCKER_PASSWORD
+  - secure: ewaRjgD8RxFbB6PLTN8yDit86dip3L3PEw8aP5eKA5eba0+hy5YyGAI+Yntuq3+yHh5tvC/G6/cS21orWRVf2/y4BzYO6MHCNcaWyE9ZhGU4FUOmOaAxLXfQoPCLCsDkEPnHWaeznp4iZfbJlJjYSCe2BtfMjH9Y2ZWcFfmWhGpQScgJOIGN5vE1w1voBBhsAInnf3HgA0cefQfmAxZVO+DmTejHoc9NHl+mLEmV9UnTmeoZFjXywZuU6fTrhrCQfMH6Cdf3iTWMv0uuPoQIP5Ym69eAWHfQ3Jwc2glmYgXKhqjaiC1t+MSrm7IDvBhO19v/Kezrn4TJxqd29hxOy7huvIYiJQDSVGgJzIrn/TPw5Oq8W4WpINex+/jQCc2/kj/UUfdJHPoddj0Ldk7kVKf/5GmToHLMg+urcmQdllq8B+AxRJWYV8855aDndYvbtWuPL89ktX7bQ+wehvjUsD93XgJwVn6LJPkWb2OLbc4GuAtXMkrBsrTJ31lNgmDUq+zf5EOVznffx8CmKXb0lDpWkBsDa5pKHkPMNEH05uLNhNDI3lIBc49wLd5vmeKveFaNfOJHGhvlBMpLkNcYLO1U1RqkiesalNB5XTTlenVkSd3/ZszsPGl/X6Udub3/vLZo06T5q5mp97yFJIlX7VWo5/ZtGiCPs9PsKX03VPY=
+  jobs:
+    - PIKA_VERSION: 0.13.1
+    - PIKA_VERSION: 1.1.0
 
 stages:
   - lint
   - test
   - deploy
+  - docker deploy
 
 # This is for the "test" stage
 install:
@@ -27,9 +35,12 @@ install:
 
 script: make coverage
 after_success: codecov
+after_failure: make test
 
 jobs:
   exclude:
+    - python: 3.9
+      env: PIKA_VERSION=0.13.1
     - python: 3.7
       env: PIKA_VERSION=0.13.1
     - python: 3.6
@@ -57,3 +68,10 @@ jobs:
         username: beerbuildbot
         password:
           secure: jW6tOmxBs28o7fdWhQuHbAZbLuLVFu+WUtfaKkEhzONWpjJqYU/HWsugznilCWC1JB8OYHn0y/KdWzF/5JL0aICW2S9qf7Z/tgd3bcbJgEaAZrI92tKYEWv8qc91LkFfaC3jg/qkvAz1ePZ445p7kOh3WnOmgyYy5qNaw46M+EFSXnQJ7S5UQ+kc0Yu1FX6KkccOItIZns4klFO+6MA1o+Alt5fjN67ifrPtJih6m1k15vh7COsUyL+eYxRSYNfDDcCkiYv9qcXRR2JA9IdT/uJ8hUxKm2T5jeAH8LNDo1/XSQ+RZiR8ls93MQx/y0CcFht0K0Qa1h5MA7ZP5dh3XCpPbXDQmt0YpN6csjGLfdSwKItVaWNxLBbuxHf1/jZe+1kdzn8ovYXh+7GmxwWm6DnNf7J4pnwKRQnB5K650lJucx03rbuX+Q+rtWGDyLjYPZqTj1Dg7dDPplISAGmLTg1bMm9eGWx4zFtZsj6cLMfM/Sp5ZXFlPLpfj0eHQMPJ0fktg+WjvKH8K5ZOU81FtfsTA4qJ8Z6+TFNBXxxcR0z+pI0DOpI7PxhleGJRDuKB4uEO7Sg4WlLH/pXOolYwNTLjU56GBtBTIc3p+uLxzzAqPwsFK0/jjAAbiWg7lN8b0WGmDT93A1Dcv9QG9e6l039ZwHfUUzYS7DIJFCguy/k=
+
+    - stage: docker deploy
+      if: tag IS present
+      install: skip
+      before_script: make docker-login
+      script: make publish-docker VERSION=$TRAVIS_TAG
+      after_success: skip

CHANGELOG.rst

@@ -1,6 +1,36 @@
 Brewtils Changelog
 ==================
 
+3.0.0
+-----
+Date: 11/10/20
+
+Note: This is a major upgrade with several breaking changes. Please see the
+`Upgrade Guide
+<https://github.com/beer-garden/brewtils/blob/master/UPGRADING.md>`_ for all changes.
+
+New Features
+^^^^^^^^^^^^
+- Plugins now automatically load configuration from CLI and environment variables
+- Logging configuration is loaded automatically when Plugins are created
+- No longer need to pass connection information to System/Easy/Rest Clients
+- Parameter choices definition can be a non-list iterable (beer-garden/#512)
+- It's now easier to specify an alternate parent when making a request (beer-garden/#336)
+- SchemaParser can now directly serialize dicts and Boxes (#239)
+
+Bug Fixes
+^^^^^^^^^
+- EasyClient.get_instance_status is deprecated but now actually returns the instance status
+
+Other Changes
+^^^^^^^^^^^^^
+- Plugins are now multi-threaded by default (#47)
+- Better error messages when using SystemClient with raise_on_error=True (beer-garden/#689)
+- Various deprecated names have been removed
+- Can now defer setting a Plugin client
+- EasyClient.get_version returns actual version information instead of Response object
+- Using a pika version <1 is deprecated
+
 2.4.15
 -----
 Date: 10/13/20
@@ -10,39 +40,39 @@ Bug Fixes
 - Fixing command invocation error when request has no parameters (beer-garden/#351)
 
 2.4.14
------
+------
 Date: 1/30/20
 
 Bug Fixes
 ^^^^^^^^^
 - Better error handling if a request exceeds 16MB size limit (beer-garden/#308)
 
 2.4.13
------
+------
 Date: 1/13/20
 
 Bug Fixes
 ^^^^^^^^^
 - Requests republished to rabbit are now persistent (beer-garden/#397)
 
 2.4.12
------
+------
 Date: 1/10/20
 
 Other Changes
 ^^^^^^^^^^^^^
 - Reverting a log message level that was incorrectly set to INFO
 
 2.4.11
------
+------
 Date: 12/9/19
 
 Other Changes
 ^^^^^^^^^^^^^
 - Plugins always attempt to notify Beer-garden when terminating (beer-garden/#376)
 
 2.4.10
------
+------
 Date: 11/12/19
 
 Bug Fixes
@@ -98,7 +128,7 @@ Other Changes
 ^^^^^^^^^^^^^
 - Support for new header-style authentication token (#122)
 - Added EasyClient.get_instance, deprecated get_instance_status (beer-garden/#231)
-- Parameters with is_kwarg on command without **kwargs will raise (beer-garden/#216)
+- Parameters with is_kwarg on command without \**kwargs will raise (beer-garden/#216)
 
 2.4.5
 -----

Makefile

@@ -3,6 +3,9 @@
 PYTHON        = python
 MODULE_NAME   = brewtils
 TEST_DIR      = test
+DOCKER_NAME    = bgio/plugins
+
+VERSION        ?= 0.0.0
 
 .PHONY: clean clean-build clean-docs clean-test clean-pyc docs help test
 
@@ -76,10 +79,15 @@ clean-all: clean-build clean-docs clean-python clean-sphinx clean-test ## remove
 clean: clean-build clean-docs clean-python clean-test ## remove everything but sphinx
 
 
+# Formatting
+format: ## Run black formatter in-line
+	black -t py27 $(MODULE_NAME) $(TEST_DIR)
+
+
 # Linting
 lint: ## check style with flake8
 	flake8 $(MODULE_NAME) $(TEST_DIR)
-	black --check $(MODULE_NAME) $(PYTHON_TEST_DIR)
+	black --check $(MODULE_NAME) $(TEST_DIR)
 
 
 # Testing / Coverage
@@ -92,13 +100,27 @@ test-tox: ## run tests on every Python version with tox
 test: test-python ## alias of test-python
 
 coverage: ## check code coverage quickly with the default Python
-	coverage run --source $(MODULE_NAME) -m pytest
+	coverage run --source $(MODULE_NAME) -m pytest --tb=no
 	coverage report -m
 	coverage html
 
 coverage-view: coverage ## view coverage report in a browser
 	$(BROWSER) htmlcov/index.html
 
+# Docker
+docker-login: ## log in to the docker registry
+	echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USER}" --password-stdin
+
+docker-build: docs ## build the docker images
+	docker build -t $(DOCKER_NAME):python3-$(VERSION) --build-arg VERSION=$(VERSION) -f docker/python3/Dockerfile .
+	docker build -t $(DOCKER_NAME):python3-onbuild-$(VERSION)  --build-arg VERSION=$(VERSION) -f docker/python3/onbuild/Dockerfile .
+	docker build -t $(DOCKER_NAME):python2-$(VERSION) --build-arg VERSION=$(VERSION) -f docker/python2/Dockerfile .
+	docker build -t $(DOCKER_NAME):python2-onbuild-$(VERSION) --build-arg VERSION=$(VERSION) -f docker/python2/onbuild/Dockerfile .
+	docker build -t $(DOCKER_NAME):docs-$(VERSION) -f docs/Dockerfile docs/
+	docker tag $(DOCKER_NAME):python3-$(VERSION) $(DOCKER_NAME):latest
+	docker tag $(DOCKER_NAME):python3-$(VERSION) $(DOCKER_NAME):python3
+	docker tag $(DOCKER_NAME):python2-$(VERSION) $(DOCKER_NAME):python2
+	docker tag $(DOCKER_NAME):docs-$(VERSION) $(DOCKER_NAME):docs
 
 # Documentation
 docs: ## generate Sphinx HTML documentation, including API docs
@@ -129,3 +151,16 @@ publish-package-test: package ## upload a package to the testpypi
 
 publish-package: package ## upload a package
 	twine upload dist/*
+
+publish-docker: docker-build ## push the docker images
+	docker push $(DOCKER_NAME):python3-$(VERSION)
+	docker push $(DOCKER_NAME):python3-onbuild-$(VERSION)
+	docker push $(DOCKER_NAME):python2-$(VERSION)
+	docker push $(DOCKER_NAME):python2-onbuild-$(VERSION)
+	docker push $(DOCKER_NAME):docs-$(VERSION)
+	docker push $(DOCKER_NAME):docs
+
+	## Add this back in one 3.0 is released
+	#docker push $(DOCKER_NAME):python3
+	#docker push $(DOCKER_NAME):python2
+	#docker push $(DOCKER_NAME):latest