From 2665f96d850c38eb6eacd061ed3d265d216cd4ee Mon Sep 17 00:00:00 2001 From: nerdvegas Date: Tue, 21 Sep 2021 10:08:14 +1000 Subject: [PATCH] copy dist-info to python subdur in rez-pip fixes #892 --- src/rez/pip.py | 5 +++-- src/rez/utils/_version.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rez/pip.py b/src/rez/pip.py index b0c85814e..30decba1a 100644 --- a/src/rez/pip.py +++ b/src/rez/pip.py @@ -494,10 +494,11 @@ def get_mapping(rel_src): topdir = rel_src.split(os.sep)[0] # Special case - dist-info files. These are all in a '-.dist-info' - # dir. We keep this dir and place it in the root dir of the rez package. + # dir. We keep this dir and place it in the root 'python' dir of the rez package. # if topdir.endswith(".dist-info"): - return (rel_src, rel_src) + rel_dest = os.path.join("python", rel_src) + return (rel_src, rel_dest) # Remapping of other installed files according to manifest if topdir == os.pardir: diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py index 6d555a08e..82e96731e 100644 --- a/src/rez/utils/_version.py +++ b/src/rez/utils/_version.py @@ -1,7 +1,7 @@ # Update this value to version up Rez. Do not place anything else in this file. -_rez_version = "2.94.0" +_rez_version = "2.95.0" # Copyright 2013-2016 Allan Johns.