Skip to content

Commit a618b9b

Browse files
committed
remove deprecated python:2 kind
Python 2 EOL was more than a year ago; finish the cleanup and remove the python:2 kind from the core repository.
1 parent 5eda221 commit a618b9b

File tree

3 files changed

+1
-65
lines changed

3 files changed

+1
-65
lines changed

ansible/files/runtimes.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,6 @@
7171
}
7272
],
7373
"python": [
74-
{
75-
"kind": "python:2",
76-
"default": false,
77-
"image": {
78-
"prefix": "openwhisk",
79-
"name": "python2action",
80-
"tag": "1.13.0-incubating"
81-
},
82-
"deprecated": true,
83-
"attached": {
84-
"attachmentName": "codefile",
85-
"attachmentType": "text/plain"
86-
}
87-
},
8874
{
8975
"kind": "python:3",
9076
"default": true,

core/controller/src/main/resources/apiv1swagger.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,6 @@
20032003
"php:7.3",
20042004
"php:7.4",
20052005
"php:default",
2006-
"python:2",
20072006
"python:3",
20082007
"python:default",
20092008
"ruby:2.5",

docs/actions-python.md

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ wsk action create helloPython hello.py
4545
```
4646
The CLI automatically infers the type of the action from the source file extension.
4747
For `.py` source files, the action runs using a Python 3.6 runtime.
48-
You can also create an action that runs with Python 2.7 by explicitly specifying the parameter
49-
`--kind python:2`.
5048

5149
Action invocation is the same for Python actions as it is for any other actions:
5250

@@ -83,7 +81,7 @@ wsk action create helloPython --kind python:3 helloPython.zip
8381
Another way of packaging Python dependencies is using a virtual environment (`virtualenv`). This allows you to link additional packages
8482
that may be installed via [`pip`](https://packaging.python.org/installing/) for example.
8583
To ensure compatibility with the OpenWhisk container, package installations inside a virtualenv must be done in the target environment.
86-
So the docker image `openwhisk/python2action` or `openwhisk/python3action` should be used to create a virtualenv directory for your action.
84+
So the docker image `openwhisk/python3action` should be used to create a virtualenv directory for your action.
8785

8886
As with basic zip file support, the name of the source file containing the main entry point must be `__main__.py`. In addition, the virtualenv directory must be named `virtualenv`.
8987
Below is an example scenario for installing dependencies, packaging them in a virtualenv, and creating a compatible OpenWhisk action.
@@ -104,8 +102,6 @@ Below is an example scenario for installing dependencies, packaging them in a vi
104102
wsk action create helloPython --kind python:3 helloPython.zip
105103
```
106104

107-
While the steps above are shown for Python 3.6, you can do the same for Python 2.7 as well.
108-
109105
## Python 3 actions
110106

111107
Python 3 actions are executed using Python 3.6.1. This is the default runtime for Python actions, unless you specify the `--kind` flag when creating or updating an action.
@@ -153,48 +149,3 @@ The following packages are available for use by Python actions, in addition to t
153149
- Werkzeug v0.12
154150
- yarl v0.9.8
155151
- zope.interface v4.3.3
156-
157-
## Python 2 actions
158-
159-
Python 2 actions are executed using Python 2.7.12. To use this runtime, specify the `wsk` CLI parameter `--kind python:2` when creating or updating an action. The following packages are available for use by Python 2 actions, in addition to the Python 2.7 standard library.
160-
161-
- appdirs v1.4.3
162-
- asn1crypto v0.21.1
163-
- attrs v16.3.0
164-
- beautifulsoup4 v4.5.1
165-
- cffi v1.9.1
166-
- click v6.7
167-
- cryptography v1.8.1
168-
- cssselect v1.0.1
169-
- enum34 v1.1.6
170-
- Flask v0.11.1
171-
- gevent v1.1.2
172-
- greenlet v0.4.12
173-
- httplib2 v0.9.2
174-
- idna v2.5
175-
- ipaddress v1.0.18
176-
- itsdangerous v0.24
177-
- Jinja2 v2.9.5
178-
- kafka-python v1.3.1
179-
- lxml v3.6.4
180-
- MarkupSafe v1.0
181-
- packaging v16.8
182-
- parsel v1.1.0
183-
- pyasn1 v0.2.3
184-
- pyasn1-modules v0.0.8
185-
- pycparser v2.17
186-
- PyDispatcher v2.0.5
187-
- pyOpenSSL v16.2.0
188-
- pyparsing v2.2.0
189-
- python-dateutil v2.5.3
190-
- queuelib v1.4.2
191-
- requests v2.11.1
192-
- Scrapy v1.1.2
193-
- service-identity v16.0.0
194-
- simplejson v3.8.2
195-
- six v1.10.0
196-
- Twisted v16.4.0
197-
- virtualenv v15.1.0
198-
- w3lib v1.17.0
199-
- Werkzeug v0.12
200-
- zope.interface v4.3.3

0 commit comments

Comments
 (0)