diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
| commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
| tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-python/jsonmerge | |
| parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) | |
gentoo resync : 18.05.2019
Diffstat (limited to 'dev-python/jsonmerge')
| -rw-r--r-- | dev-python/jsonmerge/Manifest | 6 | ||||
| -rw-r--r-- | dev-python/jsonmerge/jsonmerge-1.1.0.ebuild | 25 | ||||
| -rw-r--r-- | dev-python/jsonmerge/jsonmerge-1.6.0.ebuild (renamed from dev-python/jsonmerge/jsonmerge-1.3.0.ebuild) | 9 |
3 files changed, 6 insertions, 34 deletions
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest index 82d1827000d7..d3afbf95055f 100644 --- a/dev-python/jsonmerge/Manifest +++ b/dev-python/jsonmerge/Manifest @@ -1,7 +1,5 @@ -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 -EBUILD jsonmerge-1.1.0.ebuild 680 BLAKE2B 8e2d73935ce32c0d9de4a105f432bef747c29bb17d70f2abd4f1f3aa694c18e5967c666bc2855248a0d00282ae53330ce86e51118ff5539ced5110010a1d19bf SHA512 ac15da24d7fa8badde4466a2a5c68a4dedce1cd84d8c04b9dc9b545c5f5ddfeb909f3f3e729186c848e422ddd8e127e7a5c0bd1d2a98c6843930423cf4b6300e -EBUILD jsonmerge-1.3.0.ebuild 735 BLAKE2B e0e7900931513e86f209f94c9344c6cdba1b46173b476a25d9590ebf66ee66b086ab30206118f08a11dc3c04b5fbe2beb00008ee10472c6af0124ed8d57073fc SHA512 97ca2af60fe9e6d13c63d4646492c321de1c3612a4839de22405d1336884f6eba0ce468387cdfc7304626b43bbcd1fe0b311e9719acfd1013f1af9d321de918d +DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db EBUILD jsonmerge-1.4.0.ebuild 675 BLAKE2B 1efef2b2c522ad0b803b34f9f8c5a5adfb31684d3831b3ec6e44ba81843c3d32a364d976ee9d76f0ff1b0efdc946a018d92b2468477d04123d11feabbe899ca2 SHA512 f9a8c6ebeaf101f01e7fd06c0d4772a3e1cdfb9915e49be8d6b70459bdfb4ff0d9b1b1f370e9604fadcb4c743c783274dc070a9f7725a8726662281f7b357389 +EBUILD jsonmerge-1.6.0.ebuild 678 BLAKE2B 4172542544204328205cc3d267c9e63d6a169a449e05793010e1410cb2f82d9c8ed8570b4b6cfbf469703fa055a2d769c9ce081b00a3120d2b04450fd0812185 SHA512 a7b625fc40c42e469aa8f6d3d48a303de6175d8b9e5baf6442079cad9041dbac8efb35df1145eead49074821ae3b8f7c5f2d5f2242e948555c128afb08648809 MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea 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 b082e6dc7195..000000000000 --- 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.6.0.ebuild index dc713b9ca070..fa454e60a611 100644 --- a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild +++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild @@ -1,8 +1,8 @@ # 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} ) +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit distutils-r1 @@ -15,9 +15,8 @@ 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} +REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]" +BDEPEND="${REPEND} dev-python/setuptools[${PYTHON_USEDEP}]" python_test() { |