Install twine from GitHub on 3.13

repo-helper · Dec 7, 2023 · 095ec01 · 095ec01
1 parent 0b97524
commit 095ec01
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 21 deletions.
diff --git a/repo_helper/files/testing.py b/repo_helper/files/testing.py
@@ -466,7 +466,8 @@ def testenv_build(self):
 		self._ini["testenv:build"]["deps"] = indent_join([
 				"build[virtualenv]>=0.3.1",
 				"check-wheel-contents>=0.1.0",
-				"twine>=3.2.0",
+				'twine>=3.2.0; python_version < "3.13"',
+				'twine@git+https://github.com/pypa/twine; python_version >= "3.13"',
 				'cryptography<40; implementation_name == "pypy" and python_version <= "3.7"',
 				*self["tox_build_requirements"],
 				])

diff --git a/tests/test_files/test_testing_/test_make_tox_matrix.ini b/tests/test_files/test_testing_/test_make_tox_matrix.ini
@@ -60,7 +60,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_devmode_devmode_.ini b/tests/test_files/test_testing_/test_tox_enable_devmode_devmode_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_devmode_no_devmode_.ini b/tests/test_files/test_testing_/test_tox_enable_devmode_no_devmode_.ini
@@ -55,7 +55,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_docs_docs_.ini b/tests/test_files/test_testing_/test_tox_enable_docs_docs_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_docs_no_docs_.ini b/tests/test_files/test_testing_/test_tox_enable_docs_no_docs_.ini
@@ -60,7 +60,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_tests_no_tests_.ini b/tests/test_files/test_testing_/test_tox_enable_tests_no_tests_.ini
@@ -64,7 +64,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_enable_tests_tests_.ini b/tests/test_files/test_testing_/test_tox_enable_tests_tests_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_mypy_deps_mypy_deps0_.ini b/tests/test_files/test_testing_/test_tox_mypy_deps_mypy_deps0_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_mypy_deps_mypy_deps1_.ini b/tests/test_files/test_testing_/test_tox_mypy_deps_mypy_deps1_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_mypy_version_0_782_.ini b/tests/test_files/test_testing_/test_tox_mypy_version_0_782_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_mypy_version_0_790_.ini b/tests/test_files/test_testing_/test_tox_mypy_version_0_790_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_py_modules_py_modules0_.ini b/tests/test_files/test_testing_/test_tox_py_modules_py_modules0_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_py_modules_py_modules1_.ini b/tests/test_files/test_testing_/test_tox_py_modules_py_modules1_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_python_deploy_version_3_6_.ini b/tests/test_files/test_testing_/test_tox_python_deploy_version_3_6_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_python_deploy_version_3_7_.ini b/tests/test_files/test_testing_/test_tox_python_deploy_version_3_7_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_python_deploy_version_3_8_.ini b/tests/test_files/test_testing_/test_tox_python_deploy_version_3_8_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_stubs_package_no_stubs_.ini b/tests/test_files/test_testing_/test_tox_stubs_package_no_stubs_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_stubs_package_stubs_.ini b/tests/test_files/test_testing_/test_tox_stubs_package_stubs_.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_tox_testenv_extras__.ini b/tests/test_files/test_testing_/test_tox_tox_testenv_extras__.ini
@@ -68,7 +68,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"

diff --git a/tests/test_files/test_testing_/test_tox_tox_testenv_extras_extra_a_.ini b/tests/test_files/test_testing_/test_tox_tox_testenv_extras_extra_a_.ini
@@ -70,7 +70,8 @@ changedir = {toxinidir}
 deps =
     build[virtualenv]>=0.3.1
     check-wheel-contents>=0.1.0
-    twine>=3.2.0
+    twine>=3.2.0; python_version < "3.13"
+    twine@git+https://github.com/pypa/twine; python_version >= "3.13"
     cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
 commands =
     python -m build --sdist --wheel "{toxinidir}"