From 8208362e59a3e14994c99f1ecd68fe8685025654 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Aug 2023 10:15:56 +0300 Subject: [PATCH 1/3] chore: update nixpkgs to include python bootstrap rework --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 48f62936f..d5a351f46 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "lastModified": 1690856737, + "narHash": "sha256-34M2FVqiKCwFUmA8/LnwxnQYiFZIL4QiNqQ1NRQX2gs=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "rev": "bfeb681177b5128d061ebbef7ded30bc21a3f135", "type": "github" }, "original": { @@ -40,16 +40,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689192006, - "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", + "lastModified": 1693156971, + "narHash": "sha256-BE6BIXmVQyrOhkX4s/nP+/Xeipb1rRS1qLK/kpe7Pqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", + "rev": "f900e733c1602b4c46064a9ef0514bb2345a8949", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 042714898..28ed2ed2c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Poetry2nix flake"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; inputs.nix-github-actions.url = "github:nix-community/nix-github-actions"; inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs"; From 77678e602ec81dc0dcc5aa7953b03b687a917996 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Aug 2023 10:16:30 +0300 Subject: [PATCH 2/3] fix: remove overrides for everything involved in new bootstrap --- overrides/build-systems.json | 24 ++---------------------- overrides/default.nix | 18 ------------------ 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 5785fd4b7..2eb7dc77c 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -2529,10 +2529,6 @@ "buienradar": [ "setuptools" ], - "build": [ - "flit-core", - "setuptools" - ], "buildbot": [ "setuptools" ], @@ -5893,13 +5889,6 @@ "poetry-core", "setuptools" ], - "flit": [ - "flit-core", - "setuptools" - ], - "flit-core": [ - "setuptools" - ], "flit-scm": [ "flit-core", "setuptools-scm" @@ -7635,10 +7624,6 @@ "insights-core": [ "setuptools" ], - "installer": [ - "flit-core", - "setuptools" - ], "insteon-frontend-home-assistant": [ "setuptools" ], @@ -11040,8 +11025,7 @@ "setuptools" ], "packaging": [ - "flit-core", - "setuptools" + "flit-core" ], "packbits": [ "setuptools" @@ -18390,8 +18374,7 @@ "poetry" ], "tomli": [ - "flit-core", - "setuptools" + "flit-core" ], "tomli-w": [ "flit-core", @@ -19654,9 +19637,6 @@ "whatthepatch": [ "setuptools" ], - "wheel": [ - "setuptools" - ], "wheel-filename": [ "setuptools" ], diff --git a/overrides/default.nix b/overrides/default.nix index 8c3556a3a..3e7708d2f 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2760,14 +2760,6 @@ lib.composeManyExtensions [ } ); - - # Stop infinite recursion by using bootstrapped pkg from nixpkgs - bootstrapped-pip = super.bootstrapped-pip.override { - wheel = ((if self.python.isPy2 then pkgs.python2 else pkgs.python3).pkgs.override { - python = self.python; - }).wheel; - }; - watchfiles = let # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 @@ -2837,16 +2829,6 @@ lib.composeManyExtensions [ } ); - wheel = (( - pkgs.python3.pkgs.override { - python = self.python; - } - ).wheel.override { - inherit (self) buildPythonPackage bootstrapped-pip setuptools; - }).overrideAttrs (old: { - inherit (super.wheel) pname name version src; - }); - zipp = if super.zipp == null then null else super.zipp.overridePythonAttrs ( old: { From 675e101afeb751077816e3bb11f5a43fa9563479 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Aug 2023 11:09:24 +0300 Subject: [PATCH 3/3] hack: rewrite all tests to use poetry-core --- tests/aiopath/pyproject.toml | 4 ++-- tests/ansible-molecule/pyproject.toml | 4 ++-- tests/awscli/pyproject.toml | 4 ++-- tests/bcrypt/pyproject.toml | 4 ++-- tests/canonical-module-names/pyproject.toml | 4 ++-- tests/closure-size/pyproject.toml | 4 ++-- tests/common-pkgs-1/pyproject.toml | 4 ++-- tests/common-pkgs-2/pyproject.toml | 4 ++-- tests/composable-defaults/pyproject.toml | 4 ++-- tests/dependency-environment/pyproject.toml | 4 ++-- tests/editable-egg/pyproject.toml | 4 ++-- tests/editable/pyproject.toml | 4 ++-- tests/env/pyproject.toml | 4 ++-- tests/extras/pyproject.toml | 4 ++-- tests/fastapi-utils/pyproject.toml | 4 ++-- tests/file-src-deps-level2/pyproject.toml | 4 ++-- tests/file-src-deps/pyproject.toml | 4 ++-- tests/file-wheel-deps-level2/pyproject.toml | 4 ++-- tests/file-wheel-deps/pyproject.toml | 4 ++-- tests/git-deps-pinned/pyproject.toml | 4 ++-- tests/git-deps/pyproject.toml | 4 ++-- tests/jq/pyproject.toml | 4 ++-- tests/jupyter-ydoc/pyproject.toml | 4 ++-- tests/manylinux/pyproject.toml | 4 ++-- tests/markupsafe2/pyproject.toml | 4 ++-- tests/mk-poetry-packages/pyproject.toml | 4 ++-- tests/operators/pyproject.toml | 4 ++-- tests/option/pyproject.toml | 4 ++-- tests/override-default-support/pyproject.toml | 4 ++-- tests/override-support/pyproject.toml | 4 ++-- tests/path-deps-level2/pyproject.toml | 4 ++-- tests/path-deps/pyproject.toml | 4 ++-- tests/pendulum/pyproject.toml | 4 ++-- tests/prefer-wheel/pyproject.toml | 4 ++-- tests/prefer-wheels/pyproject.toml | 4 ++-- tests/pyqt5/pyproject.toml | 4 ++-- tests/pytest-randomly/pyproject.toml | 4 ++-- tests/returns/pyproject.toml | 4 ++-- tests/source-filter/pyproject.toml | 4 ++-- tests/trivial/pyproject.toml | 4 ++-- tests/ubersmith/pyproject.toml | 4 ++-- tests/uwsgi/pyproject.toml | 4 ++-- tests/wandb/pyproject.toml | 4 ++-- 43 files changed, 86 insertions(+), 86 deletions(-) diff --git a/tests/aiopath/pyproject.toml b/tests/aiopath/pyproject.toml index d1d541ade..82af0f5c8 100644 --- a/tests/aiopath/pyproject.toml +++ b/tests/aiopath/pyproject.toml @@ -12,5 +12,5 @@ aiopath = [ ] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/ansible-molecule/pyproject.toml b/tests/ansible-molecule/pyproject.toml index a42394083..9d305fcb1 100644 --- a/tests/ansible-molecule/pyproject.toml +++ b/tests/ansible-molecule/pyproject.toml @@ -13,5 +13,5 @@ molecule = "^3.5.2" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/awscli/pyproject.toml b/tests/awscli/pyproject.toml index 57e33ab24..7e204fb82 100644 --- a/tests/awscli/pyproject.toml +++ b/tests/awscli/pyproject.toml @@ -12,5 +12,5 @@ awscli-cwlogs = "*" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/bcrypt/pyproject.toml b/tests/bcrypt/pyproject.toml index d65b618cc..7d7930134 100644 --- a/tests/bcrypt/pyproject.toml +++ b/tests/bcrypt/pyproject.toml @@ -11,5 +11,5 @@ bcrypt = "*" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/canonical-module-names/pyproject.toml b/tests/canonical-module-names/pyproject.toml index 6fce6cfff..36f7b95a7 100644 --- a/tests/canonical-module-names/pyproject.toml +++ b/tests/canonical-module-names/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" pyramid-deferred-sqla = {git = "https://github.com/niteoweb/pyramid_deferred_sqla.git"} [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/closure-size/pyproject.toml b/tests/closure-size/pyproject.toml index 822cb8bb6..68027f1be 100644 --- a/tests/closure-size/pyproject.toml +++ b/tests/closure-size/pyproject.toml @@ -13,5 +13,5 @@ trivial = { path = "../trivial" } main = "closure_size:main" [build-system] -requires = ["poetry>=1.0.0"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/common-pkgs-1/pyproject.toml b/tests/common-pkgs-1/pyproject.toml index 3a5c5aa13..d1d15dc3d 100644 --- a/tests/common-pkgs-1/pyproject.toml +++ b/tests/common-pkgs-1/pyproject.toml @@ -45,5 +45,5 @@ googleapis-common-protos = "^1.6.0" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/common-pkgs-2/pyproject.toml b/tests/common-pkgs-2/pyproject.toml index e6836a4d6..1f2005ba0 100644 --- a/tests/common-pkgs-2/pyproject.toml +++ b/tests/common-pkgs-2/pyproject.toml @@ -70,5 +70,5 @@ mccabe = "^0.6.1" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/composable-defaults/pyproject.toml b/tests/composable-defaults/pyproject.toml index b70b48413..e235a5b69 100644 --- a/tests/composable-defaults/pyproject.toml +++ b/tests/composable-defaults/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/dependency-environment/pyproject.toml b/tests/dependency-environment/pyproject.toml index d7cb5f6b1..ab58fe586 100644 --- a/tests/dependency-environment/pyproject.toml +++ b/tests/dependency-environment/pyproject.toml @@ -8,5 +8,5 @@ authors = ["Your Name "] gunicorn = "*" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/editable-egg/pyproject.toml b/tests/editable-egg/pyproject.toml index d7ee1d7ca..fea42a85f 100644 --- a/tests/editable-egg/pyproject.toml +++ b/tests/editable-egg/pyproject.toml @@ -16,5 +16,5 @@ gunicorn = "^20.0.4" pastedeploy = "^2.1.0" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/editable/pyproject.toml b/tests/editable/pyproject.toml index c968cf445..a4198fe91 100644 --- a/tests/editable/pyproject.toml +++ b/tests/editable/pyproject.toml @@ -8,5 +8,5 @@ packages = [ ] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/env/pyproject.toml b/tests/env/pyproject.toml index 7625d4916..5e32213da 100644 --- a/tests/env/pyproject.toml +++ b/tests/env/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/extras/pyproject.toml b/tests/extras/pyproject.toml index a1683c2c5..c7b5010de 100644 --- a/tests/extras/pyproject.toml +++ b/tests/extras/pyproject.toml @@ -12,5 +12,5 @@ setuptools-scm = { version = ">=3.4", extras = ["toml"] } boto3-stubs = {extras = ["cognito-idp"], version = "^1.17.82"} [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/fastapi-utils/pyproject.toml b/tests/fastapi-utils/pyproject.toml index 9b44fa729..f215d3de7 100644 --- a/tests/fastapi-utils/pyproject.toml +++ b/tests/fastapi-utils/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" fastapi-utils = "^0.2.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/file-src-deps-level2/pyproject.toml b/tests/file-src-deps-level2/pyproject.toml index 64cdb0b80..443a346e4 100644 --- a/tests/file-src-deps-level2/pyproject.toml +++ b/tests/file-src-deps-level2/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" file-src-deps = { path = "../file-src-deps" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/file-src-deps/pyproject.toml b/tests/file-src-deps/pyproject.toml index a8439c7fb..f7d01aba1 100644 --- a/tests/file-src-deps/pyproject.toml +++ b/tests/file-src-deps/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" trivial = { path = "../trivial/dist/trivial-0.1.0.tar.gz" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/file-wheel-deps-level2/pyproject.toml b/tests/file-wheel-deps-level2/pyproject.toml index b1490c84f..5a044d264 100644 --- a/tests/file-wheel-deps-level2/pyproject.toml +++ b/tests/file-wheel-deps-level2/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" file-wheel-deps = { path = "../file-wheel-deps" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/file-wheel-deps/pyproject.toml b/tests/file-wheel-deps/pyproject.toml index 5d6131304..2915e2971 100644 --- a/tests/file-wheel-deps/pyproject.toml +++ b/tests/file-wheel-deps/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" trivial = { path = "../trivial/dist/trivial-0.1.0-py3-none-any.whl" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/git-deps-pinned/pyproject.toml b/tests/git-deps-pinned/pyproject.toml index 6a9d3331e..f7baaa706 100644 --- a/tests/git-deps-pinned/pyproject.toml +++ b/tests/git-deps-pinned/pyproject.toml @@ -11,5 +11,5 @@ colorama = {git = "https://github.com/tartley/colorama.git", rev = "4321bbfda9aa s3transfer = { git = "https://github.com/boto/s3transfer.git", branch = "develop" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/git-deps/pyproject.toml b/tests/git-deps/pyproject.toml index 65d2cf7d8..1e4f35bb1 100644 --- a/tests/git-deps/pyproject.toml +++ b/tests/git-deps/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" alembic = { git = "https://github.com/sqlalchemy/alembic.git", tag = "rel_1_3_1" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/jq/pyproject.toml b/tests/jq/pyproject.toml index 6e75f25f3..a1b6d2ca6 100644 --- a/tests/jq/pyproject.toml +++ b/tests/jq/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" jq = "^1.2.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/jupyter-ydoc/pyproject.toml b/tests/jupyter-ydoc/pyproject.toml index ad8f85775..f33152548 100644 --- a/tests/jupyter-ydoc/pyproject.toml +++ b/tests/jupyter-ydoc/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.8" jupyter-ydoc = "*" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/manylinux/pyproject.toml b/tests/manylinux/pyproject.toml index a612c1423..0a7d54739 100644 --- a/tests/manylinux/pyproject.toml +++ b/tests/manylinux/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.9" opencv-python = "4.1.2.30" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/markupsafe2/pyproject.toml b/tests/markupsafe2/pyproject.toml index 68b3955b4..f35146dd5 100644 --- a/tests/markupsafe2/pyproject.toml +++ b/tests/markupsafe2/pyproject.toml @@ -12,5 +12,5 @@ MarkupSafe = "^2.0" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/mk-poetry-packages/pyproject.toml b/tests/mk-poetry-packages/pyproject.toml index e870f1649..98cacedd4 100644 --- a/tests/mk-poetry-packages/pyproject.toml +++ b/tests/mk-poetry-packages/pyproject.toml @@ -11,5 +11,5 @@ requests = "^2.25.1" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=1.0.0"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/operators/pyproject.toml b/tests/operators/pyproject.toml index 2e75efb6a..4f42e2817 100644 --- a/tests/operators/pyproject.toml +++ b/tests/operators/pyproject.toml @@ -11,5 +11,5 @@ pytest-mypy = "^0.8.1" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/option/pyproject.toml b/tests/option/pyproject.toml index ad33e548b..575bf4fbb 100644 --- a/tests/option/pyproject.toml +++ b/tests/option/pyproject.toml @@ -11,5 +11,5 @@ python = "^3.7" option = "^2.1.0" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/override-default-support/pyproject.toml b/tests/override-default-support/pyproject.toml index d5bbe3af8..ad20f0b57 100644 --- a/tests/override-default-support/pyproject.toml +++ b/tests/override-default-support/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/override-support/pyproject.toml b/tests/override-support/pyproject.toml index d5bbe3af8..ad20f0b57 100644 --- a/tests/override-support/pyproject.toml +++ b/tests/override-support/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/path-deps-level2/pyproject.toml b/tests/path-deps-level2/pyproject.toml index 7c367b306..d83a07608 100644 --- a/tests/path-deps-level2/pyproject.toml +++ b/tests/path-deps-level2/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" path-deps = { path = "../path-deps" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/path-deps/pyproject.toml b/tests/path-deps/pyproject.toml index 55c9c022c..a044ad795 100644 --- a/tests/path-deps/pyproject.toml +++ b/tests/path-deps/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" trivial = { path = "../trivial" } [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/pendulum/pyproject.toml b/tests/pendulum/pyproject.toml index a296d1bd5..20f3a926c 100644 --- a/tests/pendulum/pyproject.toml +++ b/tests/pendulum/pyproject.toml @@ -11,5 +11,5 @@ pendulum = "^2.1.2" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/prefer-wheel/pyproject.toml b/tests/prefer-wheel/pyproject.toml index 399db5a9f..f3d57d964 100644 --- a/tests/prefer-wheel/pyproject.toml +++ b/tests/prefer-wheel/pyproject.toml @@ -12,5 +12,5 @@ funcy = "1.17" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/prefer-wheels/pyproject.toml b/tests/prefer-wheels/pyproject.toml index fd15bfa0d..afc467be9 100644 --- a/tests/prefer-wheels/pyproject.toml +++ b/tests/prefer-wheels/pyproject.toml @@ -11,5 +11,5 @@ maturin = "*" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/pyqt5/pyproject.toml b/tests/pyqt5/pyproject.toml index 7aabbfbdc..98f6fd70d 100644 --- a/tests/pyqt5/pyproject.toml +++ b/tests/pyqt5/pyproject.toml @@ -11,5 +11,5 @@ PyQt5 = "^5.15.6" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/pytest-randomly/pyproject.toml b/tests/pytest-randomly/pyproject.toml index e1c988ff9..22bdbba6b 100644 --- a/tests/pytest-randomly/pyproject.toml +++ b/tests/pytest-randomly/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.8" pytest-randomly = "^3.10.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/returns/pyproject.toml b/tests/returns/pyproject.toml index 5827f7a53..785781cb2 100644 --- a/tests/returns/pyproject.toml +++ b/tests/returns/pyproject.toml @@ -11,5 +11,5 @@ python = "^3.7" returns = "^0.19.0" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/source-filter/pyproject.toml b/tests/source-filter/pyproject.toml index 7625d4916..5e32213da 100644 --- a/tests/source-filter/pyproject.toml +++ b/tests/source-filter/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/trivial/pyproject.toml b/tests/trivial/pyproject.toml index 7625d4916..5e32213da 100644 --- a/tests/trivial/pyproject.toml +++ b/tests/trivial/pyproject.toml @@ -10,5 +10,5 @@ alembic = "1.0.10" Flask = "^1.1.1" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/ubersmith/pyproject.toml b/tests/ubersmith/pyproject.toml index 391b1d64b..64ea55a6a 100644 --- a/tests/ubersmith/pyproject.toml +++ b/tests/ubersmith/pyproject.toml @@ -9,5 +9,5 @@ python = "^3.6" ubersmith = "^0.4.0" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/uwsgi/pyproject.toml b/tests/uwsgi/pyproject.toml index eea2497b3..bbfee5cf5 100644 --- a/tests/uwsgi/pyproject.toml +++ b/tests/uwsgi/pyproject.toml @@ -11,5 +11,5 @@ uwsgi = "^2.0.19" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/tests/wandb/pyproject.toml b/tests/wandb/pyproject.toml index b111c468a..3f3a180ae 100644 --- a/tests/wandb/pyproject.toml +++ b/tests/wandb/pyproject.toml @@ -12,5 +12,5 @@ wandb = "0.8.28" [tool.poetry.dev-dependencies] [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api"