Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for Python 3.5 #175

Merged
merged 1 commit into from
May 7, 2020
Merged

Remove support for Python 3.5 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions scripts/process_all.py
View file
Open in desktop
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