diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2020-02-28 19:26:57 -0500 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2020-02-29 07:45:00 -0500 |
| commit | 907f0e8ba91d80c55e0e460fb514b9f4bb03badf (patch) | |
| tree | 405999ee12ee1a1a748e465d561c80eee081166b | |
| parent | 1148bf9118f9df3458cae933601a2638e0684218 (diff) | |
| download | python-coveragepy-git-907f0e8ba91d80c55e0e460fb514b9f4bb03badf.tar.gz | |
Use latest wheel to make Windows 3.8 work. #949
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | ci/manylinux.sh | 10 | ||||
| -rw-r--r-- | requirements/wheel.pip | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 3427c6de..6efe083c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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: @@ -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/* diff --git a/ci/manylinux.sh b/ci/manylinux.sh index 99ea598e..c5dc42a3 100755 --- a/ci/manylinux.sh +++ b/ci/manylinux.sh @@ -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 @@ -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 diff --git a/requirements/wheel.pip b/requirements/wheel.pip index 5dba911f..abef9db4 100644 --- a/requirements/wheel.pip +++ b/requirements/wheel.pip @@ -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 |