From 4cfae61e197d47c89fedfda903c59fcdd838b5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Fri, 25 Nov 2022 17:26:06 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Deprecate=20and=20remove=20Pytho?= =?UTF-8?q?n=203.6=20and=202.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ---- .github/workflows/test.yml | 4 ---- README.md | 16 +++++++++++----- docker-images/python2.7.dockerfile | 11 ----------- docker-images/python3.6-alpine3.8.dockerfile | 8 -------- docker-images/python3.6.dockerfile | 8 -------- pyproject.toml | 2 +- scripts/process_all.py | 2 -- 8 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 docker-images/python2.7.dockerfile delete mode 100644 docker-images/python3.6-alpine3.8.dockerfile delete mode 100644 docker-images/python3.6.dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9f94c8c..be9b5a9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,16 +21,12 @@ jobs: python_version: "3.8" - name: python3.7 python_version: "3.7" - - name: python3.6 - python_version: "3.6" - name: python3.9-alpine3.13 python_version: "3.8" - name: python3.8-alpine3.11 python_version: "3.8" - name: python3.7-alpine3.8 python_version: "3.7" - - name: python3.6-alpine3.8 - python_version: "3.6" fail-fast: true runs-on: ubuntu-18.04 steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7328702..4897c95 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,16 +23,12 @@ jobs: python_version: "3.8" - name: python3.7 python_version: "3.7" - - name: python3.6 - python_version: "3.6" - name: python3.9-alpine3.13 python_version: "3.9" - name: python3.8-alpine3.11 python_version: "3.8" - name: python3.7-alpine3.8 python_version: "3.7" - - name: python3.6-alpine3.8 - python_version: "3.6" fail-fast: true runs-on: ubuntu-18.04 steps: diff --git a/README.md b/README.md index 1ce62db..f81e3e2 100644 --- a/README.md +++ b/README.md @@ -5,22 +5,28 @@ * [`python3.9`, `latest` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.9.dockerfile) * [`python3.8`, _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.8.dockerfile) * [`python3.7`, _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.7.dockerfile) -* [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.6.dockerfile) ## Discouraged tags * [`python3.9-alpine3.13` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.9-alpine3.13.dockerfile) * [`python3.8-alpine3.11` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.8-alpine3.11.dockerfile) * [`python3.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.7-alpine3.8.dockerfile) -* [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile) To learn more about why Alpine images are discouraged for Python read the note at the end: [🚨 Alpine Python Warning](#-alpine-python-warning). -## Deprecated +## Deprecated tags -These tags are no longer supported: +🚨 These tags are no longer supported or maintained, they are removed from the GitHub repository, but the last version pushed is still available in Docker Hub. -* [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python2.7.dockerfile) +* `python3.6` +* `python3.6-alpine3.8` +* `python2.7` + +The last date tags for deprecated Python versions are: + +* `python3.6-2022-11-25` +* `python3.6-alpine3.8-2022-11-25` +* `python2.7-2022-11-25` --- diff --git a/docker-images/python2.7.dockerfile b/docker-images/python2.7.dockerfile deleted file mode 100644 index 16840f6..0000000 --- a/docker-images/python2.7.dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM tiangolo/meinheld-gunicorn:python2.7 - -LABEL maintainer="Sebastian Ramirez " - -# Install requirements -# Newer versions don't support Python 2.7 (Python 2.7 reached end of life long ago) -# So for this tag just install whatever is available for Python 2.7, don't use -# Dependabot's updated requirements -RUN pip install --no-cache-dir flask - -COPY ./app /app diff --git a/docker-images/python3.6-alpine3.8.dockerfile b/docker-images/python3.6-alpine3.8.dockerfile deleted file mode 100644 index aaeee7e..0000000 --- a/docker-images/python3.6-alpine3.8.dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM tiangolo/meinheld-gunicorn:python3.6-alpine3.8 - -LABEL maintainer="Sebastian Ramirez " - -COPY requirements.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt - -COPY ./app /app diff --git a/docker-images/python3.6.dockerfile b/docker-images/python3.6.dockerfile deleted file mode 100644 index c8a27cd..0000000 --- a/docker-images/python3.6.dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM tiangolo/meinheld-gunicorn:python3.6 - -LABEL maintainer="Sebastian Ramirez " - -COPY requirements.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt - -COPY ./app /app diff --git a/pyproject.toml b/pyproject.toml index a0ecb51..413fbfe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = ["Sebastián Ramírez "] license = "MIT" [tool.poetry.dependencies] -python = "^3.6" +python = "^3.7" docker = "^5.0.3" pytest = "^7.0.1" diff --git a/scripts/process_all.py b/scripts/process_all.py index 1d4ead3..13b8755 100644 --- a/scripts/process_all.py +++ b/scripts/process_all.py @@ -7,11 +7,9 @@ {"NAME": "python3.9", "PYTHON_VERSION": "3.9"}, {"NAME": "python3.8", "PYTHON_VERSION": "3.8"}, {"NAME": "python3.7", "PYTHON_VERSION": "3.7"}, - {"NAME": "python3.6", "PYTHON_VERSION": "3.6"}, {"NAME": "python3.9-alpine3.13", "PYTHON_VERSION": "3.9"}, {"NAME": "python3.8-alpine3.11", "PYTHON_VERSION": "3.8"}, {"NAME": "python3.7-alpine3.8", "PYTHON_VERSION": "3.7"}, - {"NAME": "python3.6-alpine3.8", "PYTHON_VERSION": "3.6"}, ] start_with = os.environ.get("START_WITH")