Skip to content

Commit

Permalink
Use latest wheel to make Windows 3.8 work. #949
Browse files Browse the repository at this point in the history
  • Loading branch information
nedbat committed Feb 29, 2020
1 parent 1148bf9 commit 907f0e8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
5 changes: 4 additions & 1 deletion CHANGES.rst
Expand Up @@ -24,11 +24,14 @@ want to know what's different in 5.0 since 4.5.x, see :ref:`whatsnew5x`.
Unreleased
----------

- Updated Python 3.9 support to 3.9a3.
- Updated Python 3.9 support to 3.9a4.

- Fixed a bug with missing negative line numbers on PyPy3 7.1 (`issue 943`_).

- Windows 3.8 wheels were incorrectly built, but are now fixed. (`issue 949`_)

.. _issue 943: https://github.com/nedbat/coveragepy/issues/943
.. _issue 949: https://github.com/nedbat/coveragepy/issues/949


.. _changes_503:
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Expand Up @@ -101,9 +101,6 @@ wheel: ## Make the wheels for distribution.
kit_linux: ## Make the Linux wheels.
$(RUN_MANYLINUX_X86) build
$(RUN_MANYLINUX_I686) build
# The manylinux image has Python 3.4, but we don't support it, delete
# those wheels.
rm -f dist/*cp34*

kit_upload: ## Upload the built distributions to PyPI.
twine upload --verbose dist/*
Expand Down
10 changes: 10 additions & 0 deletions ci/manylinux.sh
Expand Up @@ -16,7 +16,13 @@ if [[ $action == "build" ]]; then
# Compile wheels
cd /io
for PYBIN in /opt/python/*/bin; do
if [[ $PYBIN == *cp34* ]]; then
# manylinux docker images have Python 3.4, but we don't use it.
continue
fi
"$PYBIN/pip" install -r requirements/wheel.pip
# pin so auditwheel will work: https://github.com/pypa/auditwheel/issues/102
"$PYBIN/pip" install wheel==0.31.1
"$PYBIN/python" setup.py clean -a
"$PYBIN/python" setup.py bdist_wheel -d ~/wheelhouse/
done
Expand All @@ -30,6 +36,10 @@ if [[ $action == "build" ]]; then
elif [[ $action == "test" ]]; then
# Create "pythonX.Y" links
for PYBIN in /opt/python/*/bin/; do
if [[ $PYBIN == *cp34* ]]; then
# manylinux docker images have Python 3.4, but we don't use it.
continue
fi
PYNAME=$("$PYBIN/python" -c "import sys; print('python{0[0]}.{0[1]}'.format(sys.version_info))")
ln -sf "$PYBIN/$PYNAME" /usr/local/bin/$PYNAME
done
Expand Down
3 changes: 1 addition & 2 deletions requirements/wheel.pip
Expand Up @@ -4,5 +4,4 @@
# Things needed to make wheels for coverage.py

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

0 comments on commit 907f0e8

Please sign in to comment.