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

Fix errors when license metadata is not set

parent c836a02c

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


- Fixed `install_requires` and `extras` in generated sdist.

- Fixed dependency resolution crash with malformed dependencies.

- Fixed errors when `license` metadata is not set.





## [0.7.1] - 2018-04-05

poetry/masonry/metadata.py

+4 −1
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ class Metadata: 
        meta.home_page = package.homepage or package.repository_url

        meta.author = package.author_name

        meta.author_email = package.author_email



        if package.license:

            meta.license = package.license.id



        meta.classifiers = package.all_classifiers



        # Version 1.2

poetry/packages/package.py

+5 −4
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ class Package(object): 
    @license.setter

    def license(self, value):

        if value is None:

            self._license = license

            self._license = value

        elif isinstance(value, License):

            self._license = license

            self._license = value

        else:

            self._license = license_by_id(value)
@@ -230,7 +230,8 @@ class Package(object): 
                    'Programming Language :: Python :: {}'.format(version)

                )



        # Automatically set license classifers

        # Automatically set license classifiers

        if self.license:

            classifiers.append(self.license.classifier)



        classifiers = set(classifiers)

poetry/poetry.py

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import jsonschema 


from .__version__ import __version__

from .config import Config

from .console.commands.config import TEMPLATE

from .exceptions import InvalidProjectFile

from .packages import Dependency

from .packages import Locker