Unverified Commit c2332f2d authored by Sébastien Eustace's avatar Sébastien Eustace
Browse files

Fix wheel entry points being written on a single line

parent cde1d16d
Loading
Loading
Loading
Loading
+7 −0
Changes for CHANGELOG.md: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Change Log

## [Unreleased]

### Fixed

- Fixed wheel entry points being written on a single line.


## [0.6.0] - 2018-03-16

### Added
+1 −3
Changes for poetry/masonry/builders/wheel.py: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ from poetry.__version__ import __version__
from poetry.semver.constraints import Constraint
from poetry.semver.constraints import MultiConstraint
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.tags import get_abbr_impl
from ..utils.tags import get_abi_tag
@@ -279,7 +277,7 @@ class WheelBuilder(Builder):
        for group_name in sorted(entry_points):
            fp.write('[{}]\n'.format(group_name))
            for ep in sorted(entry_points[group_name]):
                fp.write(ep.replace(' ', ''))
                fp.write(ep.replace(' ', '') + '\n')

            fp.write('\n')

+1 −0
Changes for tests/masonry/builders/fixtures/complete/pyproject.toml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,3 +27,4 @@ pytest = "~3.4"

[tool.poetry.scripts]
my-script = "my_package:main"
my-2nd-script = "my_package:main2"
+27 −0
Changes for tests/masonry/builders/test_complete.py: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -53,4 +53,31 @@ def test_wheel_c_extension():
        if name.startswith('extended/extended') and name.endswith('.so'):
            has_compiled_extension = True

    zip.close()

    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()
+4 −1
Changes for tests/masonry/builders/test_sdist.py: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -88,7 +88,10 @@ def test_make_setup():
        'cleo (>=0.6.0.0,<0.7.0.0)'
    ]
    assert ns['entry_points'] == {
        'console_scripts': ['my-script = my_package:main']
        'console_scripts': [
            'my-script = my_package:main',
            'my-2nd-script = my_package:main2',
        ]
    }