diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-24 10:26:26 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-24 10:26:26 -0500 |
| commit | f8b57b4a8f204ddace56410ed4a21f2f30880be0 (patch) | |
| tree | fe7f9c0cc7e7f0191cf4ddf7df006096d22c4e7c | |
| parent | ba15c9294488451900766898865c024dad2bf2be (diff) | |
| parent | 3f806c10259bd13a99a02117725ba1ae52c5cf33 (diff) | |
| download | python-setuptools-git-f8b57b4a8f204ddace56410ed4a21f2f30880be0.tar.gz | |
Merge test with fix. Ref #913.
| -rw-r--r-- | CHANGES.rst | 2 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 05a4175a..601aefba 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,8 @@ v34.0.2 * #882: Ensure extras are honored when building the working set. +* #913: Fix issue in develop if package directory has + a trailing slash. v34.0.1 ------- diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 97708ba3..ddfdc662 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -92,7 +92,7 @@ class develop(namespaces.DevelopInstaller, easy_install): setup script resides and ensure that path points to the setup path from $install_dir/$egg_path. """ - path_to_setup = egg_base.replace(os.sep, '/') + path_to_setup = egg_base.replace(os.sep, '/').rstrip('/') if path_to_setup != os.curdir: path_to_setup = '../' * (path_to_setup.count('/') + 1) resolved = normalize_path(os.path.join(install_dir, egg_path, path_to_setup)) |