Skip to content

Commit

Permalink
Allow url dependencies in multiple constraints dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sdispater committed May 31, 2020
1 parent f98842c commit 009ef6b
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 0 deletions.
3 changes: 3 additions & 0 deletions poetry/core/json/schemas/poetry-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
},
{
"$ref": "#/definitions/path-dependency"
},
{
"$ref": "#/definitions/url-dependency"
}
]
}
Expand Down
Empty file added tests/json/__init__.py
Empty file.
44 changes: 44 additions & 0 deletions tests/json/test_poetry_schema.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import pytest

from poetry.core.json import validate_object


@pytest.fixture
def base_object():
return {
"name": "myapp",
"version": "1.0.0",
"description": "Some description.",
"dependencies": {"python": "^3.6"},
"dev-dependencies": {},
}


@pytest.fixture
def multi_url_object():
return {
"name": "myapp",
"version": "1.0.0",
"description": "Some description.",
"dependencies": {
"python": [
{
"url": "https://download.pytorch.org/whl/cpu/torch-1.4.0%2Bcpu-cp37-cp37m-linux_x86_64.whl",
"platform": "linux",
},
{"path": "../foo", "platform": "darwin"},
]
},
"dev-dependencies": {},
}


def test_path_dependencies(base_object):
base_object["dependencies"].update({"foo": {"path": "../foo"}})
base_object["dev-dependencies"].update({"foo": {"path": "../foo"}})

assert len(validate_object(base_object, "poetry-schema")) == 0


def test_multi_url_dependencies(multi_url_object):
assert len(validate_object(multi_url_object, "poetry-schema")) == 0

0 comments on commit 009ef6b

Please sign in to comment.