* [PR PATCH] Remove python-subliminal, python-stevedore
@ 2020-08-27 17:54 Chocimier
2020-09-02 20:16 ` [PR PATCH] [Updated] " Chocimier
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chocimier @ 2020-08-27 17:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org subliminal
https://github.com/void-linux/void-packages/pull/24513
Remove python-subliminal, python-stevedore
Subliminal depends on stevedore>=3 and dogpile.cache, that do not work anymore with py2.
A patch file from https://github.com/void-linux/void-packages/pull/24513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subliminal-24513.patch --]
[-- Type: text/x-diff, Size: 7641 bytes --]
From fe98674f1bad45218d8af8fa538d845e6c215137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 27 Aug 2020 19:13:55 +0200
Subject: [PATCH 1/3] python-stevedore: remove
---
srcpkgs/python3-stevedore | 1 -
.../template | 22 +++++--------------
2 files changed, 6 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-stevedore
rename srcpkgs/{python-stevedore => python3-stevedore}/template (52%)
diff --git a/srcpkgs/python3-stevedore b/srcpkgs/python3-stevedore
deleted file mode 120000
index 8b75fb5ae1b..00000000000
--- a/srcpkgs/python3-stevedore
+++ /dev/null
@@ -1 +0,0 @@
-python-stevedore
\ No newline at end of file
diff --git a/srcpkgs/python-stevedore/template b/srcpkgs/python3-stevedore/template
similarity index 52%
rename from srcpkgs/python-stevedore/template
rename to srcpkgs/python3-stevedore/template
index 4f781304d3f..481dc073397 100644
--- a/srcpkgs/python-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,14 +1,14 @@
-# Template file for 'python-stevedore'
-pkgname=python-stevedore
+# Template file for 'python3-stevedore'
+pkgname=python3-stevedore
version=1.30.1
revision=2
archs=noarch
wrksrc="stevedore-${version}"
-build_style=python-module
+build_style=python3-module
pycompile_module="stevedore"
-hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"
-depends="python-six"
-short_desc="Manage dynamic plugins for Python2 applications"
+hostmakedepends="python3-setuptools python3-pbr"
+depends="python3-six"
+short_desc="Manage dynamic plugins for Python3 applications"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="Apache-2.0"
homepage="https://git.openstack.org/cgit/openstack/stevedore"
@@ -19,13 +19,3 @@ pre_build() {
# remove dependency on pbr; it's not a runtime dependency
sed -i '/pbr/d' requirements.txt
}
-
-python3-stevedore_package() {
- archs=noarch
- depends="python3-six"
- pycompile_module="stevedore"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 2925b473036d3a6ff485338098613c7a1a075cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 27 Aug 2020 19:37:18 +0200
Subject: [PATCH 2/3] python3-stevedore: update to 3.2.0.
---
srcpkgs/python3-stevedore/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-stevedore/template b/srcpkgs/python3-stevedore/template
index 481dc073397..2b23d77c09b 100644
--- a/srcpkgs/python3-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,11 +1,10 @@
# Template file for 'python3-stevedore'
pkgname=python3-stevedore
-version=1.30.1
-revision=2
+version=3.2.0
+revision=1
archs=noarch
wrksrc="stevedore-${version}"
build_style=python3-module
-pycompile_module="stevedore"
hostmakedepends="python3-setuptools python3-pbr"
depends="python3-six"
short_desc="Manage dynamic plugins for Python3 applications"
@@ -13,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="Apache-2.0"
homepage="https://git.openstack.org/cgit/openstack/stevedore"
distfiles="${PYPI_SITE}/s/stevedore/stevedore-${version}.tar.gz"
-checksum=7be098ff53d87f23d798a7ce7ae5c31f094f3deb92ba18059b1aeb1ca9fec0a0
+checksum=38791aa5bed922b0a844513c5f9ed37774b68edc609e5ab8ab8d8fe0ce4315e5
pre_build() {
# remove dependency on pbr; it's not a runtime dependency
From 1108e34a572e7e2021ceac73cefa18c18041eff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 26 Aug 2020 21:09:17 +0200
Subject: [PATCH 3/3] python-subliminal: replace with python3-subliminal
---
srcpkgs/python-subliminal | 1 +
srcpkgs/python-subliminal/template | 39 -----------------------------
srcpkgs/python3-subliminal | 1 -
srcpkgs/python3-subliminal/template | 34 +++++++++++++++++++++++++
4 files changed, 35 insertions(+), 40 deletions(-)
create mode 120000 srcpkgs/python-subliminal
delete mode 100644 srcpkgs/python-subliminal/template
delete mode 120000 srcpkgs/python3-subliminal
create mode 100644 srcpkgs/python3-subliminal/template
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
new file mode 120000
index 00000000000..e258570e09f
--- /dev/null
+++ b/srcpkgs/python-subliminal
@@ -0,0 +1 @@
+python3-subliminal
\ No newline at end of file
diff --git a/srcpkgs/python-subliminal/template b/srcpkgs/python-subliminal/template
deleted file mode 100644
index 74dcf00ebdd..00000000000
--- a/srcpkgs/python-subliminal/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-subliminal'
-pkgname=python-subliminal
-version=2.1.0
-revision=2
-archs=noarch
-wrksrc="subliminal-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-guessit python-babelfish python-enzyme
- python-BeautifulSoup4 python-requests python-click python-dogpile.cache
- python-stevedore python-chardet python-pysrt python-six python-appdirs
- python-rarfile python-pytz"
-short_desc="Subtitles, faster than your thoughts (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="MIT"
-homepage="http://subliminal.readthedocs.org"
-changelog="https://github.com/Diaoul/subliminal/blob/master/HISTORY.rst"
-distfiles="${PYPI_SITE}/s/subliminal/subliminal-${version}.tar.gz"
-checksum=c6439cc733a4f37f01f8c14c096d44fd28d75d1f6f6e2d1d1003b1b82c65628b
-alternatives="subliminal:subliminal:/usr/bin/subliminal2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-subliminal_package() {
- archs=noarch
- depends="python3 python3-guessit python3-babelfish python3-enzyme
- python3-BeautifulSoup4 python3-requests python3-click python3-dogpile.cache
- python3-stevedore python3-chardet python3-pysrt python3-six python3-appdirs
- python3-rarfile python3-pytz"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="subliminal:subliminal:/usr/bin/subliminal3"
- pkg_install() {
- vmove usr/bin/subliminal3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-subliminal b/srcpkgs/python3-subliminal
deleted file mode 120000
index 65210ec26fd..00000000000
--- a/srcpkgs/python3-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-python-subliminal
\ No newline at end of file
diff --git a/srcpkgs/python3-subliminal/template b/srcpkgs/python3-subliminal/template
new file mode 100644
index 00000000000..42e53395a13
--- /dev/null
+++ b/srcpkgs/python3-subliminal/template
@@ -0,0 +1,34 @@
+# Template file for 'python3-subliminal'
+pkgname=python3-subliminal
+version=2.1.0
+revision=3
+archs=noarch
+wrksrc="subliminal-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-guessit python3-babelfish python3-enzyme
+ python3-BeautifulSoup4 python3-requests python3-click python3-dogpile.cache
+ python3-stevedore python3-chardet python3-pysrt python3-six python3-appdirs
+ python3-rarfile python3-pytz"
+short_desc="Subtitles, faster than your thoughts"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="MIT"
+homepage="https://subliminal.readthedocs.org"
+changelog="https://github.com/Diaoul/subliminal/blob/master/HISTORY.rst"
+distfiles="${PYPI_SITE}/s/subliminal/subliminal-${version}.tar.gz"
+checksum=c6439cc733a4f37f01f8c14c096d44fd28d75d1f6f6e2d1d1003b1b82c65628b
+
+do_check() {
+ : # pypi tarball has no tests
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+python-subliminal_package() {
+ archs=noarch
+ build_style=meta
+ depends="python3-subliminal"
+ short_desc+=" (transitional dummy package)"
+}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] Remove python-subliminal, python-stevedore
2020-08-27 17:54 [PR PATCH] Remove python-subliminal, python-stevedore Chocimier
@ 2020-09-02 20:16 ` Chocimier
2020-09-02 20:17 ` [PR PATCH] [Merged]: " Chocimier
2020-09-02 20:17 ` Chocimier
2 siblings, 0 replies; 4+ messages in thread
From: Chocimier @ 2020-09-02 20:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 431 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org subliminal
https://github.com/void-linux/void-packages/pull/24513
Remove python-subliminal, python-stevedore
Subliminal depends on stevedore>=3 and dogpile.cache, that do not work anymore with py2.
A patch file from https://github.com/void-linux/void-packages/pull/24513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subliminal-24513.patch --]
[-- Type: text/x-diff, Size: 3481 bytes --]
From 0ec0204cce4638cbce140028b24b9a7ecce743bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 27 Aug 2020 19:13:55 +0200
Subject: [PATCH 1/2] python-stevedore: remove
---
srcpkgs/python3-stevedore | 1 -
.../template | 22 +++++--------------
2 files changed, 6 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-stevedore
rename srcpkgs/{python-stevedore => python3-stevedore}/template (52%)
diff --git a/srcpkgs/python3-stevedore b/srcpkgs/python3-stevedore
deleted file mode 120000
index 8b75fb5ae1b..00000000000
--- a/srcpkgs/python3-stevedore
+++ /dev/null
@@ -1 +0,0 @@
-python-stevedore
\ No newline at end of file
diff --git a/srcpkgs/python-stevedore/template b/srcpkgs/python3-stevedore/template
similarity index 52%
rename from srcpkgs/python-stevedore/template
rename to srcpkgs/python3-stevedore/template
index 4f781304d3f..481dc073397 100644
--- a/srcpkgs/python-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,14 +1,14 @@
-# Template file for 'python-stevedore'
-pkgname=python-stevedore
+# Template file for 'python3-stevedore'
+pkgname=python3-stevedore
version=1.30.1
revision=2
archs=noarch
wrksrc="stevedore-${version}"
-build_style=python-module
+build_style=python3-module
pycompile_module="stevedore"
-hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"
-depends="python-six"
-short_desc="Manage dynamic plugins for Python2 applications"
+hostmakedepends="python3-setuptools python3-pbr"
+depends="python3-six"
+short_desc="Manage dynamic plugins for Python3 applications"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="Apache-2.0"
homepage="https://git.openstack.org/cgit/openstack/stevedore"
@@ -19,13 +19,3 @@ pre_build() {
# remove dependency on pbr; it's not a runtime dependency
sed -i '/pbr/d' requirements.txt
}
-
-python3-stevedore_package() {
- archs=noarch
- depends="python3-six"
- pycompile_module="stevedore"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From aed3b728f8268978027655c66c98d9ec2b025819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 27 Aug 2020 19:37:18 +0200
Subject: [PATCH 2/2] python3-stevedore: update to 3.2.0.
---
srcpkgs/python3-stevedore/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-stevedore/template b/srcpkgs/python3-stevedore/template
index 481dc073397..2b23d77c09b 100644
--- a/srcpkgs/python3-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,11 +1,10 @@
# Template file for 'python3-stevedore'
pkgname=python3-stevedore
-version=1.30.1
-revision=2
+version=3.2.0
+revision=1
archs=noarch
wrksrc="stevedore-${version}"
build_style=python3-module
-pycompile_module="stevedore"
hostmakedepends="python3-setuptools python3-pbr"
depends="python3-six"
short_desc="Manage dynamic plugins for Python3 applications"
@@ -13,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="Apache-2.0"
homepage="https://git.openstack.org/cgit/openstack/stevedore"
distfiles="${PYPI_SITE}/s/stevedore/stevedore-${version}.tar.gz"
-checksum=7be098ff53d87f23d798a7ce7ae5c31f094f3deb92ba18059b1aeb1ca9fec0a0
+checksum=38791aa5bed922b0a844513c5f9ed37774b68edc609e5ab8ab8d8fe0ce4315e5
pre_build() {
# remove dependency on pbr; it's not a runtime dependency
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: Remove python-subliminal, python-stevedore
2020-08-27 17:54 [PR PATCH] Remove python-subliminal, python-stevedore Chocimier
2020-09-02 20:16 ` [PR PATCH] [Updated] " Chocimier
@ 2020-09-02 20:17 ` Chocimier
2020-09-02 20:17 ` Chocimier
2 siblings, 0 replies; 4+ messages in thread
From: Chocimier @ 2020-09-02 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
There's a merged pull request on the void-packages repository
Remove python-subliminal, python-stevedore
https://github.com/void-linux/void-packages/pull/24513
Description:
Subliminal depends on stevedore>=3 and dogpile.cache, that do not work anymore with py2.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Remove python-subliminal, python-stevedore
2020-08-27 17:54 [PR PATCH] Remove python-subliminal, python-stevedore Chocimier
2020-09-02 20:16 ` [PR PATCH] [Updated] " Chocimier
2020-09-02 20:17 ` [PR PATCH] [Merged]: " Chocimier
@ 2020-09-02 20:17 ` Chocimier
2 siblings, 0 replies; 4+ messages in thread
From: Chocimier @ 2020-09-02 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24513#issuecomment-685973241
Comment:
Subliminal changes done in #24471
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-02 20:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27 17:54 [PR PATCH] Remove python-subliminal, python-stevedore Chocimier
2020-09-02 20:16 ` [PR PATCH] [Updated] " Chocimier
2020-09-02 20:17 ` [PR PATCH] [Merged]: " Chocimier
2020-09-02 20:17 ` Chocimier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).