Commit c2332f2d by Sébastien Eustace

Fix wheel entry points being written on a single line

parent cde1d16d
# Change Log # Change Log
## [Unreleased]
### Fixed
- Fixed wheel entry points being written on a single line.
## [0.6.0] - 2018-03-16 ## [0.6.0] - 2018-03-16
### Added ### Added
......
...@@ -16,9 +16,7 @@ from poetry.__version__ import __version__ ...@@ -16,9 +16,7 @@ from poetry.__version__ import __version__
from poetry.semver.constraints import Constraint from poetry.semver.constraints import Constraint
from poetry.semver.constraints import MultiConstraint from poetry.semver.constraints import MultiConstraint
from poetry.vcs import get_vcs from poetry.vcs import get_vcs
from poetry.version.helpers import format_python_constraint
from ..metadata import Metadata
from ..utils.helpers import normalize_file_permissions from ..utils.helpers import normalize_file_permissions
from ..utils.tags import get_abbr_impl from ..utils.tags import get_abbr_impl
from ..utils.tags import get_abi_tag from ..utils.tags import get_abi_tag
...@@ -279,7 +277,7 @@ class WheelBuilder(Builder): ...@@ -279,7 +277,7 @@ class WheelBuilder(Builder):
for group_name in sorted(entry_points): for group_name in sorted(entry_points):
fp.write('[{}]\n'.format(group_name)) fp.write('[{}]\n'.format(group_name))
for ep in sorted(entry_points[group_name]): for ep in sorted(entry_points[group_name]):
fp.write(ep.replace(' ', '')) fp.write(ep.replace(' ', '') + '\n')
fp.write('\n') fp.write('\n')
......
...@@ -27,3 +27,4 @@ pytest = "~3.4" ...@@ -27,3 +27,4 @@ pytest = "~3.4"
[tool.poetry.scripts] [tool.poetry.scripts]
my-script = "my_package:main" my-script = "my_package:main"
my-2nd-script = "my_package:main2"
...@@ -53,4 +53,31 @@ def test_wheel_c_extension(): ...@@ -53,4 +53,31 @@ def test_wheel_c_extension():
if name.startswith('extended/extended') and name.endswith('.so'): if name.startswith('extended/extended') and name.endswith('.so'):
has_compiled_extension = True has_compiled_extension = True
zip.close()
assert has_compiled_extension assert has_compiled_extension
def test_complete():
module_path = fixtures_dir / 'complete'
builder = CompleteBuilder(Poetry.create(module_path), NullVenv(True),
NullIO())
builder.build()
whl = module_path / 'dist' / 'my_package-1.2.3-py3-none-any.whl'
assert whl.exists
zip = zipfile.ZipFile(whl)
try:
entry_points = zip.read('my_package-1.2.3.dist-info/entry_points.txt')
print(entry_points.decode())
assert entry_points.decode() == """[console_scripts]
my-2nd-script=my_package:main2
my-script=my_package:main
"""
finally:
zip.close()
...@@ -88,7 +88,10 @@ def test_make_setup(): ...@@ -88,7 +88,10 @@ def test_make_setup():
'cleo (>=0.6.0.0,<0.7.0.0)' 'cleo (>=0.6.0.0,<0.7.0.0)'
] ]
assert ns['entry_points'] == { assert ns['entry_points'] == {
'console_scripts': ['my-script = my_package:main'] 'console_scripts': [
'my-script = my_package:main',
'my-2nd-script = my_package:main2',
]
} }
......
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