Skip to content
Snippets Groups Projects
Commit a87872d6 authored by achill (fossdd)'s avatar achill (fossdd) Committed by Bart Ribbers
Browse files
parent 8073958f
No related branches found
No related tags found
1 merge request!76204community/twine: upgrade to 6.0.1
Pipeline #277312 skipped
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=twine
pkgver=4.0.2
pkgrel=5
pkgver=6.0.1
pkgrel=0
pkgdesc="Collection of utilities for publishing packages on PyPI"
url="https://twine.readthedocs.io/en/latest/"
# loongarch64: blocked by py3-readme_renderer
......@@ -36,10 +36,7 @@ checkdepends="
py3-pytest-socket
"
subpackages="$pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/t/twine/twine-$pkgver.tar.gz
importlib-metadata.patch
test-setup.patch
"
source="https://files.pythonhosted.org/packages/source/t/twine/twine-$pkgver.tar.gz"
# Backwards compatibility
provides="py3-$pkgname=$pkgver-r$pkgrel"
......@@ -67,7 +64,5 @@ package() {
}
sha512sums="
9c197bf09db4ffd9342eb6a23e90a44e37123e285bdfc02c47087fce3cb468f1b12f4e3c890e434a80ec3d5155c8e42e53f61459c2f0a580b252d0dc18d1acb7 twine-4.0.2.tar.gz
6c6680d30867523bbe13995966b1313039ada9d09c4f78b43a043fc18a7d76648570013e43339273deb1475bfa9f323947c82ba4dc4d54465d54699a973c98b6 importlib-metadata.patch
5ecb151a715f51e31039ca24c5a3c22fbd6868b1545b4c608b6d3183c7d17efc51b87485d3f69cd56d40e9bd4fafef722408455a21ce7a743dae4e76297a7180 test-setup.patch
8131917fa2e19b4bc0fc17f3204682662ce78a4e023fbfb596e77163237adb12a9680d7dda85d78bdcbf9280aa2e53141e2b1e6ce998cb0ae2bfce72f9ec76a0 twine-6.0.1.tar.gz
"
diff --git a/twine/__init__.py b/twine/__init__.py
index 6af4d39..339c1f8 100644
--- a/twine/__init__.py
+++ b/twine/__init__.py
@@ -29,9 +29,9 @@ __all__ = (
__copyright__ = "Copyright 2019 Donald Stufft and individual contributors"
-import importlib_metadata
+import importlib.metadata
-metadata = importlib_metadata.metadata("twine")
+metadata = importlib.metadata.metadata("twine")
__title__ = metadata["name"]
diff --git a/twine/cli.py b/twine/cli.py
index 48f1450..f5092d0 100644
--- a/twine/cli.py
+++ b/twine/cli.py
@@ -15,7 +15,7 @@ import argparse
import logging.config
from typing import Any, List, Tuple
-import importlib_metadata
+import importlib.metadata
import rich
import rich.highlighter
import rich.logging
@@ -78,7 +78,7 @@ def list_dependencies_and_versions() -> List[Tuple[str, str]]:
"requests-toolbelt",
"urllib3",
)
- return [(dep, importlib_metadata.version(dep)) for dep in deps] # type: ignore[no-untyped-call] # python/importlib_metadata#288 # noqa: E501
+ return [(dep, importlib.metadata.version(dep)) for dep in deps] # type: ignore[no-untyped-call] # python/importlib.metadata#288 # noqa: E501
def dep_versions() -> str:
@@ -88,7 +88,7 @@ def dep_versions() -> str:
def dispatch(argv: List[str]) -> Any:
- registered_commands = importlib_metadata.entry_points(
+ registered_commands = importlib.metadata.entry_points(
group="twine.registered_commands"
)
diff --git a/twine/package.py b/twine/package.py
index 3ca074f..f7d429f 100644
--- a/twine/package.py
+++ b/twine/package.py
@@ -19,7 +19,7 @@ import re
import subprocess
from typing import Dict, NamedTuple, Optional, Sequence, Tuple, Union
-import importlib_metadata
+import importlib.metadata
import pkginfo
from rich import print
@@ -124,7 +124,7 @@ class PackageFile:
py_version: Optional[str]
if dtype == "bdist_egg":
- (dist,) = importlib_metadata.Distribution.discover( # type: ignore[no-untyped-call] # python/importlib_metadata#288 # noqa: E501
+ (dist,) = importlib.metadata.Distribution.discover( # type: ignore[no-untyped-call] # python/importlib.metadata#288 # noqa: E501
path=[filename]
)
py_version = dist.metadata["Version"]
use a pytest fixture instead
diff --git a/tests/test_check.py b/tests/test_check.py
index d83f29e..9dac9bd 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -24,16 +24,17 @@ from twine.commands import check
class TestWarningStream:
- def setup(self):
- self.stream = check._WarningStream()
+ @pytest.fixture
+ def stream(self):
+ return check._WarningStream()
- def test_write_match(self):
- self.stream.write("<string>:2: (WARNING/2) Title underline too short.")
- assert self.stream.getvalue() == "line 2: Warning: Title underline too short.\n"
+ def test_write_match(self, stream):
+ stream.write("<string>:2: (WARNING/2) Title underline too short.")
+ assert stream.getvalue() == "line 2: Warning: Title underline too short.\n"
- def test_write_nomatch(self):
- self.stream.write("this does not match")
- assert self.stream.getvalue() == "this does not match"
+ def test_write_nomatch(self, stream):
+ stream.write("this does not match")
+ assert stream.getvalue() == "this does not match"
- def test_str_representation(self):
- self.stream.write("<string>:2: (WARNING/2) Title underline too short.")
- assert str(self.stream) == "line 2: Warning: Title underline too short."
+ def test_str_representation(self, stream):
+ stream.write("<string>:2: (WARNING/2) Title underline too short.")
+ assert str(stream) == "line 2: Warning: Title underline too short."
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment