public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2016-08-30 20:18 Zac Medico
  0 siblings, 0 replies; 22+ messages in thread
From: Zac Medico @ 2016-08-30 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     66cfdcb59784b5c5d4fe75d4af2900faf2082e75
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 20:18:05 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 20:18:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cfdcb5

dev-python/jsonmerge: PYTHON_COMPAT: add python3_5

Package-Manager: portage-2.3.0

 dev-python/jsonmerge/jsonmerge-1.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
index bcd01c6..c4b8999 100644
--- a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{3,4}} )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2017-03-15  9:08 Zac Medico
  0 siblings, 0 replies; 22+ messages in thread
From: Zac Medico @ 2017-03-15  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f910a126c4e278cff37a61243b2be8ed87e6d094
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 09:07:28 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 09:08:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f910a126

dev-python/jsonmerge: Add python3_6 to PYTHON_COMPAT

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-python/jsonmerge/jsonmerge-1.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
index 69b13a6ba70..15ccdb315da 100644
--- a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2017-04-07  0:15 Manuel Rüger
  0 siblings, 0 replies; 22+ messages in thread
From: Manuel Rüger @ 2017-04-07  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     dff07a9e6c9a582d63561492d8fcd6fe112d190f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 00:15:22 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 00:15:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff07a9e

dev-python/jsonmerge: Version bump to 1.3.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.3.0.ebuild | 26 ++++++++++++++++++++++++++
 dev-python/jsonmerge/metadata.xml           |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index d8611c680f8..8e88587222d 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.1.0.tar.gz 12556 SHA256 2ae73a058474e75f27d4ac2595d9da28084ae42be506f04d077ccea3a853b921 SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94 WHIRLPOOL 610597ffb82cc1cf92d40e2c54fe4877c6e38431611855328a6dba5246f2e12420cf7994e00b296a7880588cc4976df62e359e78b6402ec74275d4f343d8618a
+DIST jsonmerge-1.3.0.tar.gz 16569 SHA256 422d3373905270d4ad53530e1bc184c8b8ab1934853b9108b14ec71c69c2e484 SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32 WHIRLPOOL 7eca6661c1a142dc8483ebdf2247f64851d517c51d6fa3c0ade9463f2e354d35fe6f594ecddfebdbc98934128379c386ca67bc22b7a6ed712d8cb4873d01556d

diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
new file mode 100644
index 00000000000..22627bb346c
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# See https://github.com/avian2/jsonmerge/issues/20
+REPEND="<=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}

diff --git a/dev-python/jsonmerge/metadata.xml b/dev-python/jsonmerge/metadata.xml
index bf01833be6d..d4bd319f27b 100644
--- a/dev-python/jsonmerge/metadata.xml
+++ b/dev-python/jsonmerge/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<upstream>
 		<remote-id type="pypi">jsonmerge</remote-id>
-		<remote-id type="github">omergertel/jsonmerge</remote-id>
+		<remote-id type="github">avian2/jsonmerge</remote-id>
 	</upstream>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2017-06-12 12:20 Manuel Rüger
  0 siblings, 0 replies; 22+ messages in thread
From: Manuel Rüger @ 2017-06-12 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     875040b7614ea4b95eccbb3b133d36f0edfb0bb1
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 12:19:36 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 12:19:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875040b7

dev-python/jsonmerge: Version bump to 1.4.0

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.4.0.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 8e88587222d..8b5944077bb 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1,3 @@
 DIST jsonmerge-1.1.0.tar.gz 12556 SHA256 2ae73a058474e75f27d4ac2595d9da28084ae42be506f04d077ccea3a853b921 SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94 WHIRLPOOL 610597ffb82cc1cf92d40e2c54fe4877c6e38431611855328a6dba5246f2e12420cf7994e00b296a7880588cc4976df62e359e78b6402ec74275d4f343d8618a
 DIST jsonmerge-1.3.0.tar.gz 16569 SHA256 422d3373905270d4ad53530e1bc184c8b8ab1934853b9108b14ec71c69c2e484 SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32 WHIRLPOOL 7eca6661c1a142dc8483ebdf2247f64851d517c51d6fa3c0ade9463f2e354d35fe6f594ecddfebdbc98934128379c386ca67bc22b7a6ed712d8cb4873d01556d
+DIST jsonmerge-1.4.0.tar.gz 17953 SHA256 b4513d8361496508fa642feb8097a60e9fd692a0c10c7370fea592c1f64fe4f3 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122 WHIRLPOOL 642677fd37fd7c2769a9b5a630d0cab70ca5bd36c41ebc31e39452b8c0696806b3b0806f09a8b22a36db11218ec6c6cefb1548c22739f5a2687fd5c8834cfab6

diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
new file mode 100644
index 00000000000..e6ef174e734
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2019-05-08 22:58 Patrick McLean
  0 siblings, 0 replies; 22+ messages in thread
From: Patrick McLean @ 2019-05-08 22:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8008f344c3de253b9fe5138811cf16089f2d0e5f
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed May  8 22:55:04 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May  8 22:58:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8008f344

dev-python/jsonmerge: Version bump to 1.6.0

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.6.0.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index acaf328e1c5..7a648c9543a 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,3 +1,4 @@
 DIST jsonmerge-1.1.0.tar.gz 12556 BLAKE2B 52039cb1ca349ad9e74cb0bd835796b4e211a2f4cb1eda063e9b3a06efc2dfa8ac1fdab34a3d75bb069dd527c777c086b72b987e4e4149a45eb4593eff6b79ca SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94
 DIST jsonmerge-1.3.0.tar.gz 16569 BLAKE2B 19ec00c06379ac74e18c9a0e0542532e7c9691ca187f189b97252d3265dd80f0584c5495021dff790c44e7fd95571a368f8db008ec30252322a927306e8749fa SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32
 DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
+DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db

diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
new file mode 100644
index 00000000000..fa454e60a61
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+BDEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2019-05-08 22:58 Patrick McLean
  0 siblings, 0 replies; 22+ messages in thread
From: Patrick McLean @ 2019-05-08 22:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ee4de141c82844c5bdffb2031542927245f6b625
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed May  8 22:56:53 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May  8 22:58:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4de141

dev-python/jsonmerge: Drop old

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  2 --
 dev-python/jsonmerge/jsonmerge-1.1.0.ebuild | 25 -------------------------
 dev-python/jsonmerge/jsonmerge-1.3.0.ebuild | 26 --------------------------
 3 files changed, 53 deletions(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 7a648c9543a..329175d2b4f 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,4 +1,2 @@
-DIST jsonmerge-1.1.0.tar.gz 12556 BLAKE2B 52039cb1ca349ad9e74cb0bd835796b4e211a2f4cb1eda063e9b3a06efc2dfa8ac1fdab34a3d75bb069dd527c777c086b72b987e4e4149a45eb4593eff6b79ca SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94
-DIST jsonmerge-1.3.0.tar.gz 16569 BLAKE2B 19ec00c06379ac74e18c9a0e0542532e7c9691ca187f189b97252d3265dd80f0584c5495021dff790c44e7fd95571a368f8db008ec30252322a927306e8749fa SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32
 DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db

diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
deleted file mode 100644
index b082e6dc719..00000000000
--- a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents."
-HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}

diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
deleted file mode 100644
index dc713b9ca07..00000000000
--- a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# See https://github.com/avian2/jsonmerge/issues/20
-REPEND="<=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2020-03-27 20:22 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2020-03-27 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     62b62eeba8d014149123abc90170e485df8ecbfd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 20:07:46 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 20:22:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b62eeb

dev-python/jsonmerge: Remove redundant versions

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 -
 dev-python/jsonmerge/jsonmerge-1.4.0.ebuild | 25 -------------------------
 2 files changed, 26 deletions(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 329175d2b4f..f14e1048f30 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1 @@
-DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db

diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
deleted file mode 100644
index eaf6ca23067..00000000000
--- a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2020-07-20 13:01 Joonas Niilola
  0 siblings, 0 replies; 22+ messages in thread
From: Joonas Niilola @ 2020-07-20 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d46277d3d18815a9bad1c5204b274cd33ed10bf7
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 12:44:50 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 13:01:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46277d3

dev-python/jsonmerge: fix RDEPEND typo in 1.6.0

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index 6b51191e57a..026e94237c3 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${REPEND}
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2020-11-17 17:43 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2020-11-17 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5a2249715bdaf530d3d302c010ee3afbc22d32d0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 17:06:34 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 17:43:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a224971

dev-python/jsonmerge: Port up to py3.9

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.6.0.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index 026e94237c3..0b6758ccdcd 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
 
 python_test() {
 	PYTHONPATH="${PWD}" python -m unittest \


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2021-01-23 23:30 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2021-01-23 23:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a977fa7d737a3c7f8d3eb075a84588b1cfb7301d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 23:26:02 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 23:30:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a977fa7d

dev-python/jsonmerge: Bump to 1.8.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.8.0.ebuild | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index f14e1048f30..bdedc035128 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
+DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
new file mode 100644
index 00000000000..afaa5a49533
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2021-01-23 23:30 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2021-01-23 23:30 UTC (permalink / raw
  To: gentoo-commits

commit:     50a3630bbd272036536bdbf6ea1a80f3e6493df4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 23:26:16 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 23:30:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a3630b

dev-python/jsonmerge: Add python@ as co-maint

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-python/jsonmerge/metadata.xml b/dev-python/jsonmerge/metadata.xml
index d4bd319f27b..0c2b72c49a4 100644
--- a/dev-python/jsonmerge/metadata.xml
+++ b/dev-python/jsonmerge/metadata.xml
@@ -9,4 +9,8 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2021-06-05 14:17 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2021-06-05 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e28fb7b2c0f8c05703a766469bf92fe9e3584623
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  5 14:12:05 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 14:17:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e28fb7b2

dev-python/jsonmerge: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 -
 dev-python/jsonmerge/jsonmerge-1.6.0.ebuild | 24 ------------------------
 2 files changed, 25 deletions(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index bdedc035128..fd95b7f52f3 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1 @@
-DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3

diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
deleted file mode 100644
index d43fe240f3f..00000000000
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2021-06-05 14:17 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2021-06-05 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     acccb2f96939b60609571847b2c20ba73a6d3f31
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  5 14:11:54 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 14:17:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acccb2f9

dev-python/jsonmerge: Enable py3.10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
index afaa5a49533..77669b0333d 100644
--- a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2022-05-25 18:42 Arthur Zamarin
  0 siblings, 0 replies; 22+ messages in thread
From: Arthur Zamarin @ 2022-05-25 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     db4ac7aa14b8b3a21e71462dc7138c89f289cedd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 18:19:04 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May 25 18:42:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4ac7aa

dev-python/jsonmerge: EAPI=8, Use PEP517

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..38b9778c4320
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2022-05-25 18:42 Arthur Zamarin
  0 siblings, 0 replies; 22+ messages in thread
From: Arthur Zamarin @ 2022-05-25 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     793e09daa998d244eae30ba80deea5b741f34368
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 18:32:05 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May 25 18:42:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793e09da

dev-python/jsonmerge: enable py3.11

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
index 38b9778c4320..99a77c5d342c 100644
--- a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Merge a series of JSON documents"


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2022-06-16  8:06 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2022-06-16  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e8259ae2826e0a6f5bf2a4366b55698347a473e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 08:06:04 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 08:06:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8259ae2

dev-python/jsonmerge: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.8.0.ebuild | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
deleted file mode 100644
index 77669b0333dd..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2022-11-03  5:33 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2022-11-03  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2c663cf09094e03bdda5068e1626806aaf612e4f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 04:43:05 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 05:32:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c663cf0

dev-python/jsonmerge: Bump to 1.9.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.9.0.ebuild | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index fd95b7f52f33..24e658b361ec 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
+DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1

diff --git a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
new file mode 100644
index 000000000000..01b11ec9adb6
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="
+	https://github.com/avian2/jsonmerge/
+	https://pypi.org/project/jsonmerge/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2022-11-14  4:39 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2022-11-14  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d85c42eac67f0dfcc5639e1745539a1eb3db7992
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 04:36:48 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 04:36:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85c42ea

dev-python/jsonmerge: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest                  |  1 -
 dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild | 20 --------------------
 2 files changed, 21 deletions(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 24e658b361ec..d0d0cc0aded3 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1 @@
-DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
 DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1

diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
deleted file mode 100644
index 99a77c5d342c..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2023-03-16  3:56 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2023-03-16  3:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8d02a0563bbac187eecd6e731b4758024a2b35fa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 17:46:21 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 03:51:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d02a056

dev-python/jsonmerge: Use pypi.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.9.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
index 81bd2f38d75d..63fde4066ae8 100644
--- a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Merge a series of JSON documents"
 HOMEPAGE="
 	https://github.com/avian2/jsonmerge/
 	https://pypi.org/project/jsonmerge/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2023-07-23  6:53 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2023-07-23  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     23e4e0a78c4a92005d5b9c390474f201599a5942
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 06:35:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 06:53:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e4e0a7

dev-python/jsonmerge: Bump to 1.9.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.9.2.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index d0d0cc0aded3..2fba8fc7d49b 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1
+DIST jsonmerge-1.9.2.tar.gz 34717 BLAKE2B 651e6c745c651882b54c4bd46bd658de20fd0cdd90b2e05af8396a55c68efffc2fe5d4758891151db8df79cdfb118b94a6af11c7d0648fbfcbde510283585556 SHA512 cba0c2b0f3d5ff70f7680768a036a10a1d7464da9a4693a5a836fbcb9f7dba080ec041c34b351f843a4c38fb2e45c4c845a3c5453df35e1b51e1a65b245071f8

diff --git a/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
new file mode 100644
index 000000000000..059f3dc68c7d
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
@@ -0,0 +1,25 @@
+# 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="
+	https://github.com/avian2/jsonmerge/
+	https://pypi.org/project/jsonmerge/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2023-07-24 11:32 Michał Górny
  0 siblings, 0 replies; 22+ messages in thread
From: Michał Górny @ 2023-07-24 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ab8ca22aeeee323e60fa33157b6945a363dc2a5b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 11:18:59 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 11:31:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8ca22a

dev-python/jsonmerge: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonmerge/Manifest               |  1 -
 dev-python/jsonmerge/jsonmerge-1.9.0.ebuild | 25 -------------------------
 2 files changed, 26 deletions(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 2fba8fc7d49b..27f51e68b787 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1 @@
-DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1
 DIST jsonmerge-1.9.2.tar.gz 34717 BLAKE2B 651e6c745c651882b54c4bd46bd658de20fd0cdd90b2e05af8396a55c68efffc2fe5d4758891151db8df79cdfb118b94a6af11c7d0648fbfcbde510283585556 SHA512 cba0c2b0f3d5ff70f7680768a036a10a1d7464da9a4693a5a836fbcb9f7dba080ec041c34b351f843a4c38fb2e45c4c845a3c5453df35e1b51e1a65b245071f8

diff --git a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
deleted file mode 100644
index 63fde4066ae8..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="
-	https://github.com/avian2/jsonmerge/
-	https://pypi.org/project/jsonmerge/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/
@ 2024-06-17 12:41 Petr Vaněk
  0 siblings, 0 replies; 22+ messages in thread
From: Petr Vaněk @ 2024-06-17 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     97e6fb02ac382706c08444701ab17aa63cb11a97
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 12:28:09 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 12:40:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e6fb02

dev-python/jsonmerge: enable py3.13

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-python/jsonmerge/jsonmerge-1.9.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
index 059f3dc68c7d..8002cd5cc257 100644
--- a/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.9.2.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} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-06-17 12:41 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-17 17:43 [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2024-06-17 12:41 Petr Vaněk
2023-07-24 11:32 Michał Górny
2023-07-23  6:53 Michał Górny
2023-03-16  3:56 Michał Górny
2022-11-14  4:39 Michał Górny
2022-11-03  5:33 Michał Górny
2022-06-16  8:06 Michał Górny
2022-05-25 18:42 Arthur Zamarin
2022-05-25 18:42 Arthur Zamarin
2021-06-05 14:17 Michał Górny
2021-06-05 14:17 Michał Górny
2021-01-23 23:30 Michał Górny
2021-01-23 23:30 Michał Górny
2020-07-20 13:01 Joonas Niilola
2020-03-27 20:22 Michał Górny
2019-05-08 22:58 Patrick McLean
2019-05-08 22:58 Patrick McLean
2017-06-12 12:20 Manuel Rüger
2017-04-07  0:15 Manuel Rüger
2017-03-15  9:08 Zac Medico
2016-08-30 20:18 Zac Medico

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox