Skip to content

Commit 13cb12a

Browse files
committed
Use latest wheel to make Windows 3.8 work. #949
1 parent 1148bf9 commit 13cb12a

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ wheel: ## Make the wheels for distribution.
101101
kit_linux: ## Make the Linux wheels.
102102
$(RUN_MANYLINUX_X86) build
103103
$(RUN_MANYLINUX_I686) build
104-
# The manylinux image has Python 3.4, but we don't support it, delete
105-
# those wheels.
106-
rm -f dist/*cp34*
107104

108105
kit_upload: ## Upload the built distributions to PyPI.
109106
twine upload --verbose dist/*

ci/manylinux.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ if [[ $action == "build" ]]; then
1616
# Compile wheels
1717
cd /io
1818
for PYBIN in /opt/python/*/bin; do
19+
if [[ $PYBIN == *cp34* ]]; then
20+
# manylinux docker images have Python 3.4, but we don't use it.
21+
continue
22+
fi
1923
"$PYBIN/pip" install -r requirements/wheel.pip
24+
# pin so auditwheel will work: https://github.com/pypa/auditwheel/issues/102
25+
"$PYBIN/pip" install wheel==0.31.1
2026
"$PYBIN/python" setup.py clean -a
2127
"$PYBIN/python" setup.py bdist_wheel -d ~/wheelhouse/
2228
done
@@ -30,6 +36,10 @@ if [[ $action == "build" ]]; then
3036
elif [[ $action == "test" ]]; then
3137
# Create "pythonX.Y" links
3238
for PYBIN in /opt/python/*/bin/; do
39+
if [[ $PYBIN == *cp34* ]]; then
40+
# manylinux docker images have Python 3.4, but we don't use it.
41+
continue
42+
fi
3343
PYNAME=$("$PYBIN/python" -c "import sys; print('python{0[0]}.{0[1]}'.format(sys.version_info))")
3444
ln -sf "$PYBIN/$PYNAME" /usr/local/bin/$PYNAME
3545
done

requirements/wheel.pip

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44
# Things needed to make wheels for coverage.py
55

66
setuptools==41.4.0
7-
# pin so auditwheel will work: https://github.com/pypa/auditwheel/issues/102
8-
wheel==0.31.1
7+
wheel==0.34.2

0 commit comments

Comments
 (0)