From c4461fb6296dbd398eda6aa27f5944f162e6621f Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Tue, 7 May 2024 08:37:35 +0200 Subject: [PATCH 1/4] update tag to 502d1a6 --- python3.11/CHANGELOG.md | 9 +++++++++ python3.11/Dockerfile | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/python3.11/CHANGELOG.md b/python3.11/CHANGELOG.md index e1f94dc..47dd6a1 100644 --- a/python3.11/CHANGELOG.md +++ b/python3.11/CHANGELOG.md @@ -9,6 +9,7 @@ - [pypi ibm-watson](https://pypi.org/project/ibm-watson/) - [github ibm-watson](https://github.com/watson-developer-cloud/python-sdk) +<<<<<<< Updated upstream # 1.4.1 Changes: - Bump to newer parent image (vulnerability fixes) 1389697 @@ -39,6 +40,14 @@ Changes: Python version: - [3.11.6](https://www.python.org/downloads/release/python-3116/) +======= +## 1.3.0 +Changes: + - Bump to newer parent image (vulnerability fixes) 502d1a6 + +Python version: + - [3.11.9](https://www.python.org/downloads/release/python-3119/) +>>>>>>> Stashed changes Python packages: - The file [requirements.txt](requirements.txt) lists the packages we guarantee to be included in this runtime.
diff --git a/python3.11/Dockerfile b/python3.11/Dockerfile index 2b7993a..9d1ba3d 100644 --- a/python3.11/Dockerfile +++ b/python3.11/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< Updated upstream FROM openwhisk/action-python-v3.11:1389697 +======= +FROM openwhisk/action-python-v3.11:502d1a6 +>>>>>>> Stashed changes COPY requirements.txt requirements.txt From 25828796ba79b1c1ecb9ec2640fdc91239bee999 Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Tue, 7 May 2024 11:24:35 +0200 Subject: [PATCH 2/4] fix merge --- python3.11/CHANGELOG.md | 21 ++++++++++++--------- python3.11/Dockerfile | 4 ---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/python3.11/CHANGELOG.md b/python3.11/CHANGELOG.md index 47dd6a1..23e64f8 100644 --- a/python3.11/CHANGELOG.md +++ b/python3.11/CHANGELOG.md @@ -9,7 +9,18 @@ - [pypi ibm-watson](https://pypi.org/project/ibm-watson/) - [github ibm-watson](https://github.com/watson-developer-cloud/python-sdk) -<<<<<<< Updated upstream +## 1.3.0 +Changes: + - Bump to newer parent image (vulnerability fixes) 502d1a6 + +Python version: + - [3.11.9](https://www.python.org/downloads/release/python-3119/) + +Python packages: + - The file [requirements.txt](requirements.txt) lists the packages we guarantee to be included in this runtime.
+ Ensure that you only use packages mentioned there.
+ Other python packages might be part of this runtime, but only due to indirect dependencies of the above listed packages. These indirectly included packages are candidates to be removed at any time in case they are not required by the referring package anymore. + # 1.4.1 Changes: - Bump to newer parent image (vulnerability fixes) 1389697 @@ -40,14 +51,6 @@ Changes: Python version: - [3.11.6](https://www.python.org/downloads/release/python-3116/) -======= -## 1.3.0 -Changes: - - Bump to newer parent image (vulnerability fixes) 502d1a6 - -Python version: - - [3.11.9](https://www.python.org/downloads/release/python-3119/) ->>>>>>> Stashed changes Python packages: - The file [requirements.txt](requirements.txt) lists the packages we guarantee to be included in this runtime.
diff --git a/python3.11/Dockerfile b/python3.11/Dockerfile index 9d1ba3d..6925d24 100644 --- a/python3.11/Dockerfile +++ b/python3.11/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< Updated upstream -FROM openwhisk/action-python-v3.11:1389697 -======= FROM openwhisk/action-python-v3.11:502d1a6 ->>>>>>> Stashed changes COPY requirements.txt requirements.txt From 47280b5fa90d21c37fd1cddb17dffb4ef57fd61b Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Tue, 7 May 2024 11:25:06 +0200 Subject: [PATCH 3/4] version --- python3.11/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3.11/CHANGELOG.md b/python3.11/CHANGELOG.md index 23e64f8..0e0febc 100644 --- a/python3.11/CHANGELOG.md +++ b/python3.11/CHANGELOG.md @@ -9,7 +9,7 @@ - [pypi ibm-watson](https://pypi.org/project/ibm-watson/) - [github ibm-watson](https://github.com/watson-developer-cloud/python-sdk) -## 1.3.0 +## 1.4.2 Changes: - Bump to newer parent image (vulnerability fixes) 502d1a6 From 92f6b03c64cda0f4ca7d0b8b8ab53f372a8966d4 Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Mon, 13 May 2024 11:56:56 +0200 Subject: [PATCH 4/4] update tag to f707898 --- python3.11/CHANGELOG.md | 2 +- python3.11/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python3.11/CHANGELOG.md b/python3.11/CHANGELOG.md index 0e0febc..97f48ac 100644 --- a/python3.11/CHANGELOG.md +++ b/python3.11/CHANGELOG.md @@ -11,7 +11,7 @@ ## 1.4.2 Changes: - - Bump to newer parent image (vulnerability fixes) 502d1a6 + - Bump to newer parent image (vulnerability fixes) f707898 Python version: - [3.11.9](https://www.python.org/downloads/release/python-3119/) diff --git a/python3.11/Dockerfile b/python3.11/Dockerfile index 6925d24..4b0713c 100644 --- a/python3.11/Dockerfile +++ b/python3.11/Dockerfile @@ -1,4 +1,4 @@ -FROM openwhisk/action-python-v3.11:502d1a6 +FROM openwhisk/action-python-v3.11:f707898 COPY requirements.txt requirements.txt