Merge pull request #519 from beer-garden/drop_2_7

Dropping 2.7 Support
beer-garden · Dec 2, 2024 · aff3105 · aff3105
2 parents 63bfd72 + 216ca36
commit aff3105
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 32 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ Brewtils Changelog
 TBD
 
 - Updated Wait Timeout Exception expected HTTP code from 408 to 504
+- Dropping Official Python 2.7 Support
 
 3.29.0
 ------

diff --git a/Makefile b/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)

diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile
diff --git a/docker/python2/onbuild/Dockerfile b/docker/python2/onbuild/Dockerfile
diff --git a/docker/python3/Dockerfile b/docker/python3/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine as base
+FROM python:3.11-alpine as base
 
 ARG VERSION
 

diff --git a/setup.py b/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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Brewtils Changelog @@
     TBD
     - Updated Wait Timeout Exception expected HTTP code from 408 to 504
+    - Dropping Official Python 2.7 Support
 .29.0
     ------
@@ Expand Down @@