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

Add compatibility with Python 3.4 and 3.5

parent ac73c538

.coveragerc

0 → 100644
+0 −0

Empty file added.

CHANGELOG.md

+5 −0
Changes for CHANGELOG.md: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 


## [Unreleased]



### Added



- Added compatibility with Python 3.4 and 3.5.





### Changed



- Improved dependency resolution to avoid unnecessary operations.

poetry/console/commands/add.py

+9 −4
Changes for poetry/console/commands/add.py: 9 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ If you do not specify a version constraint, poetry will choose a suitable one ba 
        for name in packages:

            for key in poetry_content[section]:

                if key.lower() == name.lower():

                    raise ValueError(f'Package {name} is already present')

                    raise ValueError(

                        'Package {} is already present'.format(name)

                    )



        requirements = self._determine_requirements(packages)

        requirements = self._format_requirements(requirements)
@@ -118,7 +120,8 @@ If you do not specify a version constraint, poetry will choose a suitable one ba 
                requirement['name'] = name



                self.line(

                    f'Using version <info>{version}</> for <info>{name}</>'

                    'Using version <info>{}</> for <info>{}</>'

                    .format(version, name)

                )

            else:

                # check that the specified version/constraint exists
@@ -129,7 +132,9 @@ If you do not specify a version constraint, poetry will choose a suitable one ba 


                requirement['name'] = name



            result.append(f'{requirement["name"]} {requirement["version"]}')

            result.append(

                '{} {}'.format(requirement['name'], requirement['version'])

            )



        return result
@@ -143,7 +148,7 @@ If you do not specify a version constraint, poetry will choose a suitable one ba 
        if not package:

            # TODO: find similar

            raise ValueError(

                f'Could not find a matching version of package {name}'

                'Could not find a matching version of package {}'.format(name)

            )



        return (

poetry/console/commands/build.py

+4 −2
Changes for poetry/console/commands/build.py: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ class BuildCommand(VenvCommand): 
            fmt = self.option('format')



        package = self.poetry.package

        self.line(f'Building <info>{package.pretty_name}</> '

                  f'(<comment>{package.version}</>)')

        self.line(

            'Building <info>{}</> (<comment>{}</>)'

            .format(package.pretty_name, package.version)

        )



        builder = Builder(self.poetry, self.venv, self.output)

        builder.build(fmt)

poetry/console/commands/command.py

+0 −1
Changes for poetry/console/commands/command.py: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
from cleo import Command as BaseCommand

from cleo.inputs import ListInput



from poetry.poetry import Poetry