diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c52097cd..5fa626ea 100644 --- 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 index 3cafce4a..0785cebd 100644 --- 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 deleted file mode 100644 index 37991851..00000000 --- a/docker/python2/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM python:2.7-alpine - -ARG VERSION - -RUN pip --no-cache-dir install brewtils==$VERSION - -WORKDIR / -VOLUME /src - -CMD ["python", "-m", "src"] diff --git a/docker/python2/onbuild/Dockerfile b/docker/python2/onbuild/Dockerfile deleted file mode 100644 index 5f30be6f..00000000 --- a/docker/python2/onbuild/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG VERSION - -FROM bgio/plugins:python2-$VERSION - -ONBUILD COPY install-prereqs*.sh requirements*.txt /tmp/ -ONBUILD RUN bash -c " \ - if [ -f '/tmp/install-prereqs.sh' ]; then \ - bash /tmp/install-prereqs.sh; \ - fi && \ - if [ -f '/tmp/requirements.txt' ]; then \ - python -m pip install -r /tmp/requirements.txt; \ - fi" \ No newline at end of file diff --git a/docker/python3/Dockerfile b/docker/python3/Dockerfile index 2237432b..8bde28cf 100644 --- 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 index a524c862..a70360a5 100644 --- 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",