Merge branch 'main' into fix-datetime-conflict

dbanty · web-flow · commit 4c5f5485092f · 2022-01-17T12:38:53.000-07:00
diff --git a/end_to_end_tests/golden-record/pyproject.toml b/end_to_end_tests/golden-record/pyproject.toml
@@ -18,8 +18,8 @@ attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
 
 [build-system]
-requires = ["poetry>=1.0"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
diff --git a/openapi_python_client/templates/pyproject.toml.jinja b/openapi_python_client/templates/pyproject.toml.jinja
@@ -19,8 +19,8 @@ attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
 
 [build-system]
-requires = ["poetry>=1.0"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
 
 {% endif %}
 [tool.black]
diff --git a/pyproject.toml b/pyproject.toml
@@ -125,5 +125,5 @@ disable = [
 ]
 
 [build-system]
-requires = ["poetry>=1.0"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

Original file line number	Diff line number	Diff line change
`@@ -125,5 +125,5 @@ disable = [`
`125`	`125`	`]`
`126`	`126`
`127`	`127`	`[build-system]`
`128`		`-requires = ["poetry>=1.0"]`
`129`		`-build-backend = "poetry.masonry.api"`
	`128`	`+requires = ["poetry-core>=1.0.0"]`
	`129`	`+build-backend = "poetry.core.masonry.api"`