Commit c291fae8 by Sébastien Eustace

Fix errors when license metadata is not set

parent c836a02c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
- Fixed `install_requires` and `extras` in generated sdist. - Fixed `install_requires` and `extras` in generated sdist.
- Fixed dependency resolution crash with malformed dependencies. - Fixed dependency resolution crash with malformed dependencies.
- Fixed errors when `license` metadata is not set.
## [0.7.1] - 2018-04-05 ## [0.7.1] - 2018-04-05
......
...@@ -52,7 +52,10 @@ class Metadata: ...@@ -52,7 +52,10 @@ class Metadata:
meta.home_page = package.homepage or package.repository_url meta.home_page = package.homepage or package.repository_url
meta.author = package.author_name meta.author = package.author_name
meta.author_email = package.author_email meta.author_email = package.author_email
if package.license:
meta.license = package.license.id meta.license = package.license.id
meta.classifiers = package.all_classifiers meta.classifiers = package.all_classifiers
# Version 1.2 # Version 1.2
......
...@@ -202,9 +202,9 @@ class Package(object): ...@@ -202,9 +202,9 @@ class Package(object):
@license.setter @license.setter
def license(self, value): def license(self, value):
if value is None: if value is None:
self._license = license self._license = value
elif isinstance(value, License): elif isinstance(value, License):
self._license = license self._license = value
else: else:
self._license = license_by_id(value) self._license = license_by_id(value)
...@@ -230,7 +230,8 @@ class Package(object): ...@@ -230,7 +230,8 @@ class Package(object):
'Programming Language :: Python :: {}'.format(version) 'Programming Language :: Python :: {}'.format(version)
) )
# Automatically set license classifers # Automatically set license classifiers
if self.license:
classifiers.append(self.license.classifier) classifiers.append(self.license.classifier)
classifiers = set(classifiers) classifiers = set(classifiers)
......
...@@ -7,7 +7,6 @@ import jsonschema ...@@ -7,7 +7,6 @@ import jsonschema
from .__version__ import __version__ from .__version__ import __version__
from .config import Config from .config import Config
from .console.commands.config import TEMPLATE
from .exceptions import InvalidProjectFile from .exceptions import InvalidProjectFile
from .packages import Dependency from .packages import Dependency
from .packages import Locker from .packages import Locker
......
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