* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2020-11-17 14:21 Joonas Niilola
0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2020-11-17 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 070e6aea698ba53c1d463390ffc3ed70129d88ea
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Nov 9 12:58:35 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 14:20:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070e6aea
dev-python/three-merge: lib to perform 3-way merge between strings
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-python/three-merge/Manifest | 1 +
dev-python/three-merge/metadata.xml | 16 +++++++++++++++
dev-python/three-merge/three-merge-0.1.1.ebuild | 26 +++++++++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
new file mode 100644
index 00000000000..6555f153262
--- /dev/null
+++ b/dev-python/three-merge/Manifest
@@ -0,0 +1 @@
+DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
new file mode 100644
index 00000000000..a1562d89ee7
--- /dev/null
+++ b/dev-python/three-merge/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="pypi">three-merge</remote-id>
+ <remote-id type="github">spyder-ide/three-merge</remote-id>
+ </upstream>
+ <maintainer type="person">
+ <email>andrewammerlaan@riseup.net</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
new file mode 100644
index 00000000000..a6dd1a85480
--- /dev/null
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
+HOMEPAGE="https://github.com/spyder-ide/three-merge
+ https://pypi.org/project/three-merge/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2020-12-19 19:36 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2020-12-19 19:36 UTC (permalink / raw
To: gentoo-commits
commit: a88b40b93fddbee9bc602a55c31d06e1842a1a53
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 19:35:04 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 19:35:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88b40b9
dev-python/three-merge: Stabilize 0.1.1 amd64, #760531
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index a6dd1a85480..28bd3588bca 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2020-12-20 16:30 Thomas Deutschmann
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2020-12-20 16:30 UTC (permalink / raw
To: gentoo-commits
commit: eb23808232626f936c63c57c9d6e893b5fcccf57
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 16:08:11 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 16:30:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb238082
dev-python/three-merge: x86 stable (bug #760531)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index 28bd3588bca..deba595b0fe 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2021-05-22 20:55 Andrew Ammerlaan
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2021-05-22 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 1ce518207b44a0e07d509f576f3d2633b64d1173
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 20:53:10 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat May 22 20:55:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce51820
dev-python/three-merge: add <stabilize-allarches/>
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/three-merge/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
index 3fbc59f479c..a820e4e78e4 100644
--- a/dev-python/three-merge/metadata.xml
+++ b/dev-python/three-merge/metadata.xml
@@ -9,4 +9,5 @@
<email>andrewammerlaan@gentoo.org</email>
<name>Andrew Ammerlaan</name>
</maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2021-06-05 15:10 Andrew Ammerlaan
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2021-06-05 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 4f7c97aa562d7ad604373160ebddab7e74a015f5
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 14:39:23 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 15:10:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7c97aa
dev-python/three-merge: enable py3.10
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index deba595b0fe..2d478f1a011 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2022-05-17 12:20 Andrew Ammerlaan
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2022-05-17 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 7ef58a566b303d4b649e447f803578671c7e29bb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 12:03:39 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May 17 12:19:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef58a56
dev-python/three-merge: enable py3.11 and disable py3.7
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index 2d478f1a011a..cc2bd0c6cdf5 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-05-27 19:21 Arthur Zamarin
0 siblings, 0 replies; 14+ messages in thread
From: Arthur Zamarin @ 2023-05-27 19:21 UTC (permalink / raw
To: gentoo-commits
commit: f935eda0a65444f724664927b4077019af08ca80
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 19:10:03 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 27 19:10:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f935eda0
dev-python/three-merge: EAPI=8, PEP517
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..35a2d565d516
--- /dev/null
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
+HOMEPAGE="https://github.com/spyder-ide/three-merge
+ https://pypi.org/project/three-merge/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-05-31 9:59 Michał Górny
0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2023-05-31 9:59 UTC (permalink / raw
To: gentoo-commits
commit: a9ddae173dd4f6ce551cdd6fd3c759c816bf802c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 09:55:00 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 31 09:55:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ddae17
dev-python/three-merge: Enable py3.12
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/three-merge/Manifest | 1 +
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 27 ++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 6555f1532621..8e6d20b4332f 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1 +1,2 @@
DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
+DIST three-merge-0.1.1.gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 35a2d565d516..56d7c893d3d4 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -4,24 +4,33 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
-HOMEPAGE="https://github.com/spyder-ide/three-merge
- https://pypi.org/project/three-merge/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+HOMEPAGE="
+ https://github.com/spyder-ide/three-merge/
+ https://pypi.org/project/three-merge/
+"
+SRC_URI="
+ https://github.com/spyder-ide/three-merge/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/diff-match-patch[${PYTHON_USEDEP}]
+"
-BDEPEND="test? (
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+ test? (
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ )
+"
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-07-09 16:52 Arthur Zamarin
0 siblings, 0 replies; 14+ messages in thread
From: Arthur Zamarin @ 2023-07-09 16:52 UTC (permalink / raw
To: gentoo-commits
commit: e79fcd6d9b5e8e61fd33af3968df01f5e7e09f21
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 16:51:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 16:51:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79fcd6d
dev-python/three-merge: Stabilize 0.1.1-r1 ALLARCHES, #910147
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 56d7c893d3d4..3933999a807c 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/diff-match-patch[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-07-10 1:25 Michał Górny
0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2023-07-10 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 2c50fb15928f9cd99a25014aa7841957d6a78034
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 01:24:34 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 01:24:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c50fb15
dev-python/three-merge: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/three-merge/Manifest | 1 -
dev-python/three-merge/three-merge-0.1.1.ebuild | 26 -------------------------
2 files changed, 27 deletions(-)
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 8e6d20b4332f..d615ccde7c58 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,2 +1 @@
-DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
DIST three-merge-0.1.1.gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
deleted file mode 100644
index 21f79fc691f7..000000000000
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
-HOMEPAGE="https://github.com/spyder-ide/three-merge
- https://pypi.org/project/three-merge/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
-
-BDEPEND="test? (
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-11-17 15:31 Andrew Ammerlaan
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2023-11-17 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 1f4d7a07ad223cfa4029746416a71a319bbbb2ef
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 15:31:02 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 15:31:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f4d7a07
dev-python/three-merge: enable pypy3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 3933999a807c..5e1e6321f76c 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-11-23 16:45 Arthur Zamarin
0 siblings, 0 replies; 14+ messages in thread
From: Arthur Zamarin @ 2023-11-23 16:45 UTC (permalink / raw
To: gentoo-commits
commit: f0052df492c846c63afb1d35eb10f9333982f7eb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 16:45:21 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 16:45:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0052df4
dev-python/three-merge: Keyword 0.1.1-r1 arm64, #918052
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 5e1e6321f76c..05efe52bcb0f 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND="
dev-python/diff-match-patch[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2023-11-24 15:47 Arthur Zamarin
0 siblings, 0 replies; 14+ messages in thread
From: Arthur Zamarin @ 2023-11-24 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 92de8e351d8d1dd6075a1254a087b182a71efc29
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 15:46:57 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 15:46:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92de8e35
dev-python/three-merge: Stabilize 0.1.1-r1 arm64, #918385
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 05efe52bcb0f..c2f76ff6341e 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
RDEPEND="
dev-python/diff-match-patch[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
@ 2024-05-18 10:15 Michał Górny
0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2024-05-18 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 6ca417fa28f3b74135fd030ef57ae047217e6e17
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 09:45:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 18 10:15:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca417fa
dev-python/three-merge: Enable py3.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index c2f76ff6341e..bbafa8eb561a 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-05-18 10:15 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-17 12:20 [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2024-05-18 10:15 Michał Górny
2023-11-24 15:47 Arthur Zamarin
2023-11-23 16:45 Arthur Zamarin
2023-11-17 15:31 Andrew Ammerlaan
2023-07-10 1:25 Michał Górny
2023-07-09 16:52 Arthur Zamarin
2023-05-31 9:59 Michał Górny
2023-05-27 19:21 Arthur Zamarin
2021-06-05 15:10 Andrew Ammerlaan
2021-05-22 20:55 Andrew Ammerlaan
2020-12-20 16:30 Thomas Deutschmann
2020-12-19 19:36 Sam James
2020-11-17 14:21 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox