Commit ae0f900b by Sébastien Eustace

Remove some change made in the previous commit

parent d2ed7d59
...@@ -122,8 +122,7 @@ class SdistBuilder(Builder): ...@@ -122,8 +122,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:
for p in _packages: package_dir[""] = os.path.relpath(pkg_dir, str(self._path))
package_dir[p] = os.path.relpath(pkg_dir, str(self._path))
packages += [p for p in _packages if p not in packages] packages += [p for p in _packages if p not in packages]
package_data.update(_package_data) package_data.update(_package_data)
...@@ -131,7 +130,7 @@ class SdistBuilder(Builder): ...@@ -131,7 +130,7 @@ class SdistBuilder(Builder):
module = include.elements[0].relative_to(include.base).stem module = include.elements[0].relative_to(include.base).stem
if include.source is not None: if include.source is not None:
package_dir[module] = str(include.base.relative_to(self._path)) package_dir[""] = str(include.base.relative_to(self._path))
if module not in modules: if module not in modules:
modules.append(module) modules.append(module)
......
...@@ -445,7 +445,7 @@ def test_package_with_include(mocker): ...@@ -445,7 +445,7 @@ def test_package_with_include(mocker):
setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)] setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
ns = {} ns = {}
exec(compile(setup_ast, filename="setup.py", mode="exec"), ns) exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
assert ns["package_dir"] == {"src_package": "src"} assert ns["package_dir"] == {"": "src"}
assert ns["packages"] == [ assert ns["packages"] == [
"extra_dir", "extra_dir",
"extra_dir.sub_pkg", "extra_dir.sub_pkg",
......
...@@ -315,7 +315,7 @@ def test_with_src_module_file(): ...@@ -315,7 +315,7 @@ def test_with_src_module_file():
setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)] setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
ns = {} ns = {}
exec(compile(setup_ast, filename="setup.py", mode="exec"), ns) exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
assert ns["package_dir"] == {"module_src": "src"} assert ns["package_dir"] == {"": "src"}
assert ns["modules"] == ["module_src"] assert ns["modules"] == ["module_src"]
builder.build() builder.build()
...@@ -340,7 +340,7 @@ def test_with_src_module_dir(): ...@@ -340,7 +340,7 @@ def test_with_src_module_dir():
setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)] setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
ns = {} ns = {}
exec(compile(setup_ast, filename="setup.py", mode="exec"), ns) exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
assert ns["package_dir"] == {"package_src": "src"} assert ns["package_dir"] == {"": "src"}
assert ns["packages"] == ["package_src"] assert ns["packages"] == ["package_src"]
builder.build() builder.build()
......
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