* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2020-12-17 8:48 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-12-17 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 16f122039ae676bd73619223fb0c3294b744f590
Author: Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Wed Dec 9 07:04:46 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 08:48:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f12203
dev-vcs/git-cola: add py3.8, fix qa warnings
Bug: https://bugs.gentoo.org/750068
Bug: https://bugs.gentoo.org/713930
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/18576
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/git-cola-3.5-py3.8-line-buffering.patch | 29 ++++++++++++++++++++++
dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 8 +++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
new file mode 100644
index 00000000000..4938d6a30ec
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
@@ -0,0 +1,29 @@
+From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001
+From: Simon Peeters <peeters.simon@gmail.com>
+Date: Mon, 18 Nov 2019 21:15:32 +0100
+Subject: [PATCH] Only use line buffering in text mode when calling Popen
+
+Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled.
+So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode.
+
+see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize
+---
+ cola/core.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cola/core.py b/cola/core.py
+index 0fabfcf3d..5ad719f05 100644
+--- a/cola/core.py
++++ b/cola/core.py
+@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None,
+ CREATE_NO_WINDOW = 0x08000000
+ extra['creationflags'] = CREATE_NO_WINDOW
+
+- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout,
++ # Use line buffering when in text/universal_newlines mode,
++ # otherwise use the system default buffer size.
++ bufsize = 1 if universal_newlines else -1
++ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout,
+ stderr=stderr, cwd=cwd, env=env,
+ universal_newlines=universal_newlines, **extra)
+
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 0c0122bcd5b..e6a1500ea82 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,8 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,8} )
DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
DESCRIPTION="The highly caffeinated git GUI"
@@ -37,6 +38,8 @@ BDEPEND="sys-devel/gettext
)
")"
+PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
+
python_prepare_all() {
# make sure that tests also use the system provided QtPy
rm -r qtpy || die
@@ -95,6 +98,9 @@ python_install_all() {
python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
python_optimize "${ED}/usr/share/git-cola/lib/cola"
+ # fix appdata installation
+ mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed"
+
use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
distutils-r1_python_install_all
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2023-12-23 17:31 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-12-23 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 32235eb79dd29af102e4c5a654a928013ece57b1
Author: Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Dec 23 15:08:16 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:30:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32235eb7
dev-vcs/git-cola: 4.2.1: fix setuptools-69 breakage
See also: https://github.com/git-cola/git-cola/commit/b53983c7fa7d29dd6f474177015fcb6f2ee0e6d1
Bug: https://bugs.gentoo.org/920534
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/git-cola-4.2.1-fix-setuptools.patch | 24 ++++++++++++++++++++++
...-cola-4.2.1.ebuild => git-cola-4.2.1-r1.ebuild} | 2 ++
2 files changed, 26 insertions(+)
diff --git a/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch b/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch
new file mode 100644
index 000000000000..d1453c3f163e
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch
@@ -0,0 +1,24 @@
+From b53983c7fa7d29dd6f474177015fcb6f2ee0e6d1 Mon Sep 17 00:00:00 2001
+From: David Aguilar <davvid@gmail.com>
+Date: Thu, 2 Nov 2023 01:33:16 -0700
+Subject: [PATCH] pyproject.toml: list dependencies and optional-dependencies
+ as dynamic
+
+Signed-off-by: David Aguilar <davvid@gmail.com>
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 20b3008e0..97cdf79b4 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -13,7 +13,7 @@ classifiers = [
+ "Topic :: Software Development :: Version Control :: Git",
+ ]
+ description = "A sleek and powerful Git GUI"
+-dynamic = ["version"]
++dynamic = ["dependencies", "optional-dependencies", "version"]
+ license = {file = "COPYING"}
+ readme = "README.md"
+
diff --git a/dev-vcs/git-cola/git-cola-4.2.1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
similarity index 94%
rename from dev-vcs/git-cola/git-cola-4.2.1.ebuild
rename to dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
index 79239901785f..14d1a8b01c21 100644
--- a/dev-vcs/git-cola/git-cola-4.2.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
@@ -38,6 +38,8 @@ BDEPEND="sys-devel/gettext
)
")
"
+# https://bugs.gentoo.org/920534
+PATCHES=( "${FILESDIR}/${P}-fix-setuptools.patch" )
distutils_enable_sphinx docs \
'dev-python/rst-linker'
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2020-03-22 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-03-22 14:40 UTC (permalink / raw
To: gentoo-commits
commit: ed1b085d33de5c49e39063494812d6053dbc4cf7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 14:10:24 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 14:40:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1b085d
dev-vcs/git-cola: Drop 2.11-r1 and 3.2
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-vcs/git-cola/Manifest | 2 -
.../files/git-cola-2.10-disable-live-tests.patch | 24 -----
dev-vcs/git-cola/git-cola-2.11-r1.ebuild | 108 ---------------------
dev-vcs/git-cola/git-cola-3.2.ebuild | 103 --------------------
4 files changed, 237 deletions(-)
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 254c0bbae08..2138bce0be7 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1 @@
-DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
-DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
diff --git a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
deleted file mode 100644
index 1f58ea0eddb..00000000000
--- a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/test/git_test.py b/test/git_test.py
-index 9f812b2..ff7da24 100644
---- a/test/git_test.py
-+++ b/test/git_test.py
-@@ -53,19 +53,6 @@ class GitCommandTest(unittest.TestCase):
- version = self.git.version()[STDOUT]
- self.failUnless(version.startswith('git version'))
-
-- def test_tag(self):
-- """Test running 'git tag'"""
-- tags = self.git.tag()[STDOUT].splitlines()
-- if os.getenv('GIT_COLA_NO_HISTORY', False):
-- return
-- self.failUnless('v1.0.0' in tags)
--
-- def test_show(self):
-- """Test running 'git show'"""
-- oid = 'HEAD'
-- content = self.git.show(oid)[STDOUT]
-- self.failUnless(content.startswith('commit '))
--
- def test_stdout(self):
- """Test overflowing the stdout buffer"""
- # Write to stdout only
diff --git a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
deleted file mode 100644
index f0df3414753..00000000000
--- a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo-r1 virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# Since PyQt5 is preferred at runtime if installed, depend on that
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
- dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
- dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}]
- ')
- dev-vcs/git"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- $(python_gen_cond_dep "
- doc? (
- dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
- )
- test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} )
- ")
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
-)
-
-python_prepare_all() {
- # Use system QtPy
- rm -r qtpy || die
-
- rm share/git-cola/bin/*askpass* || die
-
- # remove broken tests
- rm test/i18n_test.py || die
-
- # don't install docs into wrong location
- sed -i -e '/doc/d' setup.py || die
-
- # fix doc directory reference
- sed -i \
- -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
- cola/resources.py || die
-
- # fix ssh-askpass directory reference
- sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
- cd share/doc/${PN}/ || die
- if use doc; then
- emake all
- else
- sed \
- -e '/^install:/s:install-html::g' \
- -e '/^install:/s:install-man::g' \
- -i Makefile || die
- fi
-}
-
-python_test() {
- PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
- virtx nosetests --verbose --with-id --with-doctest \
- --exclude=sphinxtogithub
-}
-
-src_install() {
- distutils-r1_src_install
-}
-
-python_install_all() {
- cd share/doc/${PN}/ || die
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}/usr/share/doc/${PF}" \
- prefix="${EPREFIX}/usr" \
- install
-
- python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
- python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
- use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
- distutils-r1_python_install_all
- readme.gentoo_create_doc
-}
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
deleted file mode 100644
index 1d8dcb00b08..00000000000
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo-r1 virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
- ')
- dev-vcs/git"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- $(python_gen_cond_dep "
- doc? (
- dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
- )
- test? (
- ${VIRTUALX_DEPEND}
- dev-python/nose[\${PYTHON_MULTI_USEDEP}]
- dev-python/mock[\${PYTHON_MULTI_USEDEP}]
- )
- ")"
-
-python_prepare_all() {
- # make sure that tests also use the system provided QtPy
- rm -r qtpy || die
-
- rm share/git-cola/bin/*askpass* || die
-
- # don't install docs into wrong location
- sed -i -e '/doc/d' setup.py || die
-
- # fix doc directory reference
- sed -i \
- -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
- cola/resources.py || die
-
- # fix ssh-askpass directory reference
- sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
- cd share/doc/${PN}/ || die
- if use doc ; then
- emake all
- else
- sed \
- -e '/^install:/s:install-html::g' \
- -e '/^install:/s:install-man::g' \
- -i Makefile || die
- fi
-}
-
-python_test() {
- PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
- virtx nosetests --verbose --with-id --with-doctest \
- --exclude=sphinxtogithub
-}
-
-src_install() {
- distutils-r1_src_install
-}
-
-python_install_all() {
- cd share/doc/${PN}/ || die
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}/usr/share/doc/${PF}" \
- prefix="${EPREFIX}/usr" \
- install
-
- python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
- python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
- use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
- distutils-r1_python_install_all
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-23 17:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-17 8:48 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-12-23 17:31 Sam James
2020-03-22 14:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox