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

Be more compliant with PEP 440

parent 56d6aee3
Loading
Loading
Loading
Loading
+5 −0
Changes for poetry/console/commands/build.py: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,5 +16,10 @@ class BuildCommand(Command):
        if self.option('format'):
            fmt = self.option('format')

        package = self.poetry.package
        self.line(f'Building <info>{package.pretty_name}</> '
                  f'(<comment>{package.version}</>)')
        self.line('')

        builder = Builder(self.poetry, self.output)
        builder.build(fmt)
+2 −2
Changes for poetry/masonry/builders/sdist.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ class SdistBuilder(Builder):
            target_dir.mkdir(parents=True)

        target = target_dir / f'{self._package.pretty_name}' \
                              f'-{self._package.pretty_version}.tar.gz'
                              f'-{self._package.version}.tar.gz'
        gz = GzipFile(target.as_posix(), mode='wb')
        tar = tarfile.TarFile(target.as_posix(), mode='w', fileobj=gz,
                              format=tarfile.PAX_FORMAT)

        try:
            tar_dir = f'{self._package.pretty_name}-{self._package.pretty_version}'
            tar_dir = f'{self._package.pretty_name}-{self._package.version}'

            files_to_add = self.find_files_to_add()

+1 −1
Changes for poetry/masonry/builders/wheel.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class WheelBuilder(Builder):
        tag = ('py2.' if self.supports_python2() else '') + 'py3-none-any'
        return '{}-{}-{}.whl'.format(
            re.sub("[^\w\d.]+", "_", self._package.pretty_name, flags=re.UNICODE),
            re.sub("[^\w\d.]+", "_", self._package.pretty_version, flags=re.UNICODE),
            re.sub("[^\w\d.]+", "_", self._package.version, flags=re.UNICODE),
            tag)

    def supports_python2(self):
+2 −1
Changes for poetry/packages/package.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from typing import Union

from poetry.semver.helpers import parse_stability
from poetry.semver.version_parser import VersionParser
from poetry.version import parse as parse_version

from .dependency import Dependency
from .vcs_dependency import VCSDependency
@@ -41,7 +42,7 @@ class Package:
        self._pretty_name = name
        self._name = name.lower()

        self._version = version
        self._version = str(parse_version(version))
        self._pretty_version = pretty_version or version

        self.description = ''
+2 −4
Changes for poetry/poetry.py: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ from .packages import Locker
from .packages import Package
from .repositories import Pool
from .repositories.pypi_repository import PyPiRepository
from .semver.helpers import normalize_version
from .utils.toml_file import TomlFile


@@ -71,9 +70,8 @@ class Poetry:

        # Load package
        name = local_config['name']
        pretty_version = local_config['version']
        version = normalize_version(pretty_version)
        package = Package(name, version, pretty_version)
        version = local_config['version']
        package = Package(name, version, version)

        for author in local_config['authors']:
            package.authors.append(author)
Loading