summaryrefslogtreecommitdiff
path: root/dev-python/jsonmerge
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-python/jsonmerge
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'dev-python/jsonmerge')
-rw-r--r--dev-python/jsonmerge/Manifest4
-rw-r--r--dev-python/jsonmerge/jsonmerge-1.6.0.ebuild24
-rw-r--r--dev-python/jsonmerge/jsonmerge-1.8.0.ebuild2
3 files changed, 2 insertions, 28 deletions
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 50b5338446c2..4890a0c3f4b8 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,5 +1,3 @@
-DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
-EBUILD jsonmerge-1.6.0.ebuild 628 BLAKE2B 775cb6cfa5dbb036461408fb3d00fee2ab5cc861352ff1dcbdc5c0038b54b19dbf7e883a8a630284c197a5fc6468a5f41d1e155108b0b90cbd2d943360fdf410 SHA512 769547cb8ee16cae1748d96f1ce3a9b4c45f1b85a4f905e128820b56b8f9746588127347e5ca62d08cbf5755ac5a31aae6b4d6ddbb41e7f127cf322b70ded1c5
-EBUILD jsonmerge-1.8.0.ebuild 482 BLAKE2B 4b2f9cac28ec1a7c3559c175d93d4efa93e2c5193343bcf6628223187cb399e9afa3b67a68008aba89bb224c8f882a057cc8fd50afb064552bd1498f8bcef2a9 SHA512 9faaeedec20e9bebea5a1c765f190b1e4d4e1f324b9ba0c4f20a02548c9058b56341b0e0c0bf73e53c9018dd38e656d1964d49347de6c81f155c0440bf2f225c
+EBUILD jsonmerge-1.8.0.ebuild 483 BLAKE2B 85a780ce7263ef37eeaac972701ee5e256acdac30ebc23047112664659ecef75b8dec70d8185ab842d93632a6173e37eb73869f30d6ab3763d4858831830e68d SHA512 8a74e746f502e13ca3de0496bdbd7500d4bc8e004bfb9be84c17032178b1fb63e079d28e2bdcabeefe89dcffbd96c05719102d838c70b132edffcbb66b8e9410
MISC metadata.xml 473 BLAKE2B 3a28d55fd85b68e566c37040b5b0d966da02b285584cd0025b6501b07cfc5f8c340d0e14bd9cf8b1510e44dd5f4be8f6d9c01ecc4d82240c23d051cd69c4a73b SHA512 e517efb4a97e559a940691db5b1eaa182ba4816bdaf971fee350f4601998d9ce608afb6d670a36a556529860805b24b37e01757455ce251b7461119b2f8b9ad0
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 d43fe240f3fa..000000000000
--- 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
-}
diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
index afaa5a495335..77669b0333dd 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