Merge branch 'develop' into command_display_name

CHANGELOG.rst

@@ -1,11 +1,13 @@
 Brewtils Changelog
 ==================
 
-TBD
+3.29.1
 ------
 TBD
 
 - Added support for display name to command decorator
+- Updated Wait Timeout Exception expected HTTP code from 408 to 504
+- Dropping Official Python 2.7 Support
 
 3.29.0
 ------

Makefile

@@ -118,12 +118,8 @@ docker-build-docs: docs
 docker-build:
 	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 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
-
 
 # Documentation
 docs-deps: deps ## install dependencies for documentation
@@ -161,11 +157,8 @@ publish-package: package ## upload a package
 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):latest
 	docker push $(DOCKER_NAME):python3
-	docker push $(DOCKER_NAME):python2
 
 publish-docker-docs: docker-build-docs ## push the docker images
 	docker push $(DOCKER_NAME):docs-$(VERSION)

brewtils/rest/easy_client.py

@@ -62,11 +62,11 @@ def handle_response_failure(response, default_exc=RestError, raise_404=True):
 
     Raises:
         NotFoundError: Status code 404 and raise_404 is True
-        WaitExceededError: Status code 408
         ConflictError: Status code 409
         TooLargeError: Status code 413
         ValidationError: Any other 4xx status codes
         RestConnectionError: Status code 503
+        WaitExceededError: Status code 504
         default_exc: Any other status code
     """
     try:
@@ -79,8 +79,6 @@ def handle_response_failure(response, default_exc=RestError, raise_404=True):
             raise NotFoundError(message)
         else:
             return None
-    elif response.status_code == 408:
-        raise WaitExceededError(message)
     elif response.status_code == 409:
         raise ConflictError(message)
     elif response.status_code == 413:
@@ -89,6 +87,8 @@ def handle_response_failure(response, default_exc=RestError, raise_404=True):
         raise ValidationError(message)
     elif response.status_code == 503:
         raise RestConnectionError(message)
+    elif response.status_code == 504:
+        raise WaitExceededError(message)
     else:
         raise default_exc(message)
 

docker/python3/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine as base
+FROM python:3.11-alpine as base
 
 ARG VERSION
 

setup.py

@@ -51,8 +51,6 @@ def find_version():
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

test/rest/conftest.py

@@ -23,7 +23,7 @@ def not_found():
 
 @pytest.fixture
 def wait_exceeded():
-    return Mock(ok=False, status_code=408, json=Mock(return_value="payload"))
+    return Mock(ok=False, status_code=504, json=Mock(return_value="payload"))
 
 
 @pytest.fixture