Merge branch 'master' into develop

.appveyor.yml

@@ -15,7 +15,7 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "python -m pip install --disable-pip-version-check --user --upgrade pip"
+  - "python -m pip install --disable-pip-version-check --user pip==18.1"
 
   # Installing Poetry
   - "python get-poetry.py --preview -y"

.travis.yml

@@ -11,7 +11,7 @@ cache:
     - "$HOME/.cache/pre-commit"
 
 install:
-  - pip install pip -U
+  - pip install pip==18.1
   - python get-poetry.py --preview -y
   - source $HOME/.poetry/env
   - poetry install -v

CHANGELOG.md

@@ -24,6 +24,30 @@
 - Fixed transitive extra dependencies being removed when updating a specific dependency.
 
 
+## [0.12.15] - 2019-05-03
+
+### Fixed
+
+- Fixed an `AttributeError` in the editable builder.
+- Fixed resolution of packages with only Python 3 wheels and sdist when resolving for legacy repositories.
+- Fixed non-sha256 hashes retrieval for legacy repositories.
+
+
+## [0.12.14] - 2019-04-26
+
+### Fixed
+
+- Fixed root package installation for pure Python packages.
+
+
+## [0.12.13] - 2019-04-26
+
+### Fixed
+
+- Fixed root package installation with `pip>=19.0`.
+- Fixed packages not being removed after using the `remove` command.
+
+
 ## [0.12.12] - 2019-04-11
 
 ### Fixed
@@ -661,7 +685,10 @@ Initial release
 
 
 
-[Unreleased]: https://github.com/sdispater/poetry/compare/0.12.12...develop
+[Unreleased]: https://github.com/sdispater/poetry/compare/0.12.15...develop
+[0.12.15]: https://github.com/sdispater/poetry/releases/tag/0.12.15
+[0.12.14]: https://github.com/sdispater/poetry/releases/tag/0.12.14
+[0.12.13]: https://github.com/sdispater/poetry/releases/tag/0.12.13
 [0.12.12]: https://github.com/sdispater/poetry/releases/tag/0.12.12
 [0.12.11]: https://github.com/sdispater/poetry/releases/tag/0.12.11
 [0.12.10]: https://github.com/sdispater/poetry/releases/tag/0.12.10

poetry.lock

@@ -287,7 +287,7 @@ description = "File identification library for Python"
 name = "identify"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.4.1"
+version = "1.4.2"
 
 [package.extras]
 license = ["editdistance"]
@@ -456,12 +456,11 @@ description = "Rolling backport of unittest.mock for all Pythons"
 marker = "python_version < \"3.0\""
 name = "mock"
 optional = false
-python-versions = "*"
-version = "2.0.0"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "3.0.3"
 
 [package.dependencies]
-pbr = ">=0.11"
-six = ">=1.9"
+six = "*"
 
 [package.dependencies.funcsigs]
 python = "<3.3"
@@ -545,15 +544,6 @@ python = "<3.5"
 version = "*"
 
 [[package]]
-category = "dev"
-description = "Python Build Reasonableness"
-marker = "python_version < \"3.0\""
-name = "pbr"
-optional = false
-python-versions = "*"
-version = "5.1.3"
-
-[[package]]
 category = "main"
 description = "Query metadatdata from sdists / bdists / installed packages."
 name = "pkginfo"
@@ -581,7 +571,7 @@ description = "A framework for managing and maintaining multi-language pre-commi
 name = "pre-commit"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.15.1"
+version = "1.15.2"
 
 [package.dependencies]
 "aspy.yaml" = "*"
@@ -673,7 +663,7 @@ description = "pytest: simple powerful testing with Python"
 name = "pytest"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "4.4.0"
+version = "4.4.1"
 
 [package.dependencies]
 atomicwrites = ">=1.0"
@@ -709,7 +699,7 @@ description = "Pytest plugin for measuring coverage."
 name = "pytest-cov"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.6.1"
+version = "2.7.1"
 
 [package.dependencies]
 coverage = ">=4.4"
@@ -721,7 +711,7 @@ description = "Thin-wrapper around the mock package for easier use with py.test"
 name = "pytest-mock"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.10.3"
+version = "1.10.4"
 
 [package.dependencies]
 pytest = ">=2.7"
@@ -860,7 +850,7 @@ description = "tox is a generic virtualenv management and test command line tool
 name = "tox"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "3.8.6"
+version = "3.9.0"
 
 [package.dependencies]
 filelock = ">=3.0.0,<4"
@@ -890,7 +880,7 @@ description = "HTTP library with thread-safe connection pooling, file post, and
 name = "urllib3"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
-version = "1.24.1"
+version = "1.24.3"
 
 [package.extras]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
@@ -902,7 +892,7 @@ description = "Virtual Python Environment builder"
 name = "virtualenv"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "16.4.3"
+version = "16.5.0"
 
 [package.extras]
 docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"]
@@ -922,7 +912,7 @@ description = "Pathlib-compatible object wrapper for zip files"
 name = "zipp"
 optional = false
 python-versions = ">=2.7"
-version = "0.3.3"
+version = "0.4.0"
 
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
@@ -958,7 +948,7 @@ futures = ["9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", "
 glob2 = ["f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"]
 html5lib = ["20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3", "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"]
 httpretty = ["01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc"]
-identify = ["244e7864ef59f0c7c50c6db73f58564151d91345cd9b76ed793458953578cadd", "8ff062f90ad4b09cfe79b5dfb7a12e40f19d2e68a5c9598a49be45f16aba7171"]
+identify = ["443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9", "bd7f15fe07112b713fb68fbdde3a34dd774d9062128f2c398104889f783f989d"]
 idna = ["c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"]
 importlib-metadata = ["46fc60c34b6ed7547e2a723fc8de6dc2e3a1173f8423246b3ce497f064e9c3de", "bc136180e961875af88b1ab85b4009f4f1278f8396a60526c0009f503a1a96ca"]
 importlib-resources = ["6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b", "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"]
@@ -969,17 +959,16 @@ lockfile = ["6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799",
 markdown = ["c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa", "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c", "fc4a6f69a656b8d858d7503bda633f4dd63c2d70cf80abdc6eafa64c4ae8c250", "fe463ff51e679377e3624984c829022e2cfb3be5518726b06f608a07a3aad680"]
 markupsafe = ["00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", "09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", "62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"]
 mkdocs = ["17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939", "8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"]
-mock = ["5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", "b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba"]
+mock = ["5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", "d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a"]
 more-itertools = ["38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4", "c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc", "fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9", "2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7", "c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a"]
 msgpack = ["26cb40116111c232bc235ce131cc3b4e76549088cb154e66a2eb8ff6fcc907ec", "300fd3f2c664a3bf473d6a952f843b4a71454f4c592ed7e74a36b205c1782d28", "3129c355342853007de4a2a86e75eab966119733eb15748819b6554363d4e85c", "31f6d645ee5a97d59d3263fab9e6be76f69fa131cddc0d94091a3c8aca30d67a", "3ce7ef7ee2546c3903ca8c934d09250531b80c6127e6478781ae31ed835aac4c", "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972", "62bd8e43d204580308d477a157b78d3fee2fb4c15d32578108dc5d89866036c8", "70cebfe08fb32f83051971264466eadf183101e335d8107b80002e632f425511", "72cb7cf85e9df5251abd7b61a1af1fb77add15f40fa7328e924a9c0b6bc7a533", "7c55649965c35eb32c499d17dadfb8f53358b961582846e1bc06f66b9bccc556", "86b963a5de11336ec26bc4f839327673c9796b398b9f1fe6bb6150c2a5d00f0f", "8c73c9bcdfb526247c5e4f4f6cf581b9bb86b388df82cfcaffde0a6e7bf3b43a", "8e68c76c6aff4849089962d25346d6784d38e02baa23ffa513cf46be72e3a540", "97ac6b867a8f63debc64f44efdc695109d541ecc361ee2dce2c8884ab37360a1", "9d4f546af72aa001241d74a79caec278bcc007b4bcde4099994732e98012c858", "a28e69fe5468c9f5251c7e4e7232286d71b7dfadc74f312006ebe984433e9746", "fd509d4aa95404ce8d86b4e32ce66d5d706fd6646c205e1c2a715d87078683a2"]
 nodeenv = ["ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"]
 packaging = ["0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", "9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3"]
 pastel = ["3108af417ec0fa6d0a620e676ec4f02c839ca13e10611586e5d2174b46aa0bc3", "d1fee8079534f99f1805a044fef946d23eee6d6a7cd34292c30e6c16be9a80b9"]
 pathlib2 = ["25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742", "5887121d7f7df3603bca2f710e7219f3eca0eb69e0b7cc6e0a022e155ac931a7"]
-pbr = ["8257baf496c8522437e8a6cfe0f15e00aedc6c0e0e7c9d55eeeeab31e0853843", "8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"]
 pkginfo = ["7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb", "a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"]
 pluggy = ["19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f", "84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746"]
-pre-commit = ["75a9110eae00d009c913616c0fc8a6a02e7716c4a29a14cac9b313d2c7338ab0", "f882c65316eb5b705fe4613e92a7c91055c1800102e4d291cfd18912ec9cf90e"]
+pre-commit = ["2576a2776098f3902ef9540a84696e8e06bf18a337ce43a6a889e7fa5d26c4c5", "82f2f2d657d7f9280de9f927ae56886d60b9ef7f3714eae92d12713cd9cb9e11"]
 py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"]
 pygments = ["5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", "e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"]
 pygments-github-lexers = ["0f9e9fb607d351c127a1e55e82a6eb491ed1fc11b2d6a0444ba217dc6d1f82c1", "aaca57e77cd6fcfce8d6ee97a998962eebf7fbb810519a8ebde427c62823e133"]
@@ -987,9 +976,9 @@ pylev = ["063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3", "1d
 pymdown-extensions = ["25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df", "6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd"]
 pyparsing = ["1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", "9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03"]
 pyrsistent = ["3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"]
-pytest = ["13c5e9fb5ec5179995e9357111ab089af350d788cbc944c628f3cde72285809b", "f21d2f1fb8200830dcbb5d8ec466a9c9120e20d8b53c7585d180125cce1d297a"]
-pytest-cov = ["0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33", "230ef817450ab0699c6cc3c9c8f7a829c34674456f2ed8df1fe1d39780f7c87f"]
-pytest-mock = ["330bfa1a71c9b6e84e2976f01d70d8a174f755e7f9dc5b22f4b7335992e1e98b", "cea3983a1ebc88bf7c0fa1ed8c84e67b898bf71a320a49605bcb74f31e6cfd6a"]
+pytest = ["3773f4c235918987d51daf1db66d51c99fac654c81d6f2f709a046ab446d5e5d", "b7802283b70ca24d7119b32915efa7c409982f59913c1a6c0640aacf118b95f5"]
+pytest-cov = ["2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6", "e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"]
+pytest-mock = ["43ce4e9dd5074993e7c021bb1c22cbb5363e612a2b5a76bc6d956775b10758b7", "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568"]
 pytest-sugar = ["26cf8289fe10880cbbc130bd77398c4e6a8b936d8393b116a5c16121d95ab283", "fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab"]
 pyyaml = ["1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", "460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", "5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", "7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", "9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", "a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", "aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", "c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", "c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", "e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"]
 requests = ["502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"]
@@ -1001,9 +990,9 @@ termcolor = ["1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"]
 toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
 tomlkit = ["d6506342615d051bc961f70bfcfa3d29b6616cc08a3ddfd4bc24196f16fd4ec2", "f077456d35303e7908cc233b340f71e0bec96f63429997f38ca9272b7d64029e"]
 tornado = ["0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d", "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409", "732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f", "8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f", "8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5", "d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb", "e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"]
-tox = ["69620e19de33a6b7ee8aeda5478791b3618ff58f0b869dbd0319fb71aa903deb", "e5cdb1653aa27b3e46b5c390de6b6d51d31afcfdbd9d1222d82d76b82ad03d9b"]
+tox = ["1b166b93d2ce66bb7b253ba944d2be89e0c9d432d49eeb9da2988b4902a4684e", "665cbdd99f5c196dd80d1d8db8c8cf5d48b1ae1f778bccd1bdf14d5aaf4ca0fc"]
 typing = ["4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d", "57dcf675a99b74d64dacf6fba08fb17cf7e3d5fdff53d4a30ea2a5e7e52543d4", "a4c8473ce11a65999c8f59cb093e70686b6c84c98df58c1dae9b3b196089858a"]
-urllib3 = ["61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", "de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"]
-virtualenv = ["6aebaf4dd2568a0094225ebbca987859e369e3e5c22dc7d52e5406d504890417", "984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39"]
+urllib3 = ["2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", "a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"]
+virtualenv = ["15ee248d13e4001a691d9583948ad3947bcb8a289775102e4c4aa98a8b7a6d73", "bfc98bb9b42a3029ee41b96dc00a34c2f254cbf7716bec824477b2c82741a5c4"]
 webencodings = ["a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"]
-zipp = ["55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478", "682b3e1c62b7026afe24eadf6be579fb45fec54c07ea218bded8092af07a68c4"]
+zipp = ["139391b239594fd8b91d856bc530fbd2df0892b17dd8d98a91f018715954185f", "8047e4575ce8d700370a3301bbfc972896a5845eb62dd535da395b86be95dfad"]

poetry/console/commands/install.py

@@ -29,10 +29,8 @@ exist it will look for <comment>pyproject.toml</> and do the same.
     def handle(self):
         from clikit.io import NullIO
         from poetry.installation import Installer
-        from poetry.masonry.builders import SdistBuilder
+        from poetry.masonry.builders import EditableBuilder
         from poetry.masonry.utils.module import ModuleOrPackageNotFound
-        from poetry.utils._compat import decode
-        from poetry.utils.env import NullEnv
 
         installer = Installer(
             self.io, self.env, self.poetry.package, self.poetry.locker, self.poetry.pool
@@ -60,7 +58,7 @@ exist it will look for <comment>pyproject.toml</> and do the same.
             return 0
 
         try:
-            builder = SdistBuilder(self.poetry, NullEnv(), NullIO())
+            builder = EditableBuilder(self.poetry, self._env, NullIO())
         except ModuleOrPackageNotFound:
             # This is likely due to the fact that the project is an application
             # not following the structure expected by Poetry
@@ -76,17 +74,6 @@ exist it will look for <comment>pyproject.toml</> and do the same.
         if self.option("dry-run"):
             return 0
 
-        setup = self.poetry.file.parent / "setup.py"
-        has_setup = setup.exists()
+        builder.build()
 
-        if has_setup:
-            self.line("<warning>A setup.py file already exists. Using it.</warning>")
-        else:
-            with setup.open("w", encoding="utf-8") as f:
-                f.write(decode(builder.build_setup()))
-
-        try:
-            self.env.run("pip", "install", "-e", str(setup.parent), "--no-deps")
-        finally:
-            if not has_setup:
-                os.remove(str(setup))
+        return 0

poetry/installation/installer.py

@@ -211,7 +211,6 @@ class Installer:
 
             # Making a new repo containing the packages
             # newly resolved and the ones from the current lock file
-            locked_repository = self._locker.locked_repository(True)
             repo = Repository()
             for package in local_repo.packages + locked_repository.packages:
                 if not repo.has_package(package):

poetry/installation/pip_installer.py

@@ -116,7 +116,11 @@ class PipInstaller(BaseInstaller):
         if formatted and not package.source_type:
             req = "{}=={}".format(package.name, package.version)
             for h in package.hashes:
-                req += " --hash sha256:{}".format(h)
+                hash_type = "sha256"
+                if ":" in h:
+                    hash_type, h = h.split(":")
+
+                req += " --hash {}:{}".format(hash_type, h)
 
             req += "\n"
 

poetry/masonry/builders/__init__.py

 from .complete import CompleteBuilder
+from .editable import EditableBuilder
 from .sdist import SdistBuilder
 from .wheel import WheelBuilder

poetry/masonry/builders/builder.py

@@ -37,7 +37,7 @@ class Builder(object):
 
     AVAILABLE_PYTHONS = {"2", "2.7", "3", "3.4", "3.5", "3.6", "3.7"}
 
-    def __init__(self, poetry, env, io):
+    def __init__(self, poetry, env, io):  # type: (Poetry, Env, IO) -> None
         self._poetry = poetry
         self._env = env
         self._io = io

poetry/masonry/builders/editable.py

+from __future__ import unicode_literals
+
+import os
+import shutil
+
+from collections import defaultdict
+
+from poetry.semver.version import Version
+from poetry.utils._compat import decode
+
+from .builder import Builder
+from .sdist import SdistBuilder
+
+
+class EditableBuilder(Builder):
+    def build(self):
+        return self._setup_build()
+
+    def _setup_build(self):
+        builder = SdistBuilder(self._poetry, self._env, self._io)
+        setup = self._path / "setup.py"
+        has_setup = setup.exists()
+
+        if has_setup:
+            self._io.write_line(
+                "<warning>A setup.py file already exists. Using it.</warning>"
+            )
+        else:
+            with setup.open("w", encoding="utf-8") as f:
+                f.write(decode(builder.build_setup()))
+
+        try:
+            if self._env.pip_version < Version(19, 0):
+                self._env.run("python", "-m", "pip", "install", "-e", str(self._path))
+            else:
+                # Temporarily rename pyproject.toml
+                shutil.move(
+                    str(self._poetry.file), str(self._poetry.file.with_suffix(".tmp"))
+                )
+                try:
+                    self._env.run(
+                        "python", "-m", "pip", "install", "-e", str(self._path)
+                    )
+                finally:
+                    shutil.move(
+                        str(self._poetry.file.with_suffix(".tmp")),
+                        str(self._poetry.file),
+                    )
+        finally:
+            if not has_setup:
+                os.remove(str(setup))
+
+    def _build_egg_info(self):
+        egg_info = self._path / "{}.egg-info".format(
+            self._package.name.replace("-", "_")
+        )
+        egg_info.mkdir(exist_ok=True)
+
+        with egg_info.joinpath("PKG-INFO").open("w", encoding="utf-8") as f:
+            f.write(decode(self.get_metadata_content()))
+
+        with egg_info.joinpath("entry_points.txt").open("w", encoding="utf-8") as f:
+            entry_points = self.convert_entry_points()
+
+            for group_name in sorted(entry_points):
+                f.write("[{}]\n".format(group_name))
+                for ep in sorted(entry_points[group_name]):
+                    f.write(ep.replace(" ", "") + "\n")
+
+                f.write("\n")
+
+        with egg_info.joinpath("requires.txt").open("w", encoding="utf-8") as f:
+            f.write(self._generate_requires())
+
+    def _build_egg_link(self):
+        egg_link = self._env.site_packages / "{}.egg-link".format(self._package.name)
+        with egg_link.open("w", encoding="utf-8") as f:
+            f.write(str(self._poetry.file.parent.resolve()) + "\n")
+            f.write(".")
+
+    def _add_easy_install_entry(self):
+        easy_install_pth = self._env.site_packages / "easy-install.pth"
+        path = str(self._poetry.file.parent.resolve())
+        content = ""
+        if easy_install_pth.exists():
+            with easy_install_pth.open(encoding="utf-8") as f:
+                content = f.read()
+
+        if path in content:
+            return
+
+        content += "{}\n".format(path)
+
+        with easy_install_pth.open("w", encoding="utf-8") as f:
+            f.write(content)
+
+    def _generate_requires(self):
+        extras = defaultdict(list)
+
+        requires = ""
+        for dep in sorted(self._package.requires, key=lambda d: d.name):
+            marker = dep.marker
+            if marker.is_any():
+                requires += "{}\n".format(dep.base_pep_508_name)
+                continue
+
+            extras[str(marker)].append(dep.base_pep_508_name)
+
+        if extras:
+            requires += "\n"
+
+            for marker, deps in sorted(extras.items()):
+                requires += "[:{}]\n".format(marker)
+
+                for dep in deps:
+                    requires += dep + "\n"
+
+                requires += "\n"
+
+        return requires

poetry/repositories/legacy_repository.py

@@ -341,6 +341,7 @@ class LegacyRepository(PyPiRepository):
             "requires_dist": [],
             "requires_python": None,
             "digests": [],
+            "_cache_version": str(self.CACHE_VERSION),
         }
 
         links = list(page.links_for_version(Version.parse(version)))
@@ -363,6 +364,8 @@ class LegacyRepository(PyPiRepository):
             hash = link.hash
             if link.hash_name == "sha256":
                 hashes.append(hash)
+            else:
+                hashes.append(link.hash_name + ":" + hash)
 
         data["digests"] = hashes
 

poetry/repositories/pypi_repository.py

@@ -420,6 +420,13 @@ class PyPiRepository(Repository):
             if info:
                 return info
 
+            # Prefer non platform specific wheels
+            if universal_python3_wheel:
+                return self._get_info_from_wheel(universal_python3_wheel)
+
+            if universal_python2_wheel:
+                return self._get_info_from_wheel(universal_python2_wheel)
+
             if platform_specific_wheels and "sdist" not in urls:
                 # Pick the first wheel available and hope for the best
                 return self._get_info_from_wheel(platform_specific_wheels[0])

poetry/utils/env.py

@@ -24,7 +24,7 @@ from clikit.api.io import IO
 
 from poetry.config import Config
 from poetry.locations import CACHE_DIR
-from poetry.semver import Version
+from poetry.semver.version import Version
 from poetry.utils._compat import Path
 from poetry.utils._compat import decode
 from poetry.utils._compat import encode
@@ -516,7 +516,13 @@ class EnvManager(object):
         try:
             from venv import EnvBuilder
 
-            builder = EnvBuilder(with_pip=True)
+            # use the same defaults as python -m venv
+            if os.name == "nt":
+                use_symlinks = False
+            else:
+                use_symlinks = True
+
+            builder = EnvBuilder(with_pip=True, symlinks=use_symlinks)
             build = builder.create
         except ImportError:
             # We fallback on virtualenv for Python 2.7
@@ -563,6 +569,7 @@ class Env(object):
         self._base = base or path
 
         self._marker_env = None
+        self._pip_version = None
 
     @property
     def path(self):  # type: () -> Path
@@ -609,6 +616,25 @@ class Env(object):
     def os(self):  # type: () -> str
         return os.name
 
+    @property
+    def pip_version(self):
+        if self._pip_version is None:
+            self._pip_version = self.get_pip_version()
+
+        return self._pip_version
+
+    @property
+    def site_packages(self):  # type: () -> Path
+        if self._is_windows:
+            return self._path / "Lib" / "site-packages"
+
+        return (
+            self._path
+            / "lib"
+            / "python{}.{}".format(*self.version_info[:2])
+            / "site-packages"
+        )
+
     @classmethod
     def get_base_prefix(cls):  # type: () -> Path
         if hasattr(sys, "real_prefix"):
@@ -631,6 +657,9 @@ class Env(object):
     def config_var(self, var):  # type: (str) -> Any
         raise NotImplementedError()
 
+    def get_pip_version(self):  # type: () -> Version
+        raise NotImplementedError()
+
     def is_valid_for_marker(self, marker):  # type: (BaseMarker) -> bool
         return marker.validate(self.marker_env)
 
@@ -750,6 +779,11 @@ class SystemEnv(Env):
 
             return
 
+    def get_pip_version(self):  # type: () -> Version
+        from pip import __version__
+
+        return Version.parse(__version__)
+
     def is_venv(self):  # type: () -> bool
         return self._path != self._base
 
@@ -800,6 +834,14 @@ class VirtualEnv(Env):
 
         return value
 
+    def get_pip_version(self):  # type: () -> Version
+        output = self.run("python", "-m", "pip", "--version").strip()
+        m = re.match("pip (.+?)(?: from .+)?$", output)
+        if not m:
+            return Version.parse("0.0")
+
+        return Version.parse(m.group(1))
+
     def is_venv(self):  # type: () -> bool
         return True
 
@@ -878,6 +920,7 @@ class MockEnv(NullEnv):
         platform="darwin",
         os_name="posix",
         is_venv=False,
+        pip_version="19.1",
         **kwargs
     ):
         super(MockEnv, self).__init__(**kwargs)
@@ -887,6 +930,7 @@ class MockEnv(NullEnv):
         self._platform = platform
         self._os_name = os_name
         self._is_venv = is_venv
+        self._pip_version = Version.parse(pip_version)
 
     @property
     def version_info(self):  # type: () -> Tuple[int]
@@ -904,5 +948,9 @@ class MockEnv(NullEnv):
     def os(self):  # type: () -> str
         return self._os_name
 
+    @property
+    def pip_version(self):
+        return self._pip_version
+
     def is_venv(self):  # type: () -> bool
         return self._is_venv

tests/installation/test_installer.py

@@ -76,6 +76,7 @@ class Locker(BaseLocker):
             package["python-versions"] = python_versions
 
         self._written_data = data
+        self._lock_data = data
 
 
 @pytest.fixture()
@@ -331,7 +332,7 @@ def test_run_whitelist_add(installer, locker, repo, package):
     assert locker.written_data == expected
 
 
-def test_run_whitelist_remove(installer, locker, repo, package):
+def test_run_whitelist_remove(installer, locker, repo, package, installed):
     locker.locked(True)
     locker.mock_lock_data(
         {
@@ -367,6 +368,7 @@ def test_run_whitelist_remove(installer, locker, repo, package):
     package_b = get_package("B", "1.1")
     repo.add_package(package_a)
     repo.add_package(package_b)
+    installed.add_package(package_b)
 
     package.add_dependency("A", "~1.0")
 
@@ -377,6 +379,9 @@ def test_run_whitelist_remove(installer, locker, repo, package):
     expected = fixture("remove")
 
     assert locker.written_data == expected
+    assert len(installer.installer.installs) == 1
+    assert len(installer.installer.updates) == 0
+    assert len(installer.installer.removals) == 1
 
 
 def test_add_with_sub_dependencies(installer, locker, repo, package):

tests/installation/test_pip_installer.py

+from poetry.installation.pip_installer import PipInstaller
+from poetry.io.null_io import NullIO
+from poetry.packages.package import Package
+from poetry.utils.env import NullEnv
+
+
+def test_requirement():
+    installer = PipInstaller(NullEnv(), NullIO())
+
+    package = Package("ipython", "7.5.0")
+    package.hashes = [
+        "md5:dbdc53e3918f28fa335a173432402a00",
+        "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+    ]
+
+    result = installer.requirement(package, formatted=True)
+    expected = (
+        "ipython==7.5.0 "
+        "--hash md5:dbdc53e3918f28fa335a173432402a00 "
+        "--hash sha256:e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26"
+        "\n"
+    )
+
+    assert expected == result

tests/masonry/builders/test_editable.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from clikit.io import NullIO
+
+from poetry.masonry.builders import EditableBuilder
+from poetry.poetry import Poetry
+from poetry.utils._compat import Path
+from poetry.utils.env import MockEnv
+
+fixtures_dir = Path(__file__).parent / "fixtures"
+
+
+def test_build_should_delegate_to_pip_for_non_pure_python_packages(tmp_dir, mocker):
+    move = mocker.patch("shutil.move")
+    tmp_dir = Path(tmp_dir)
+    env = MockEnv(path=tmp_dir, pip_version="18.1", execute=False)
+    env.site_packages.mkdir(parents=True)
+    module_path = fixtures_dir / "extended"
+
+    builder = EditableBuilder(Poetry.create(module_path), env, NullIO())
+    builder.build()
+
+    expected = [["python", "-m", "pip", "install", "-e", str(module_path)]]
+    assert expected == env.executed
+
+    assert 0 == move.call_count
+
+
+def test_build_should_temporarily_remove_the_pyproject_file(tmp_dir, mocker):
+    move = mocker.patch("shutil.move")
+    tmp_dir = Path(tmp_dir)
+    env = MockEnv(path=tmp_dir, pip_version="19.1", execute=False)
+    env.site_packages.mkdir(parents=True)
+    module_path = fixtures_dir / "extended"
+
+    builder = EditableBuilder(Poetry.create(module_path), env, NullIO())
+    builder.build()
+
+    expected = [["python", "-m", "pip", "install", "-e", str(module_path)]]
+    assert expected == env.executed
+
+    assert 2 == move.call_count
+
+    expected_calls = [
+        mocker.call(
+            str(module_path / "pyproject.toml"), str(module_path / "pyproject.tmp")
+        ),
+        mocker.call(
+            str(module_path / "pyproject.tmp"), str(module_path / "pyproject.toml")
+        ),
+    ]
+
+    assert expected_calls == move.call_args_list

tests/repositories/fixtures/legacy/ipython.html

@@ -8,6 +8,8 @@
     <a href="https://files.pythonhosted.org/packages/52/19/aadde98d6bde1667d0bf431fb2d22451f880aaa373e0a241c7e7cb5815a0/ipython-5.7.0-py2-none-any.whl#sha256=707d1bbfc81e41e39ead1012af931bec6f80357b87e520af352e539cf5961dc0">ipython-5.7.0-py2-none-any.whl</a><br/>
     <a href="https://files.pythonhosted.org/packages/c7/b6/03e0b5b0972e6161d16c4cec8d41a20372bd0634f8cb4cc0c984b8a91db6/ipython-5.7.0-py3-none-any.whl#sha256=fc0464e68f9c65cd8c453474b4175432cc29ecb6c83775baedf6dbfcee9275ab">ipython-5.7.0-py3-none-any.whl</a><br/>
     <a href="https://files.pythonhosted.org/packages/3c/fd/559fead731a29eaa55cc235c8029807b2520976a937c30e9ee603f3bb566/ipython-5.7.0.tar.gz#sha256=8db43a7fb7619037c98626613ff08d03dda9d5d12c84814a4504c78c0da8323c">ipython-5.7.0.tar.gz</a><br/>
+    <a href="https://files.pythonhosted.org/packages/a9/2e/41dce4ed129057e05a555a7f9629aa2d5f81fdcd4d16568bc24b75a1d2c9/ipython-7.5.0-py3-none-any.whl#md5=dbdc53e3918f28fa335a173432402a00" data-requires-python="&gt;=3.5">ipython-7.5.0-py3-none-any.whl</a><br/>
+    <a href="https://files.pythonhosted.org/packages/75/74/9b0ef91c8e356c907bb12297000951acb804583b54eeaddc342c5bad4d96/ipython-7.5.0.tar.gz#sha256=e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26" data-requires-python="&gt;=3.5">ipython-7.5.0.tar.gz</a><br/>
   </body>
 </html>
 <!--SERIAL 4837213-->

tests/repositories/test_legacy_repository.py

@@ -205,3 +205,43 @@ def test_get_package_from_both_py2_and_py3_specific_wheels():
         package.requires[4].marker
     )
     assert 'sys_platform != "win32"' == str(package.requires[5].marker)
+
+
+def test_get_package_with_dist_and_universal_py3_wheel():
+    repo = MockRepository()
+
+    package = repo.package("ipython", "7.5.0")
+
+    assert "ipython" == package.name
+    assert "7.5.0" == package.version.text
+    assert ">=3.5" == package.python_versions
+
+    expected = [
+        Dependency("appnope", "*"),
+        Dependency("backcall", "*"),
+        Dependency("colorama", "*"),
+        Dependency("decorator", "*"),
+        Dependency("jedi", ">=0.10"),
+        Dependency("pexpect", "*"),
+        Dependency("pickleshare", "*"),
+        Dependency("prompt-toolkit", ">=2.0.0,<2.1.0"),
+        Dependency("pygments", "*"),
+        Dependency("setuptools", ">=18.5"),
+        Dependency("traitlets", ">=4.2"),
+        Dependency("typing", "*"),
+        Dependency("win-unicode-console", ">=0.5"),
+    ]
+    assert expected == sorted(package.requires, key=lambda dep: dep.name)
+
+
+def test_get_package_retrieves_non_sha256_hashes():
+    repo = MockRepository()
+
+    package = repo.package("ipython", "7.5.0")
+
+    expected = [
+        "md5:dbdc53e3918f28fa335a173432402a00",
+        "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+    ]
+
+    assert expected == package.hashes

tests/utils/test_env.py

@@ -450,3 +450,22 @@ def test_remove_also_deactivates(tmp_dir, config, mocker):
 
     envs = envs_file.read()
     assert venv_name not in envs
+
+
+def test_env_has_symlinks_on_nix(tmp_dir, config):
+    venv_path = Path(tmp_dir)
+
+    EnvManager(config).build_venv(str(venv_path))
+
+    venv = VirtualEnv(venv_path)
+
+    venv_available = False
+    try:
+        from venv import EnvBuilder
+
+        venv_available = True
+    except ImportError:
+        pass
+
+    if os.name != "nt" and venv_available:
+        assert os.path.islink(venv.python)