Commit 6b03aaf3 by Sébastien Eustace

Fix packaging for Python <3.6

parent 41fce882
...@@ -127,7 +127,7 @@ class SdistBuilder(Builder): ...@@ -127,7 +127,7 @@ class SdistBuilder(Builder):
pkg_dir, _packages, _package_data = self.find_packages(include) pkg_dir, _packages, _package_data = self.find_packages(include)
if pkg_dir is not None: if pkg_dir is not None:
package_dir[""] = str(pkg_dir.relative_to(self._path)) package_dir[""] = os.path.relpath(pkg_dir, str(self._path))
packages += _packages packages += _packages
package_data.update(_package_data) package_data.update(_package_data)
...@@ -229,9 +229,9 @@ class SdistBuilder(Builder): ...@@ -229,9 +229,9 @@ class SdistBuilder(Builder):
""" """
pkgdir = None pkgdir = None
if include.source is not None: if include.source is not None:
pkgdir = include.base pkgdir = str(include.base)
base = include.elements[0].parent base = str(include.elements[0].parent)
pkg_name = include.package pkg_name = include.package
pkg_data = defaultdict(list) pkg_data = defaultdict(list)
......
...@@ -170,7 +170,7 @@ def test_find_packages(): ...@@ -170,7 +170,7 @@ def test_find_packages():
pkg_dir, packages, pkg_data = builder.find_packages(include) pkg_dir, packages, pkg_data = builder.find_packages(include)
assert pkg_dir == base / "src" assert pkg_dir == str(base / "src")
assert packages == ["package_src"] assert packages == ["package_src"]
assert pkg_data == {"": ["*"]} assert pkg_data == {"": ["*"]}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment