parent
8b0b7fd591
commit
63a16a8294
@ -1,41 +0,0 @@
|
||||
From bf2747df921ebc70bdbba2aac79f161ebf4df46c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Wed, 18 Nov 2020 11:10:26 +0100
|
||||
Subject: [PATCH] Extend the wheel Tag regex in tests to match cp3_10 and cp310
|
||||
|
||||
Fixes https://github.com/python-poetry/poetry-core/issues/110
|
||||
---
|
||||
tests/masonry/builders/test_complete.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py
|
||||
index 467ffdd4..4248a87a 100644
|
||||
--- a/tests/masonry/builders/test_complete.py
|
||||
+++ b/tests/masonry/builders/test_complete.py
|
||||
@@ -79,7 +79,7 @@ def test_wheel_c_extension():
|
||||
Wheel-Version: 1.0
|
||||
Generator: poetry {}
|
||||
Root-Is-Purelib: false
|
||||
-Tag: cp[23]\\d-cp[23]\\dm?u?-.+
|
||||
+Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
|
||||
$""".format(
|
||||
__version__
|
||||
),
|
||||
@@ -136,7 +136,7 @@ def test_wheel_c_extension_with_no_setup():
|
||||
Wheel-Version: 1.0
|
||||
Generator: poetry {}
|
||||
Root-Is-Purelib: false
|
||||
-Tag: cp[23]\\d-cp[23]\\dm?u?-.+
|
||||
+Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
|
||||
$""".format(
|
||||
__version__
|
||||
),
|
||||
@@ -193,7 +193,7 @@ def test_wheel_c_extension_src_layout():
|
||||
Wheel-Version: 1.0
|
||||
Generator: poetry {}
|
||||
Root-Is-Purelib: false
|
||||
-Tag: cp[23]\\d-cp[23]\\dm?u?-.+
|
||||
+Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
|
||||
$""".format(
|
||||
__version__
|
||||
),
|
@ -1,30 +1,32 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 628cf48..83e2d14 100644
|
||||
index d55b844..822c584 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -43,6 +43,12 @@ enum34 = {version = "^1.1.10", python = "~2.7"}
|
||||
@@ -43,6 +43,13 @@ enum34 = {version = "^1.1.10", python = "~2.7"}
|
||||
# required by tomlkit, jsonschema
|
||||
functools32 = {version = "^3.2.3-2", python = "~2.7"}
|
||||
|
||||
+# moved here from vendors/pyproject.toml
|
||||
+jsonschema = "^3.2.0"
|
||||
+lark-parser = "^0.9.0"
|
||||
+packaging = "^20.1"
|
||||
+packaging = "^20.9"
|
||||
+pyrsistent = ">=0.16.0,<0.18.0"
|
||||
+tomlkit = ">=0.7.0,<1.0.0"
|
||||
+
|
||||
[tool.poetry.dev-dependencies]
|
||||
pre-commit = "^1.10"
|
||||
pytest = "^4.6"
|
||||
pyrsistent = "^0.16.0"
|
||||
diff --git a/vendors/pyproject.toml b/vendors/pyproject.toml
|
||||
index 69ccbd0..fb0b28e 100644
|
||||
index 2671380..fb0b28e 100644
|
||||
--- a/vendors/pyproject.toml
|
||||
+++ b/vendors/pyproject.toml
|
||||
@@ -20,8 +20,3 @@ classifiers = [
|
||||
@@ -20,9 +20,3 @@ classifiers = [
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.6"
|
||||
-
|
||||
-jsonschema = "^3.2.0"
|
||||
-lark-parser = "^0.9.0"
|
||||
-packaging = "^20.1"
|
||||
-packaging = "^20.9"
|
||||
-pyrsistent = "^0.16.0"
|
||||
-tomlkit = ">=0.7.0,<1.0.0"
|
@ -1 +1 @@
|
||||
SHA512 (poetry-core-1.0.0.tar.gz) = 56ed12e739fe761d59f539ecc6c05d8ad8bf2d8dbb3395910035230ac603d96981349cff6df783d9c761e716a3ac322a37d98ef47cbe82cc21174bf083cdf887
|
||||
SHA512 (poetry-core-1.0.2.tar.gz) = 5b3b6899e80e3e7b58ed3d2e5901776c9fa10a20408632ca04b25ac78a8e1385f66e47d720bac2d02bc1679ff30abdca79b75585b3aa4591eef7117fce791f2b
|
||||
|
Loading…
Reference in new issue