Skip to content

Commit

Permalink
🔥 Remove support for Python 3.5 (#175)
Browse files Browse the repository at this point in the history
  • Loading branch information
tiangolo authored May 7, 2020
1 parent 867b8ee commit e5f11a3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 46 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
python_version: "3.7"
- name: python3.6
python_version: "3.6"
- name: python3.5
python_version: "3.5"
- name: python2.7
python_version: "2.7"
- name: python3.6-alpine3.8
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
python_version: "3.7"
- name: python3.6
python_version: "3.6"
- name: python3.5
python_version: "3.5"
- name: python2.7
python_version: "2.7"
- name: python3.6-alpine3.8
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6.dockerfile)
* [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile)
* [`python3.6-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6-alpine3.7.dockerfile)
* [`python3.5` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.5.dockerfile)
* [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7.dockerfile)
* [`python2.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7-alpine3.8.dockerfile)
* [`python2.7-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7-alpine3.7.dockerfile)
Expand All @@ -21,7 +20,7 @@ It doesn't depend on this image but on uWSGI releases for Alpine.

# uwsgi-nginx-flask

**Docker** image with **uWSGI** and **Nginx** for **Flask** web applications in **Python 3.5** and above, and **Python 2.7** running in a single container. Optionally using Alpine Linux.
**Docker** image with **uWSGI** and **Nginx** for **Flask** web applications in **Python 3.6** and above, and **Python 2.7** running in a single container. Optionally using Alpine Linux.

## Description

Expand Down Expand Up @@ -82,7 +81,7 @@ FROM tiangolo/uwsgi-nginx-flask:python3.7
COPY ./app /app
```

There are several image tags available for Python 3.7, Python 3.6, Python 3.5 and Python 2.7, but for new projects you should use **Python 3.7**.
There are several image tags available for Python 3.6 and above, and Python 2.7, but for new projects you should use the latest version available.

As of now, [everyone](https://www.python.org/dev/peps/pep-0373/) [should be](http://flask.pocoo.org/docs/0.12/python3/#python3-support) [using **Python 3**](https://docs.djangoproject.com/en/1.11/faq/install/#what-python-version-should-i-use-with-django).

Expand Down
35 changes: 0 additions & 35 deletions docker-images/python3.5.dockerfile

This file was deleted.

7 changes: 3 additions & 4 deletions scripts/process_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
{"NAME": "latest", "PYTHON_VERSION": "3.7"},
{"NAME": "python3.7", "PYTHON_VERSION": "3.7"},
{"NAME": "python3.6", "PYTHON_VERSION": "3.6"},
{"NAME": "python3.5", "PYTHON_VERSION": "3.5"},
{"NAME": "python2.7", "PYTHON_VERSION": "2.7"},
{"NAME": "python3.6-alpine3.8", "PYTHON_VERSION": "3.6"},
{"NAME": "python3.6-alpine3.7", "PYTHON_VERSION": "3.6"},
Expand All @@ -18,7 +17,7 @@
build_push = os.environ.get("BUILD_PUSH")


def process_tag(*, env: dict):
def process_tag(*, env: dict) -> None:
use_env = {**os.environ, **env}
script = "scripts/test.sh"
if build_push:
Expand All @@ -28,7 +27,7 @@ def process_tag(*, env: dict):
sys.exit(return_code)


def print_version_envs():
def print_version_envs() -> None:
env_lines = []
for env in environments:
env_vars = []
Expand All @@ -39,7 +38,7 @@ def print_version_envs():
print(line)


def main():
def main() -> None:
start_at = 0
if start_with:
start_at = [
Expand Down

0 comments on commit e5f11a3

Please sign in to comment.