Python is becoming stricter about valid version numbers. Adapt
accordingly. What was previously "0.69.19_1_g3f362e9" will now become
"0.69.19.dev1.g3f362e9".
Note that this obviously only affects non-tagged releases, so those
names should never make it out to the public anyways.
See also: https://peps.python.org/pep-0440/
---
I briefly tried to find a common version naming scheme, but could not
find anything that satisfies all package managers (apk, apt, pacman,
python). Given that this only affects non-tagged releases, I think this
is the easiest way forward.
Note that we will have to do something similar for Alpine, where we are
also already getting deprecation warnings about our version names.
builds.sr.ht/PKGBUILD | 2 +-
git.sr.ht/PKGBUILD | 2 +-
hg.sr.ht/PKGBUILD | 2 +-
hub.sr.ht/PKGBUILD | 2 +-
lists.sr.ht/PKGBUILD | 2 +-
man.sr.ht/PKGBUILD | 2 +-
meta.sr.ht/PKGBUILD | 2 +-
pages.sr.ht/PKGBUILD | 2 +-
paste.sr.ht/PKGBUILD | 2 +-
python-scmsrht/PKGBUILD | 2 +-
python-srht/PKGBUILD | 2 +-
todo.sr.ht/PKGBUILD | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/builds.sr.ht/PKGBUILD b/builds.sr.ht/PKGBUILD
index bc8cc4a..0358359 100644
--- a/builds.sr.ht/PKGBUILD
@@ -18,7 +18,7 @@ sha256sums=('78c5d91003303f66a0dc7d8877ce77c620839c05f0013db5fcf7ade9a1e46587'
'eee2c75cd45b7bf77eabe2687d4bb01ab3a66732977f01887a1d947d0a68c3d0'
'50f4f9d6b32ff6482b6ca046721a48896a81a98a6c4fe2b8f3f0fc1884d21c2b'
'7d195dab1daa69ceb29c78eeae60b0fc332b255e96f33c01d5f906eaacaed541')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/git.sr.ht/PKGBUILD b/git.sr.ht/PKGBUILD
index 140e74c..85eaac0 100644
--- a/git.sr.ht/PKGBUILD
+++ b/git.sr.ht/PKGBUILD
@@ -33,7 +33,7 @@ sha256sums=('e4a95e8780386cb77de0752d21e62c3aee151e1d8085a66338d868312542dddc'
'9612d15a29539c30935369edb09554e1e54ce91dadfc205bcb9b8caecf3d7f69'
'7ea576c62c70f7a26f135e8ea7aedc82ab2d670b213d8d8e861819bc84e99802'
'0049eb8469635888d344599840e26495d225c34b4be5564e1b3e12ba0ac15eb5')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/hg.sr.ht/PKGBUILD b/hg.sr.ht/PKGBUILD
index 7d6b2f9..8f1996b 100644
--- a/hg.sr.ht/PKGBUILD
+++ b/hg.sr.ht/PKGBUILD
@@ -24,7 +24,7 @@ sha256sums=('a87b054887038ff28fa507261470691d4a4a6384c5294eac60d183f3c7528fb0'
'45e58239781da52fdfbf2912c7a55358eb2e259709bddd8e2bd6cf1f084c85f4'
'f757c1c92db1d6000cfc7887ed69fc8e350e7b64c1cff3539318e69e6e1425df'
'02f8f757a8499abddc42335e460ccfeff27a23cba0bfdd56bd7e14e0ce342d6b')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/hub.sr.ht/PKGBUILD b/hub.sr.ht/PKGBUILD
index 31ed1d4..240bb9b 100644
--- a/hub.sr.ht/PKGBUILD
+++ b/hub.sr.ht/PKGBUILD
@@ -16,7 +16,7 @@ sha256sums=('0bded5fb5d268d7386d53bccdfa2dea9a951acb4824e74b359a726bc002d70c2'
'3de78b1220fcfd6bd293f8caa6c8f6e9e4a9b0757b6cd614b5c4869613ec0959'
'6fd5e043fcbb1fe1f48f35e79d595560c4171f9c7daca3924ef926319977e6e7'
'2ef86c4fddee7cb98af57ef725d393edbda2c2f2cb34c70000a59938510a54ee')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgname-$pkgver
diff --git a/lists.sr.ht/PKGBUILD b/lists.sr.ht/PKGBUILD
index 8de3be5..61d9179 100644
--- a/lists.sr.ht/PKGBUILD
+++ b/lists.sr.ht/PKGBUILD
@@ -30,7 +30,7 @@ sha256sums=('e1b3b7c910426b3fcd4211b46d5d8402c717de4ff305e5c2cfaebe12e037b2b2'
'ba90af29b39b40ba8a6e749faf86325498739c4bbb5d2be1032c07e9f7a02937'
'7c57f1910a08fb7007386d4f4316e5aa0d94e5b57c947726fc9579ebf24cfbee'
'753453b055e613e7c0fb22991ca8d9f588fe1ba705e26f0e8c2504c464f4e5d0')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/man.sr.ht/PKGBUILD b/man.sr.ht/PKGBUILD
index 65530ab..7308608 100644
--- a/man.sr.ht/PKGBUILD
+++ b/man.sr.ht/PKGBUILD
@@ -18,7 +18,7 @@ sha256sums=('9e4961687c0fec2124e6b921e2a1f81a41a9633d2cbf0e0cc9a346478c5345c5'
'47130a2897bca5a6491c0cdcd4443a052eb3f1f83484332b1775ef5f991b9ea0'
'f6cebc31b1f4993168b9d3873442be2ab93c0a3e604e1f86e34a8aabf65c3a39'
'8dbd5ed13adcd3fe4f0e31e3b6a7f6c7b116cbd63ce1c430ddcdaec4f7491dee')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/meta.sr.ht/PKGBUILD b/meta.sr.ht/PKGBUILD
index 7c52f32..61840d0 100644
--- a/meta.sr.ht/PKGBUILD
+++ b/meta.sr.ht/PKGBUILD
@@ -36,7 +36,7 @@ sha256sums=('be337e9ee44c5f17560f798c07a162db0a012954661d5c04e5b33e3c2878656d'
'03c4404aa3a90eede3d03dbdf68abde261d89505979939e9c7f3cb1a7bd0d84d'
'70e32d30d15551b70b5529df5805386d703ea39df9973175b79062d1b847f342'
'b98af4986b4a470cf80d8651563946706717fb556cf31433581f22173ada93db')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/pages.sr.ht/PKGBUILD b/pages.sr.ht/PKGBUILD
index 55a9e56..31ce275 100644
--- a/pages.sr.ht/PKGBUILD
+++ b/pages.sr.ht/PKGBUILD
@@ -14,7 +14,7 @@ source=(
sha256sums=('2d6cfc01f56b7628af15d8454570bc332f1e4e01d114f7a6d232f8b21921ea39'
'848c02f79987e87ba3a1ebfbee8432d281c490f34bbac596894e5d88171dbb59'
'026c309bd0ae2c21978405bdcf4b86a88776ceac83a18d329f441ab4c0102c15')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/paste.sr.ht/PKGBUILD b/paste.sr.ht/PKGBUILD
index 0aa925f..ee8d69c 100644
--- a/paste.sr.ht/PKGBUILD
+++ b/paste.sr.ht/PKGBUILD
@@ -24,7 +24,7 @@ sha256sums=('80bbfec7b6fdf2e68ce412f985564b6fea076ae750859d1bd14cbc58080529d8'
'a4638073cc6486f4a693aa7cb18c21fa66e70ad0387eb423166d644cdfb32d26'
'5901e68427fc15a94122dad22f2db363ea571562d757ce48e901458fe6d2a505'
'a08895ba853dbca7fc5af3da2f6bfd4284c15f787a5968793a4a53f31f9de817')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/python-scmsrht/PKGBUILD b/python-scmsrht/PKGBUILD
index e15bbe2..32d8e7d 100644
--- a/python-scmsrht/PKGBUILD
+++ b/python-scmsrht/PKGBUILD
@@ -12,7 +12,7 @@ source=(
"$pkgbase-$pkgver.tar.gz::http://git.sr.ht/~sircmpwn/$pkgbase/archive/$pkgver.tar.gz"
)
sha256sums=('c1a25c97d2134b83ec100dd2b2e9686d0dfbe83c5d194bbf185917c4ce548103')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
diff --git a/python-srht/PKGBUILD b/python-srht/PKGBUILD
index 1c6fd20..719ac32 100644
--- a/python-srht/PKGBUILD
+++ b/python-srht/PKGBUILD
@@ -31,7 +31,7 @@ source=(
)
sha256sums=('3cd41581464f25b1ce2161354c95cb4321113bcb02a8368307ede4c9bba76b35'
'SKIP')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
prepare() {
cd $pkgbase-$pkgver
diff --git a/todo.sr.ht/PKGBUILD b/todo.sr.ht/PKGBUILD
index 2a30e78..0abe09e 100644
--- a/todo.sr.ht/PKGBUILD
+++ b/todo.sr.ht/PKGBUILD
@@ -25,7 +25,7 @@ sha256sums=('1bdb3a9c32033b3e27420ab98977cdf95bac83bfe8e1b11cc318af89a5733edf'
'fd00e7e8664f4ef42c5d51117ae62dd8cfa7286754cd1c7334238ff53d69379d'
'4a9d0ebb19f819ae94f3f9c083860f0a9d3adf69b5489230271469054c9157c6'
'f9b1dbca0557b7b24654dcb0d7e7d990675ce251a3d2f380d87eb1d3aca93821')
-export PKGVER=$pkgver
+export PKGVER="$(echo "$pkgver" | awk -F- '{if (NF==3) print $1 ".dev" $2 "." $3; else print $1}')"
build() {
cd $pkgbase-$pkgver
--
2.43.0