Skip to content

Update Python interpreter from 3.5.3 to 3.5.4 #142

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

Merged
duggelz merged 1 commit into from
Aug 23, 2017
Merged

Update Python interpreter from 3.5.3 to 3.5.4 #142

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
1 change: 0 additions & 1 deletion python-interpreter-builder/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ RUN apt-get update && apt-get install -yq \
net-tools \
netbase \
python3 \
quilt \
Copy link
Member

@liyanhui1228 liyanhui1228 Aug 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this?

Copy link
Contributor Author

@duggelz duggelz Aug 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the last patch that uses quilt. We'll add it back in if we add another local patch.

Actually, quilt is pretty annoying, in that it has a fatal error if you give it a list of patches that happens to be empty. Otherwise I would have left all the quilt code intact.

sharutils \
time \
tk-dev \
Expand Down
96 changes: 0 additions & 96 deletions python-interpreter-builder/patches/3.5/double-build.diff
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion python-interpreter-builder/patches/3.5/series
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions python-interpreter-builder/scripts/build-python-3.5.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ set -x
# Get the source
mkdir -p /opt/sources
cd /opt/sources
wget --no-verbose https://www.python.org/ftp/python/3.5.3/Python-3.5.3.tgz
wget --no-verbose https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tgz
# SHA-256 generated via `shasum -a 256 [file]`
shasum --check <<EOF
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a Python-3.5.3.tgz
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44 Python-3.5.4.tgz
EOF
tar xzf Python-3.5.3.tgz
tar xzf Python-3.5.4.tgz

# Apply patches
cd Python-3.5.3
QUILT_PATCHES=/patches/3.5 quilt push -a
cd Python-3.5.4

# Explanation of flags:
#
Expand Down Expand Up @@ -147,5 +145,5 @@ find "$PREFIX"/lib/python3.5/test \

# Clean-up sources
cd /opt
rm /opt/sources/Python-3.5.3.tgz
rm -r /opt/sources/Python-3.5.3
rm /opt/sources/Python-3.5.4.tgz
rm -r /opt/sources/Python-3.5.4
2 changes: 1 addition & 1 deletion tests/virtualenv/virtualenv_python35.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ commandTests:

- name: "python version"
command: ["python", "--version"]
expectedOutput: ["Python 3.5.3\n"]
expectedOutput: ["Python 3.5.4\n"]

- name: "pip installation"
command: ["which", "pip"]
Expand Down