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

Jump to bottom

Update pypy #6539

Merged
merged 1 commit into from
Aug 26, 2019
Merged

Update pypy #6539

merged 1 commit into from
Aug 26, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 26, 2019

Changes:

@docker-library-bot
Update pypy
830154d 
Changes:

- docker-library/pypy@dda0d4f: Update to 7.0.0, pip 19.2.3
- docker-library/pypy@8bc1138: Update to 7.1.1, pip 19.2.3
@tianon
Copy link
Member Author

tianon commented Aug 26, 2019

Diff: 
diff --git a/pypy_2-jessie/Dockerfile b/pypy_2-jessie/Dockerfile
index 25077ba..a79f32c 100644
--- a/pypy_2-jessie/Dockerfile
+++ b/pypy_2-jessie/Dockerfile
@@ -50,10 +50,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	\
diff --git a/pypy_2-slim-jessie/Dockerfile b/pypy_2-slim-jessie/Dockerfile
index d5be5b5..15299f0 100644
--- a/pypy_2-slim-jessie/Dockerfile
+++ b/pypy_2-slim-jessie/Dockerfile
@@ -77,10 +77,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	apt-get update; \
diff --git a/pypy_3.6-slim-stretch/Dockerfile b/pypy_3.6-slim-stretch/Dockerfile
index d6f3399..bc44769 100644
--- a/pypy_3.6-slim-stretch/Dockerfile
+++ b/pypy_3.6-slim-stretch/Dockerfile
@@ -79,10 +79,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	apt-get update; \
diff --git a/pypy_3.6-stretch/Dockerfile b/pypy_3.6-stretch/Dockerfile
index 215517d..84e9e28 100644
--- a/pypy_3.6-stretch/Dockerfile
+++ b/pypy_3.6-stretch/Dockerfile
@@ -52,10 +52,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	\
diff --git a/pypy_slim-stretch/Dockerfile b/pypy_slim-stretch/Dockerfile
index b4bb9fb..a882416 100644
--- a/pypy_slim-stretch/Dockerfile
+++ b/pypy_slim-stretch/Dockerfile
@@ -81,10 +81,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	apt-get update; \
diff --git a/pypy_stretch/Dockerfile b/pypy_stretch/Dockerfile
index 5e4dfe8..09177fe 100644
--- a/pypy_stretch/Dockerfile
+++ b/pypy_stretch/Dockerfile
@@ -54,10 +54,10 @@ RUN set -ex; \
 		\) -exec rm -rf '{}' +
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 19.2.2
+ENV PYTHON_PIP_VERSION 19.2.3
 # https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/0c72a3b4ece313faccb446a96c84770ccedc5ec5/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 201edc6df416da971e64cc94992d2dd24bc328bada7444f0c4f2031ae31e8dad
+ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py
+ENV PYTHON_GET_PIP_SHA256 57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe
 
 RUN set -ex; \
 	\

@tianon
Copy link
Member Author

tianon commented Aug 26, 2019

Build test of #6539; 830154d; amd64 (pypy):

$ bashbrew build pypy:2.7-7.1.1
Building bashbrew/cache:84270f369779ca1d1cbb9b890640b03d238c6a54dc6eda113eff45a40392dae2 (pypy:2.7-7.1.1)
Tagging pypy:2.7-7.1.1
Tagging pypy:2.7-7.1
Tagging pypy:2.7-7
Tagging pypy:2.7
Tagging pypy:2-7.1.1
Tagging pypy:2-7.1
Tagging pypy:2-7
Tagging pypy:2
Tagging pypy:2.7-7.1.1-jessie
Tagging pypy:2.7-7.1-jessie
Tagging pypy:2.7-7-jessie
Tagging pypy:2.7-jessie
Tagging pypy:2-7.1.1-jessie
Tagging pypy:2-7.1-jessie
Tagging pypy:2-7-jessie
Tagging pypy:2-jessie

$ test/run.sh pypy:2.7-7.1.1
testing pypy:2.7-7.1.1
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed


$ bashbrew build pypy:2.7-7.1.1-slim
Building bashbrew/cache:f9b7b2b3ef33f284ecd9d35747f9f3f14466a774f7ccc9a45564656b449a0d85 (pypy:2.7-7.1.1-slim)
Tagging pypy:2.7-7.1.1-slim
Tagging pypy:2.7-7.1-slim
Tagging pypy:2.7-7-slim
Tagging pypy:2.7-slim
Tagging pypy:2-7.1.1-slim
Tagging pypy:2-7.1-slim
Tagging pypy:2-7-slim
Tagging pypy:2-slim
Tagging pypy:2.7-7.1.1-slim-jessie
Tagging pypy:2.7-7.1-slim-jessie
Tagging pypy:2.7-7-slim-jessie
Tagging pypy:2.7-slim-jessie
Tagging pypy:2-7.1.1-slim-jessie
Tagging pypy:2-7.1-slim-jessie
Tagging pypy:2-7-slim-jessie
Tagging pypy:2-slim-jessie

$ test/run.sh pypy:2.7-7.1.1-slim
testing pypy:2.7-7.1.1-slim
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...DEPRECATION: A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed


$ bashbrew build pypy:3.5-7.0.0
Building bashbrew/cache:b15e51d1330b860cc856a89f6aace03cb90bb0923f4021c9a68b4c50b3667f8d (pypy:3.5-7.0.0)
Tagging pypy:3.5-7.0.0
Tagging pypy:3.5-7.0
Tagging pypy:3.5-7
Tagging pypy:3.5
Tagging pypy:3-7.0.0
Tagging pypy:3-7.0
Tagging pypy:3-7
Tagging pypy:3
Tagging pypy:latest
Tagging pypy:3.5-7.0.0-stretch
Tagging pypy:3.5-7.0-stretch
Tagging pypy:3.5-7-stretch
Tagging pypy:3.5-stretch
Tagging pypy:3-7.0.0-stretch
Tagging pypy:3-7.0-stretch
Tagging pypy:3-7-stretch
Tagging pypy:3-stretch
Tagging pypy:stretch

$ test/run.sh pypy:3.5-7.0.0
testing pypy:3.5-7.0.0
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed


$ bashbrew build pypy:3.5-7.0.0-slim
Building bashbrew/cache:6a5828d46a4429d442d0eedf8cd0464634d6f4b1aeaecfc3c71c8558c1ab0738 (pypy:3.5-7.0.0-slim)
Tagging pypy:3.5-7.0.0-slim
Tagging pypy:3.5-7.0-slim
Tagging pypy:3.5-7-slim
Tagging pypy:3.5-slim
Tagging pypy:3-7.0.0-slim
Tagging pypy:3-7.0-slim
Tagging pypy:3-7-slim
Tagging pypy:3-slim
Tagging pypy:slim
Tagging pypy:3.5-7.0.0-slim-stretch
Tagging pypy:3.5-7.0-slim-stretch
Tagging pypy:3.5-7-slim-stretch
Tagging pypy:3.5-slim-stretch
Tagging pypy:3-7.0.0-slim-stretch
Tagging pypy:3-7.0-slim-stretch
Tagging pypy:3-7-slim-stretch
Tagging pypy:3-slim-stretch
Tagging pypy:slim-stretch

$ test/run.sh pypy:3.5-7.0.0-slim
testing pypy:3.5-7.0.0-slim
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed


$ bashbrew build pypy:3.6-7.1.1
Building bashbrew/cache:72f4868241d246929ce35e90aa7cd9a47332c953c58e274c9ca0b60703418491 (pypy:3.6-7.1.1)
Tagging pypy:3.6-7.1.1
Tagging pypy:3.6-7.1
Tagging pypy:3.6-7
Tagging pypy:3.6
Tagging pypy:3.6-7.1.1-stretch
Tagging pypy:3.6-7.1-stretch
Tagging pypy:3.6-7-stretch
Tagging pypy:3.6-stretch

$ test/run.sh pypy:3.6-7.1.1
testing pypy:3.6-7.1.1
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed


$ bashbrew build pypy:3.6-7.1.1-slim
Building bashbrew/cache:d285aa7739548b26c264c8e4ab3af68e15f0a64cd7188b83ae8fac0b1982a11f (pypy:3.6-7.1.1-slim)
Tagging pypy:3.6-7.1.1-slim
Tagging pypy:3.6-7.1-slim
Tagging pypy:3.6-7-slim
Tagging pypy:3.6-slim
Tagging pypy:3.6-7.1.1-slim-stretch
Tagging pypy:3.6-7.1-slim-stretch
Tagging pypy:3.6-7-slim-stretch
Tagging pypy:3.6-slim-stretch

$ test/run.sh pypy:3.6-7.1.1-slim
testing pypy:3.6-7.1.1-slim
	'utc' [1/9]...passed
	'cve-2014--shellshock' [2/9]...passed
	'no-hard-coded-passwords' [3/9]...passed
	'override-cmd' [4/9]...passed
	'python-hy' [5/9]...passed
	'python-imports' [6/9]...passed
	'python-pip-requests-ssl' [7/9]...passed
	'python-sqlite3' [8/9]...passed
	'python-stack-size' [9/9]...passed

@tianon tianon merged commit 7151de6 into docker-library:master Aug 26, 2019
@tianon tianon deleted the pypy branch August 26, 2019 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/pypy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tianon @docker-library-bot