From 244d9c2efaf55bf07f450df59d305b56c178738a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Wed, 22 Jan 2020 11:20:15 +0200 Subject: [PATCH] Removed specialized PyPy tag generation Fixes #328. --- docs/news.rst | 1 + src/wheel/pep425tags.py | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/news.rst b/docs/news.rst index ef16d4ee..133e4353 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -6,6 +6,7 @@ Release Notes - Dropped Python 3.4 support - Added automatic platform tag detection for macOS binary wheels (PR by Grzegorz Bokota) +- Fixed PyPy tag generation to work with the updated semantics (#328) - Updated project packaging and testing configuration for :pep:`517` - Moved the contents of setup.py to setup.cfg - Fixed duplicate RECORD file when using "wheel pack" on Windows diff --git a/src/wheel/pep425tags.py b/src/wheel/pep425tags.py index c0a8c466..2afb6de1 100644 --- a/src/wheel/pep425tags.py +++ b/src/wheel/pep425tags.py @@ -53,12 +53,7 @@ def get_impl_ver(): def get_impl_version_info(): """Return sys.version_info-like tuple for use in decrementing the minor version.""" - if get_abbr_impl() == 'pp': - # as per https://github.com/pypa/pip/issues/2882 - return (sys.version_info[0], sys.pypy_version_info.major, - sys.pypy_version_info.minor) - else: - return sys.version_info[0], sys.version_info[1] + return sys.version_info[0], sys.version_info[1] def get_flag(var, fallback, expected=True, warn=True):