Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
python-poetry
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
python-poetry
Commits
c291fae8
Unverified
Commit
c291fae8
authored
Apr 10, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix errors when license metadata is not set
parent
c836a02c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
CHANGELOG.md
+1
-0
poetry/masonry/metadata.py
+3
-0
poetry/packages/package.py
+4
-3
poetry/poetry.py
+0
-1
No files found.
CHANGELOG.md
View file @
c291fae8
...
@@ -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
...
...
poetry/masonry/metadata.py
View file @
c291fae8
...
@@ -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
...
...
poetry/packages/package.py
View file @
c291fae8
...
@@ -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
=
licens
e
self
.
_license
=
valu
e
elif
isinstance
(
value
,
License
):
elif
isinstance
(
value
,
License
):
self
.
_license
=
licens
e
self
.
_license
=
valu
e
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
)
...
...
poetry/poetry.py
View file @
c291fae8
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment