From 9dda0664a256df9552f6e8b60eabb5b697b0d2f6 Mon Sep 17 00:00:00 2001 From: Ryan Bottriell Date: Fri, 6 Apr 2018 09:45:14 -0700 Subject: [PATCH] Update dist_info location generation to account for build tags --- rules_python/whl.py | 13 ++++++++++++- tools/piptool.par | Bin 5400682 -> 5401002 bytes tools/whltool.par | Bin 1385301 -> 1385941 bytes 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rules_python/whl.py b/rules_python/whl.py index 3e9d4f88fa..9073aed8c1 100644 --- a/rules_python/whl.py +++ b/rules_python/whl.py @@ -42,6 +42,13 @@ def version(self): parts = self.basename().split('-') return parts[1] + def build_tag(self): + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention + parts = self.basename().split('-') + if len(parts) == 5: + return None + return parts[2] + def repository_name(self): # Returns the canonical name of the Bazel repository for this package. canonical = 'pypi__{}_{}'.format(self.distribution(), self.version()) @@ -52,7 +59,11 @@ def _dist_info(self): # Return the name of the dist-info directory within the .whl file. # e.g. google_cloud-0.27.0-py2.py3-none-any.whl -> # google_cloud-0.27.0.dist-info - return '{}-{}.dist-info'.format(self.distribution(), self.version()) + build_tag = self.build_tag() + name = '{}-{}'.format(self.distribution(), self.version()) + if build_tag is not None: + name += '-' + build_tag + return '{}.dist-info'.format(name) def metadata(self): # Extract the structured data from metadata.json in the WHL's dist-info diff --git a/tools/piptool.par b/tools/piptool.par index b105fd48efa2406426575c740f952bf4b4b79c06..f52e42a6bfe0cc61d04e0551f7d56df96877f420 100755 GIT binary patch delta 7760 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 delta 1819 zcmaJ>ZA?>F7;evn-uAY)y_EYZR9cD@l&(d-RjTL`go&a!{0z&iX7eL}AR9{-VTHKO zWtzE&;oTI+ToyBDfDsd?Q8VH)lg%$!h7O5Y)WuDwOt)q8$JXt=oJ&^rVCvn9j(ERb_;au z7c-7`S>`*Gl&x3S-vNU`Lzcl{=ol!4`U)X)yh-o6s!fOH) z3b!U$NgNcg_d;kiLoxQoK@l4);lvwHX?ag_5-k=bJQxptHde|NqY37)>lK`QQpqHY zm}t4FmMg(|q63FTP;g6xDYl8z7!222^pXgZakEGzC+=}2I!`p?NII32|2(PW)P2pc zjm>xAb~9`e+PX~qC>9Iku;-k3*a9VHSIJB`3>mP{Kx5 zadK>}sA$Q4c6WoO)U*0#zS6x)l=+^Y%hcpAT<%;=8@cV|uY5`K`LNzjH*sSRCx`Y@ z+=#aP;0RZGj*51i?I302S+4AI(5?2IHRH|0at1aGm@W8#)`iD6EnHflQ0ohC;dTW! z8t-7E0@>L2gJec2fnxf{w1pr_6`~CrG-X3!rxWrqXO7i`-)O>t5DA-&jrey0O_6H} z8H=XS%lr0eYwXLbs3Kc7{^g|Ud1vSN@5@VQcC3tLrb%u;79xIu}5<4(;cJx?Gk2BqZady>QZDHMM&ii zEzpM-7CUUX$V?GOsvNNqNy~J{NR>nXlvbyJOBkEb`&Ky2*quVr?KQgfVG2ci8+G=S zn{KPNQQ;c}UQi_Lag+T-X9Aa^ZpdZPPR#YdT2^yFduF2hkkf`|J@iIi|3FhR(4GqU zto{@y*=L+0Hl$L_)^&+IW*`-23q_lB=J7(Ya4t^eYY{K4?VF{u8yb6@tFurVv9ThZ z_03iF%RiAu$DAJ0^*_kPPM2ZMbXdo}dPRF?;+}R@!qd~K$@e2%k<;lLee?z=wds^x z_pzQ3>{029O{bO*_v(`0NB?MB`Y`N+HOzETduHNyJ_rfvS5zDrQUO~9aN*JnunW~B eJseWqnq