aports/testing/streamlink/update-versioningit.patch
2022-06-22 15:34:22 +00:00

52 lines
1.4 KiB
Diff

Patch-Source: https://github.com/streamlink/streamlink/commit/cfb482cac7aa056f3cc922a85b55367858451db5
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 6b1c7d53..81e8e82f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -7,7 +7,7 @@ freezegun>=1.0.0
flake8
flake8-import-order
shtab
-versioningit >=1.1.1, <2
+versioningit >=2.0.0, <3
mypy
lxml-stubs
diff --git a/docs-requirements.txt b/docs-requirements.txt
index b5c2bdcd..ad2059d5 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
sphinx>=3.0
furo==2021.09.08
recommonmark>=0.5.0
-versioningit >=1.1.1, <2
+versioningit >=2.0.0, <3
diff --git a/pyproject.toml b/pyproject.toml
index 9901699c..af631f93 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ build-backend = "setuptools.build_meta"
requires = [
"setuptools >=45",
"wheel",
- "versioningit >=1.1.1, <2",
+ "versioningit >=2.0.0, <3",
]
@@ -15,9 +15,9 @@ default-version = "0.0.0+unknown"
method = "git"
[tool.versioningit.format]
-distance = "{version}+{distance}.{vcs}{rev}"
-dirty = "{version}+{distance}.{vcs}{rev}.dirty"
-distance-dirty = "{version}+{distance}.{vcs}{rev}.dirty"
+distance = "{base_version}+{distance}.{vcs}{rev}"
+dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"
+distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"
[tool.versioningit.next-version]
method = "null"