Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #2070

Merged
merged 22 commits into from
Feb 21, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5c30345
Fix Github actions cache issues (#1908)
sdispater Jan 17, 2020
3a2739e
Fix case of `-f` flag
brandonaut Jan 18, 2020
3d61e2a
Make it clearer what options to pass to `--format`
brandonaut Jan 18, 2020
22f06e5
Merge pull request #1914 from brandonaut/fix-build-doc
finswimmer Jan 18, 2020
a0c9357
fix (masonry.api): `get_requires_for_build_wheel` must return additio…
finswimmer Jan 20, 2020
380e09b
Lazy Keyring intialization for PasswordManager (#1892)
k4nar Jan 20, 2020
954d160
Fix Github Actions cache issues (#1928)
sdispater Jan 21, 2020
2df0d2c
Avoid nested quantifiers with overlapping character space on git url …
finswimmer Jan 22, 2020
930515b
fix: correct parsing of wheel version with regex. (#1932)
edwardgeorge Jan 22, 2020
4897a70
Fix errors when using the --help option (#1910)
sdispater Jan 31, 2020
4687ef8
Fix how repository credentials are retrieved from env vars (#1909)
sdispater Jan 31, 2020
d331535
Fix downloading packages from Simplepypi (#1851)
leftys Jan 31, 2020
7974d0f
Upgrade dependencies for the 1.0.3 release (#1965)
sdispater Jan 31, 2020
ed44342
Bump version to 1.0.3 (#1966)
sdispater Jan 31, 2020
7348893
Fix non-compliant Git URL matching
amarshall Feb 11, 2020
7d5934e
Merge pull request #2018 from amarshall/fix-git-url-pattern
finswimmer Feb 11, 2020
8fa1915
Update README.md "Updating Poetry"
afs2015 Feb 14, 2020
b3b07cb
Merge pull request #2040 from afs2015/patch-1
finswimmer Feb 15, 2020
03db001
init: change dev dependency prompt
and800 Oct 30, 2019
12db4a5
Merge pull request #1519 from and800/master
finswimmer Feb 17, 2020
960dc06
Fix CI issues (#2069)
sdispater Feb 21, 2020
333419a
Merge branch 'master' into merge-master-into-develop
sdispater Feb 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix (masonry.api): get_requires_for_build_wheel must return additio…
…nal list of requirements for building a package, not listed in `pyproject.toml` and not dependencies for the package itself (#1875)

fix (tests): adopted tests
  • Loading branch information
finswimmer authored and sdispater committed Jan 20, 2020
commit a0c9357213f18fd03082829373db0241fdbae0f5
11 changes: 6 additions & 5 deletions poetry/masonry/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@

def get_requires_for_build_wheel(config_settings=None):
"""
Returns a list of requirements for building, as strings
"""
poetry = Factory().create_poetry(Path("."))
Returns an additional list of requirements for building, as PEP508 strings,
above and beyond those specified in the pyproject.toml file.

main, _ = SdistBuilder.convert_dependencies(poetry.package, poetry.package.requires)
This implementation is optional. At the moment it only returns an empty list, which would be the same as if
not define. So this is just for completeness for future implementation.
"""

return main
return []


# For now, we require all dependencies to build either a wheel or an sdist.
Expand Down
8 changes: 4 additions & 4 deletions tests/masonry/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ def cwd(directory):


def test_get_requires_for_build_wheel():
expected = ["cleo>=0.6.0,<0.7.0", "cachy[msgpack]>=0.2.0,<0.3.0"]
expected = []
with cwd(os.path.join(fixtures, "complete")):
api.get_requires_for_build_wheel() == expected
assert api.get_requires_for_build_wheel() == expected


def test_get_requires_for_build_sdist():
expected = ["cleo>=0.6.0,<0.7.0", "cachy[msgpack]>=0.2.0,<0.3.0"]
expected = []
with cwd(os.path.join(fixtures, "complete")):
api.get_requires_for_build_sdist() == expected
assert api.get_requires_for_build_sdist() == expected


def test_build_wheel():
Expand Down