From 36b2f184a3c6b8a84c0b98e63fa99b593484959e Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Mon, 23 May 2022 22:31:01 +0200 Subject: [PATCH 1/6] update poetry-core to 1.1.0b1 --- poetry.lock | 94 +++++++++++++++++++++++++------------------------- pyproject.toml | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/poetry.lock b/poetry.lock index d98783c894c..3d9e6bb7a84 100644 --- a/poetry.lock +++ b/poetry.lock @@ -110,14 +110,14 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "coverage" -version = "6.3.3" +version = "6.4" description = "Code coverage measurement for Python" category = "dev" optional = false python-versions = ">=3.7" [package.dependencies] -tomli = {version = "*", optional = true, markers = "extra == \"toml\""} +tomli = {version = "*", optional = true, markers = "python_version < \"3.11\" and extra == \"toml\""} [package.extras] toml = ["tomli"] @@ -442,7 +442,7 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "poetry-core" -version = "1.1.0a7" +version = "1.1.0b1" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -828,7 +828,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "35d68e6eba695382502b1b6faab833606823a2e0cadc1b96137059f1e343e1ad" +content-hash = "44e5bfbfd4e959b4d538bbe0cd66ba0ce34459fd625fed6093b3017eae5a90be" [metadata.files] atomicwrites = [ @@ -920,47 +920,47 @@ colorama = [ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, ] crashtest = [ {file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"}, @@ -1141,8 +1141,8 @@ pluggy = [ {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] poetry-core = [ - {file = "poetry-core-1.1.0a7.tar.gz", hash = "sha256:4622ae680842ac9b1b9c3b0e8dc467c2e291d1a5c434b6bd413907a2e5571d92"}, - {file = "poetry_core-1.1.0a7-py3-none-any.whl", hash = "sha256:724e8b5368f270461e622396305d0c2e760ec9d4c14d072e6b944da9384c67de"}, + {file = "poetry-core-1.1.0b1.tar.gz", hash = "sha256:56d979f6deaf65dfb1d8bdeb64c258f721db1dfd3319c6f88f65012f7390bf5e"}, + {file = "poetry_core-1.1.0b1-py3-none-any.whl", hash = "sha256:82c0a2ef753d4ec9d305f005618140116f3c7dbf431f3386b73b42015339eb78"}, ] poetry-plugin-export = [ {file = "poetry-plugin-export-1.0.2.tar.gz", hash = "sha256:4b4edcfa3656c11e5529a8f365f084933402cf7f9306163fdfe44e6735d7cf16"}, diff --git a/pyproject.toml b/pyproject.toml index 1a6839e6db8..38735e89c83 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ generate-setup-file = false [tool.poetry.dependencies] python = "^3.7" -poetry-core = "^1.1.0a7" +poetry-core = "^1.1.0b1" poetry-plugin-export = "^1.0.2" cachecontrol = { version = "^0.12.9", extras = ["filecache"] } cachy = "^0.3.0" From 81795fa86f68f8ef3e6f78d4c9565a96ec3b2ea4 Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Mon, 23 May 2022 22:35:56 +0200 Subject: [PATCH 2/6] chore: remove no longer used type ignores --- src/poetry/console/commands/show.py | 4 ++-- src/poetry/factory.py | 2 +- src/poetry/masonry/builders/editable.py | 2 +- src/poetry/packages/locker.py | 4 ++-- src/poetry/poetry.py | 2 +- src/poetry/puzzle/solver.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/poetry/console/commands/show.py b/src/poetry/console/commands/show.py index 1f70dde6861..23cdd422457 100644 --- a/src/poetry/console/commands/show.py +++ b/src/poetry/console/commands/show.py @@ -393,7 +393,7 @@ def display_package_tree( dependencies = package.requires dependencies = sorted( dependencies, - key=lambda x: x.name, # type: ignore[no-any-return] + key=lambda x: x.name, ) tree_bar = "├" @@ -437,7 +437,7 @@ def _display_tree( dependencies = sorted( dependencies, - key=lambda x: x.name, # type: ignore[no-any-return] + key=lambda x: x.name, ) tree_bar = previous_tree_bar + " ├" total = len(dependencies) diff --git a/src/poetry/factory.py b/src/poetry/factory.py index 3057729641d..c1ee98c1ee0 100644 --- a/src/poetry/factory.py +++ b/src/poetry/factory.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) -class Factory(BaseFactory): # type: ignore[misc] +class Factory(BaseFactory): """ Factory class to create various elements needed by Poetry. """ diff --git a/src/poetry/masonry/builders/editable.py b/src/poetry/masonry/builders/editable.py index 98ecba4ee22..795dafc5651 100644 --- a/src/poetry/masonry/builders/editable.py +++ b/src/poetry/masonry/builders/editable.py @@ -40,7 +40,7 @@ """ -class EditableBuilder(Builder): # type: ignore[misc] +class EditableBuilder(Builder): def __init__(self, poetry: Poetry, env: Env, io: IO) -> None: super().__init__(poetry) diff --git a/src/poetry/packages/locker.py b/src/poetry/packages/locker.py index bcc4821d70e..acf77d0e1b0 100644 --- a/src/poetry/packages/locker.py +++ b/src/poetry/packages/locker.py @@ -309,7 +309,7 @@ def get_project_dependencies( # Put higher versions first so that we prefer them. for packages in packages_by_name.values(): packages.sort( - key=lambda package: package.version, # type: ignore[no-any-return] + key=lambda package: package.version, reverse=True, ) @@ -493,7 +493,7 @@ def _dump_package(self, package: Package) -> dict[str, Any]: dependencies: dict[str, list[Any]] = {} for dependency in sorted( package.requires, - key=lambda d: d.name, # type: ignore[no-any-return] + key=lambda d: d.name, ): if dependency.pretty_name not in dependencies: dependencies[dependency.pretty_name] = [] diff --git a/src/poetry/poetry.py b/src/poetry/poetry.py index 6f571aeeaea..c8f9d1c483f 100644 --- a/src/poetry/poetry.py +++ b/src/poetry/poetry.py @@ -20,7 +20,7 @@ from poetry.repositories.pool import Pool -class Poetry(BasePoetry): # type: ignore[misc] +class Poetry(BasePoetry): VERSION = __version__ diff --git a/src/poetry/puzzle/solver.py b/src/poetry/puzzle/solver.py index 07d2dec9c2e..b0d2515a7b6 100644 --- a/src/poetry/puzzle/solver.py +++ b/src/poetry/puzzle/solver.py @@ -141,7 +141,7 @@ def _solve( ) for dependency_packages in locked.values(): dependency_packages.sort( - key=lambda p: p.package.version, # type: ignore[no-any-return] + key=lambda p: p.package.version, reverse=True, ) From 11cf8cc2c40d5ec4d7fb9bd995fbcb1c81bbd2df Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Mon, 23 May 2022 22:43:05 +0200 Subject: [PATCH 3/6] remove poetry-core<=1.10a7 compatibility code --- src/poetry/mixology/version_solver.py | 9 +-------- src/poetry/puzzle/provider.py | 10 ---------- tests/compat.py | 10 ---------- tests/console/commands/test_add.py | 7 ------- tests/console/commands/test_version.py | 3 --- .../mixology/version_solver/test_dependency_cache.py | 11 ++++------- tests/puzzle/test_solver.py | 6 +----- tests/utils/test_dependency_specification.py | 5 +---- 8 files changed, 7 insertions(+), 54 deletions(-) diff --git a/src/poetry/mixology/version_solver.py b/src/poetry/mixology/version_solver.py index b7c3410b0ad..08e7d7bfe86 100644 --- a/src/poetry/mixology/version_solver.py +++ b/src/poetry/mixology/version_solver.py @@ -19,7 +19,6 @@ from poetry.mixology.set_relation import SetRelation from poetry.mixology.term import Term from poetry.packages import DependencyPackage -from poetry.utils._compat import metadata if TYPE_CHECKING: @@ -47,13 +46,7 @@ def __init__(self, provider: Provider) -> None: list[DependencyPackage], ] = {} - # TODO: re-enable cache when poetry-core upgrade is completed - self.search_for = functools.lru_cache( - maxsize=128 - if metadata.version("poetry-core") # type: ignore[no-untyped-call] - != "1.1.0a7" - else 0 - )(self._search_for) + self.search_for = functools.lru_cache(maxsize=128)(self._search_for) def _search_for(self, dependency: Dependency) -> list[DependencyPackage]: key = ( diff --git a/src/poetry/puzzle/provider.py b/src/poetry/puzzle/provider.py index 3a1589abc14..d2f5f12c130 100644 --- a/src/poetry/puzzle/provider.py +++ b/src/poetry/puzzle/provider.py @@ -236,16 +236,6 @@ def search_for_vcs(self, dependency: VCSDependency) -> list[Package]: Basically, we clone the repository in a temporary directory and get the information we need by checking out the specified reference. """ - # TODO: remove explicit subdirectory check once poetry-core is updated - # we ensure subdirectory match here as workaround until poetry-core is updated - # to >1.1.0a7 - if ( - dependency in self._deferred_cache - and self._deferred_cache[dependency].source_subdirectory - == dependency.source_subdirectory - ): - return [self._deferred_cache[dependency]] - package = self.get_package_from_vcs( dependency.vcs, dependency.source, diff --git a/tests/compat.py b/tests/compat.py index 1e140560366..411fca199d0 100644 --- a/tests/compat.py +++ b/tests/compat.py @@ -10,13 +10,3 @@ from typing import Protocol # nopycln: import except ImportError: from typing_extensions import Protocol # noqa: F401, TC002 - -from poetry.core.semver.helpers import parse_constraint -from poetry.core.semver.version import Version - -from poetry.utils._compat import metadata - - -is_poetry_core_1_1_0a7_compat = not parse_constraint(">1.1.0a7").allows( - Version.parse(metadata.version("poetry-core")) -) diff --git a/tests/console/commands/test_add.py b/tests/console/commands/test_add.py index 586cc47b623..0a318b3e5c6 100644 --- a/tests/console/commands/test_add.py +++ b/tests/console/commands/test_add.py @@ -10,7 +10,6 @@ from poetry.core.semver.version import Version from poetry.repositories.legacy_repository import LegacyRepository -from tests.compat import is_poetry_core_1_1_0a7_compat from tests.helpers import get_dependency from tests.helpers import get_package @@ -993,9 +992,6 @@ def test_add_chooses_prerelease_if_only_prereleases_are_available( • Installing foo (1.2.3b1) """ - if is_poetry_core_1_1_0a7_compat: - expected = expected.replace("^1.2.3b1", "^1.2.3-beta.1") - assert expected in tester.io.fetch_output() @@ -1926,9 +1922,6 @@ def test_add_chooses_prerelease_if_only_prereleases_are_available_old_installer( - Installing foo (1.2.3b1) """ - if is_poetry_core_1_1_0a7_compat: - expected = expected.replace("^1.2.3b1", "^1.2.3-beta.1") - assert expected in old_tester.io.fetch_output() diff --git a/tests/console/commands/test_version.py b/tests/console/commands/test_version.py index 36487a3f38a..d578b7fd918 100644 --- a/tests/console/commands/test_version.py +++ b/tests/console/commands/test_version.py @@ -5,7 +5,6 @@ import pytest from poetry.console.commands.version import VersionCommand -from tests.compat import is_poetry_core_1_1_0a7_compat if TYPE_CHECKING: @@ -53,8 +52,6 @@ def tester(command_tester_factory: CommandTesterFactory) -> CommandTester: def test_increment_version( version: str, rule: str, expected: str, command: VersionCommand ): - if is_poetry_core_1_1_0a7_compat: - expected = expected.replace("a", "-alpha.").replace("b", "-beta.") assert command.increment_version(version, rule).text == expected diff --git a/tests/mixology/version_solver/test_dependency_cache.py b/tests/mixology/version_solver/test_dependency_cache.py index c1645604e28..03f247abca4 100644 --- a/tests/mixology/version_solver/test_dependency_cache.py +++ b/tests/mixology/version_solver/test_dependency_cache.py @@ -4,7 +4,6 @@ from poetry.factory import Factory from poetry.mixology.version_solver import DependencyCache -from tests.compat import is_poetry_core_1_1_0a7_compat from tests.mixology.helpers import add_to_repo @@ -38,9 +37,8 @@ def test_solver_dependency_cache_respects_source_type( packages_pypi = cache.search_for(dependency_pypi) packages_git = cache.search_for(dependency_git) - if not is_poetry_core_1_1_0a7_compat: - assert cache.search_for.cache_info().hits == 2 - assert cache.search_for.cache_info().currsize == 2 + assert cache.search_for.cache_info().hits == 2 + assert cache.search_for.cache_info().currsize == 2 assert len(packages_pypi) == len(packages_git) == 1 assert packages_pypi != packages_git @@ -95,9 +93,8 @@ def test_solver_dependency_cache_respects_subdirectories( packages_one = cache.search_for(dependency_one) packages_one_copy = cache.search_for(dependency_one_copy) - if not is_poetry_core_1_1_0a7_compat: - assert cache.search_for.cache_info().hits == 2 - assert cache.search_for.cache_info().currsize == 2 + assert cache.search_for.cache_info().hits == 2 + assert cache.search_for.cache_info().currsize == 2 assert len(packages_one) == len(packages_one_copy) == 1 diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py index 2ca281be0e6..b9c3a0bff02 100644 --- a/tests/puzzle/test_solver.py +++ b/tests/puzzle/test_solver.py @@ -22,7 +22,6 @@ from poetry.repositories.pool import Pool from poetry.repositories.repository import Repository from poetry.utils.env import MockEnv -from tests.compat import is_poetry_core_1_1_0a7_compat from tests.helpers import get_dependency from tests.helpers import get_package from tests.repositories.test_legacy_repository import ( @@ -1384,10 +1383,7 @@ def test_solver_duplicate_dependencies_different_sources_types_are_preserved( assert len(complete_package.all_requires) == 2 - if is_poetry_core_1_1_0a7_compat: - pypi, git = complete_package.all_requires - else: - git, pypi = complete_package.all_requires + git, pypi = complete_package.all_requires assert isinstance(pypi, Dependency) assert pypi == dependency_pypi diff --git a/tests/utils/test_dependency_specification.py b/tests/utils/test_dependency_specification.py index 9cbd96033fa..4d433256810 100644 --- a/tests/utils/test_dependency_specification.py +++ b/tests/utils/test_dependency_specification.py @@ -8,7 +8,6 @@ from deepdiff import DeepDiff from poetry.utils.dependency_specification import parse_dependency_specification -from tests.compat import is_poetry_core_1_1_0a7_compat if TYPE_CHECKING: @@ -75,9 +74,7 @@ "name": "name", "markers": 'python_version == "2.7"', "url": "http://foo.com", - **( - {} if is_poetry_core_1_1_0a7_compat else {"extras": ["fred", "bar"]} - ), + "extras": ["fred", "bar"], }, ), ( From 6afbb9edb1d252a638391bd9452766d7c866c4bd Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Mon, 23 May 2022 23:08:02 +0200 Subject: [PATCH 4/6] update poetry-plugin-export to 1.0.3 --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3d9e6bb7a84..156ef41d05c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -453,7 +453,7 @@ importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""} [[package]] name = "poetry-plugin-export" -version = "1.0.2" +version = "1.0.3" description = "Poetry plugin to export the dependencies to various formats" category = "main" optional = false @@ -828,7 +828,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "44e5bfbfd4e959b4d538bbe0cd66ba0ce34459fd625fed6093b3017eae5a90be" +content-hash = "ca673335fabdd4d69769a72088b4fa641f2c154f660a90d0ddc0da45a8b67bff" [metadata.files] atomicwrites = [ @@ -1145,8 +1145,8 @@ poetry-core = [ {file = "poetry_core-1.1.0b1-py3-none-any.whl", hash = "sha256:82c0a2ef753d4ec9d305f005618140116f3c7dbf431f3386b73b42015339eb78"}, ] poetry-plugin-export = [ - {file = "poetry-plugin-export-1.0.2.tar.gz", hash = "sha256:4b4edcfa3656c11e5529a8f365f084933402cf7f9306163fdfe44e6735d7cf16"}, - {file = "poetry_plugin_export-1.0.2-py3-none-any.whl", hash = "sha256:f27209ee3c162757bc08a6d0f534f4bdf8d737e966aa07d84e0058c8ab3ed66e"}, + {file = "poetry-plugin-export-1.0.3.tar.gz", hash = "sha256:5411cbbe88c897e89271849b8bd1670bcb5cb9659c2483b85c0bd43944b825ff"}, + {file = "poetry_plugin_export-1.0.3-py3-none-any.whl", hash = "sha256:7ad3cd3763f8efa07c9870e0bbd0cd71a1f52c4c8d76ad785825f3eec850c456"}, ] pre-commit = [ {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"}, diff --git a/pyproject.toml b/pyproject.toml index 38735e89c83..cd44d129a10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ generate-setup-file = false python = "^3.7" poetry-core = "^1.1.0b1" -poetry-plugin-export = "^1.0.2" +poetry-plugin-export = "^1.0.3" cachecontrol = { version = "^0.12.9", extras = ["filecache"] } cachy = "^0.3.0" cleo = "^1.0.0a4" From be67d4df4a2c0ceb7fab4c8cae9b3c158dbf6f5f Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Mon, 23 May 2022 23:22:06 +0200 Subject: [PATCH 5/6] tests: remove deprecated parameter --- tests/console/commands/plugin/test_show.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/console/commands/plugin/test_show.py b/tests/console/commands/plugin/test_show.py index 3c3ff0c5484..5b6a888c24b 100644 --- a/tests/console/commands/plugin/test_show.py +++ b/tests/console/commands/plugin/test_show.py @@ -43,7 +43,7 @@ def plugin_package() -> Package: @pytest.fixture() def plugin_distro(plugin_package: Package) -> Distribution: - return Distribution(plugin_package.name, plugin_package.version.to_string(True)) + return Distribution(plugin_package.name, plugin_package.version.to_string()) @pytest.mark.parametrize("entrypoint_name", ["poetry-plugin", "not-package-name"]) From 98c9ea7082a4d3c3c83c3481ef915a3745e01741 Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Tue, 24 May 2022 00:09:02 +0200 Subject: [PATCH 6/6] tests: workaround tomlkit regression on windows --- tests/console/commands/test_init.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/console/commands/test_init.py b/tests/console/commands/test_init.py index 4805552b2ed..c733bba2dfb 100644 --- a/tests/console/commands/test_init.py +++ b/tests/console/commands/test_init.py @@ -788,6 +788,7 @@ def test_add_package_with_extras_and_whitespace(tester: CommandTester): assert "sqlite" in result[0]["extras"] +@pytest.mark.xfail(sys.platform == "win32", reason="regression in tomlkit") def test_init_existing_pyproject_simple( tester: CommandTester, source_dir: Path, @@ -804,6 +805,7 @@ def test_init_existing_pyproject_simple( assert f"{existing_section}\n{init_basic_toml}" in pyproject_file.read_text() +@pytest.mark.xfail(sys.platform == "win32", reason="regression in tomlkit") def test_init_non_interactive_existing_pyproject_add_dependency( tester: CommandTester, source_dir: Path,