[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2024-05-17 Thread Michał Górny 
commit: 4e478870e4bc4c9f07f1a0e15da77913c57ba429
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 17 17:08:04 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 17 17:08:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e478870

dev-python/deepmerge: Enable py3.13

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

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

diff --git a/dev-python/deepmerge/deepmerge-1.1.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.1.ebuild
index 4015bcabc8e6..4b20a787ea0a 100644
--- a/dev-python/deepmerge/deepmerge-1.1.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2024-01-06 Thread Michał Górny 
commit: 66d37a598e3a540e309c77258bd09e713ea1e37b
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan  6 09:50:53 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan  6 09:50:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d37a59

dev-python/deepmerge: Remove old

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

 dev-python/deepmerge/Manifest   |  1 -
 dev-python/deepmerge/deepmerge-1.1.0.ebuild | 32 -
 2 files changed, 33 deletions(-)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index ef93632841f9..2cccb5f1ce08 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1 @@
-DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 
30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc
 SHA512 
f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97
 DIST deepmerge-1.1.1.gh.tar.gz 15605 BLAKE2B 
ef6fbd30185a2990c72d6de0950275dd6f9f3e61c0c9c969fd69dab2123025d016ade98d42f09b30328b3cb5659b29b2d07836db4657acde97d9a2cc40c07039
 SHA512 
8ba4a225d588c96c3c852783774d5d690c5dd0caa1988f5969ce6446a11ba6035667baeda7e419cae40c4c1dcf7a15ee7149a10c1e33dba6b7775ddbad41130d

diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
deleted file mode 100644
index 3209ee6a009a..
--- a/dev-python/deepmerge/deepmerge-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-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
-
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="
-   https://deepmerge.readthedocs.io/en/latest/
-   https://github.com/toumorokoshi/deepmerge/
-   https://pypi.org/project/deepmerge/
-"
-SRC_URI="
-   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-   dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2023-12-18 Thread Michał Górny 
commit: fdf398cc4c81cf44a0f5d3e38e1e340fe5e7b21a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec 19 05:58:05 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec 19 06:10:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf398cc

dev-python/deepmerge: Bump to 1.1.1

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

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-1.1.1.ebuild | 32 +
 2 files changed, 33 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 5d8a94411cc2..ef93632841f9 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 
30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc
 SHA512 
f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97
+DIST deepmerge-1.1.1.gh.tar.gz 15605 BLAKE2B 
ef6fbd30185a2990c72d6de0950275dd6f9f3e61c0c9c969fd69dab2123025d016ade98d42f09b30328b3cb5659b29b2d07836db4657acde97d9a2cc40c07039
 SHA512 
8ba4a225d588c96c3c852783774d5d690c5dd0caa1988f5969ce6446a11ba6035667baeda7e419cae40c4c1dcf7a15ee7149a10c1e33dba6b7775ddbad41130d

diff --git a/dev-python/deepmerge/deepmerge-1.1.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.1.ebuild
new file mode 100644
index ..c0949f05683b
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-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
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+   https://deepmerge.readthedocs.io/en/latest/
+   https://github.com/toumorokoshi/deepmerge/
+   https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+   dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2023-05-26 Thread Arthur Zamarin 
commit: f8fc948228be6ba6d6f8d6dbbae4494bf76b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 26 20:21:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 26 20:26:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8fc9482

dev-python/deepmerge: add github upstream metadata

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/deepmerge/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/deepmerge/metadata.xml 
b/dev-python/deepmerge/metadata.xml
index ecf3f05f4ea9..febe7522edfe 100644
--- a/dev-python/deepmerge/metadata.xml
+++ b/dev-python/deepmerge/metadata.xml
@@ -8,5 +8,6 @@


deepmerge
+   toumorokoshi/deepmerge

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2023-05-26 Thread Arthur Zamarin 
commit: 3d79ed73978d4fcfd0497319662a8a489ece5d67
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 26 20:20:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 26 20:26:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d79ed73

dev-python/deepmerge: enable py3.12

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
index 3914d29e6fee..3209ee6a009a 100644
--- a/dev-python/deepmerge/deepmerge-1.1.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-11-25 Thread Michał Górny 
commit: 25767d26982ebdd58955144eb845977bcf1d5484
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov 25 13:57:53 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Nov 25 13:58:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25767d26

dev-python/deepmerge: Remove old

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

 dev-python/deepmerge/Manifest   |  1 -
 dev-python/deepmerge/deepmerge-1.0.1.ebuild | 32 -
 2 files changed, 33 deletions(-)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 281db1d9e795..5d8a94411cc2 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1 @@
-DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B 
bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b
 SHA512 
689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd
 DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 
30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc
 SHA512 
f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97

diff --git a/dev-python/deepmerge/deepmerge-1.0.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
deleted file mode 100644
index 53b0431ebc98..
--- a/dev-python/deepmerge/deepmerge-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-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="Tools to handle merging of nested data structures in python"
-HOMEPAGE="
-   https://deepmerge.readthedocs.io/en/latest/
-   https://github.com/toumorokoshi/deepmerge/
-   https://pypi.org/project/deepmerge/
-"
-SRC_URI="
-   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-   dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-11-25 Thread Arthur Zamarin 
commit: 61cd971b920bde24945702801c0f6736a3b0b103
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 13:53:34 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 13:53:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd971b

dev-python/deepmerge: Stabilize 1.1.0 ALLARCHES, #883015

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
index 92cc1a6e03b4..53b0431ebc98 100644
--- a/dev-python/deepmerge/deepmerge-1.1.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-10-25 Thread Arthur Zamarin 
commit: 6a975c4ca7aff42277231fa94fd56bce496b9bed
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Oct 25 20:08:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Oct 25 20:30:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a975c4c

dev-python/deepmerge: add 1.1.0

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-1.1.0.ebuild | 32 +
 2 files changed, 33 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 84eea7f3d94f..281db1d9e795 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B 
bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b
 SHA512 
689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd
+DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 
30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc
 SHA512 
f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97

diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
new file mode 100644
index ..92cc1a6e03b4
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+   https://deepmerge.readthedocs.io/en/latest/
+   https://github.com/toumorokoshi/deepmerge/
+   https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-05-21 Thread Michał Górny 
commit: c06dcc27a2c41617761f627b7c1b184e03be1326
Author: Michał Górny  gentoo  org>
AuthorDate: Sat May 21 18:27:43 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat May 21 18:27:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06dcc27

dev-python/deepmerge: Enable py3.11

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

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
index fd90d44d1e1e..53b0431ebc98 100644
--- a/dev-python/deepmerge/deepmerge-1.0.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-05-03 Thread Michał Górny 
commit: a4c7a1e918ebac43418001d061bee88d836ede89
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May  3 11:25:56 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May  3 11:43:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c7a1e9

dev-python/deepmerge: Remove old

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

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

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 156d3cc2705b..84eea7f3d94f 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1 @@
-DIST deepmerge-1.0.0.gh.tar.gz 14789 BLAKE2B 
0a3f7cb72b718995252361864a9208de4b57c32df6da6dc52e6491fa7871be2dcd19be3bcef3eba2d8793009945bfe8e412959da52f9fb1072898026a5ff8837
 SHA512 
687483ef47f385df345dca6e127897a346a48424eea51c6b8ff35c254517daae0e713f8e86ff2f140ede6ecde98517ddfd9edb5599956f4c716f1f8f2bfcf22a
 DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B 
bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b
 SHA512 
689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
deleted file mode 100644
index 80aa6ce1a894..
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
-SRC_URI="
-   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-05-03 Thread Jakov Smolić 
commit: 1430a9f5fb3af5828673d3583e01537fb75ca264
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May  3 09:48:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May  3 09:48:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1430a9f5

dev-python/deepmerge: Stabilize 1.0.1 ALLARCHES, #842357

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
index 78fb3bdd01ad..fd90d44d1e1e 100644
--- a/dev-python/deepmerge/deepmerge-1.0.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-05-03 Thread Michał Górny 
commit: 0f103df6278f040151dc8db84d281b63b3298d00
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May  3 08:46:15 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May  3 08:51:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f103df6

dev-python/deepmerge: Bump to 1.0.1

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

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-1.0.1.ebuild | 32 +
 2 files changed, 33 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index c89ab61ecf0b..156d3cc2705b 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-1.0.0.gh.tar.gz 14789 BLAKE2B 
0a3f7cb72b718995252361864a9208de4b57c32df6da6dc52e6491fa7871be2dcd19be3bcef3eba2d8793009945bfe8e412959da52f9fb1072898026a5ff8837
 SHA512 
687483ef47f385df345dca6e127897a346a48424eea51c6b8ff35c254517daae0e713f8e86ff2f140ede6ecde98517ddfd9edb5599956f4c716f1f8f2bfcf22a
+DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B 
bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b
 SHA512 
689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd

diff --git a/dev-python/deepmerge/deepmerge-1.0.1.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
new file mode 100644
index ..78fb3bdd01ad
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+   https://deepmerge.readthedocs.io/en/latest/
+   https://github.com/toumorokoshi/deepmerge/
+   https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-05-03 Thread Michał Górny 
commit: 31456c706883b2706bf7647eaf42cc519693c4ca
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May  3 08:53:22 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May  3 08:59:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31456c70

dev-python/deepmerge: Add python@ as maint.

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

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

diff --git a/dev-python/deepmerge/metadata.xml 
b/dev-python/deepmerge/metadata.xml
index e5d472b16c92..ecf3f05f4ea9 100644
--- a/dev-python/deepmerge/metadata.xml
+++ b/dev-python/deepmerge/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   pyt...@gentoo.org
+   Python
+   


deepmerge

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-03-12 Thread Arthur Zamarin 
commit: a8a25a032334839ed0e8d98477da97b73568c4d2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 10:38:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 10:38:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a25a03

dev-python/deepmerge: Stabilize 1.0.0 hppa, #834285

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 70ecec8ed1d8..80aa6ce1a894 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-03-06 Thread Sam James 
commit: fa34f13b32147b5e87f658955e528a90aaf127e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 23:49:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 23:49:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa34f13b

dev-python/deepmerge: Stabilize 1.0.0 arm, #834285

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 1e062f28e617..70ecec8ed1d8 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-03-05 Thread Sam James 
commit: 8c1198f082f07c71b4f068610101c7310c0ee451
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 07:53:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 07:53:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1198f0

dev-python/deepmerge: Stabilize 1.0.0 arm64, #834285

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 7a7343ca2785..1e062f28e617 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-27 Thread Sam James 
commit: cbf04017b7bca690ba29ee3b2368ca0d0db13a6c
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 27 16:35:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 27 16:35:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf04017

dev-python/deepmerge: Stabilize 1.0.0 sparc, #834285

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index e852fb695ff6..7a7343ca2785 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-27 Thread Jakov Smolić 
commit: 0f09d73adcb5e7896628894c1aaa4d7f9416a362
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 27 12:28:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 27 12:28:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f09d73a

dev-python/deepmerge: Stabilize 1.0.0 x86, #834285

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 9b0c5959f050..06fd681bcaba 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-27 Thread Jakov Smolić 
commit: d0e534f6866bf5e3f1bb9d6218728bc65d67b1bb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 27 12:17:19 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 27 12:22:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e534f6

dev-python/deepmerge: Stabilize 1.0.0 amd64, #834285

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index a1bfcfe5c2d2..9b0c5959f050 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-27 Thread Michał Górny 
commit: 3dff24c2b9bad64290ea79e71a202cf3be9f4967
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 27 10:53:58 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 27 10:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dff24c2

dev-python/deepmerge: Remove old

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

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

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index b8843e19e05e..c89ab61ecf0b 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1 @@
-DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 
33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e
 SHA512 
2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47
 DIST deepmerge-1.0.0.gh.tar.gz 14789 BLAKE2B 
0a3f7cb72b718995252361864a9208de4b57c32df6da6dc52e6491fa7871be2dcd19be3bcef3eba2d8793009945bfe8e412959da52f9fb1072898026a5ff8837
 SHA512 
687483ef47f385df345dca6e127897a346a48424eea51c6b8ff35c254517daae0e713f8e86ff2f140ede6ecde98517ddfd9edb5599956f4c716f1f8f2bfcf22a

diff --git a/dev-python/deepmerge/deepmerge-0.3.0.ebuild 
b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
deleted file mode 100644
index fa53622bb877..
--- a/dev-python/deepmerge/deepmerge-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
-SRC_URI="
-   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-09 Thread Yixun Lan 
commit: f450243619e06e5117b348e5883e23653a14083c
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Feb  7 13:43:13 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Feb  9 14:15:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4502436

dev-python/deepmerge: keyword ~riscv, #831852

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 59b68099725c..a1bfcfe5c2d2 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: 4bb5ce6eed93a3161a8b28a2e897a7da4584932d
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 22:28:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 22:28:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb5ce6e

dev-python/deepmerge: Keyword 1.0.0 s390, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 5ef99fc07b3e..59b68099725c 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Arthur Zamarin 
commit: dc6c5423b8254916d71e8b0e3c558ef969d4bda1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Feb  7 19:10:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Feb  7 20:14:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6c5423

dev-python/deepmerge: Keyword 1.0.0 hppa, #831852

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index b68930dfdd71..5ef99fc07b3e 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: b39b740acd3d2725df7c4ed8f8718504e555742e
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 11:35:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 11:35:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39b740a

dev-python/deepmerge: Keyword 1.0.0 sparc, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 792f164689cd..b68930dfdd71 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: 4e4833bb66c7262096ac989da20e6db8c168a04a
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 11:32:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 11:32:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4833bb

dev-python/deepmerge: Keyword 1.0.0 arm64, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 658a85afb39e..792f164689cd 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: 31129598247bd318487ffe54fd5320d8165bcbc0
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 11:31:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 11:31:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31129598

dev-python/deepmerge: Keyword 1.0.0 ppc64, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index b8967884599f..658a85afb39e 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: 1b589ca7e726215c09c0ab9c91b9f6c288772e69
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 11:30:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 11:30:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b589ca7

dev-python/deepmerge: Keyword 1.0.0 ppc, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index c1ec9416f09a..b8967884599f 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: c1e16eee8d80a0b9430926610d844a2ae641c077
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 09:33:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 09:34:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e16eee

dev-python/deepmerge: Keyword 1.0.0 ia64, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index e9f8395456b7..c1ec9416f09a 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2022-02-07 Thread Sam James 
commit: c280a96ddc0d46ca018451bb478b4d155e6033de
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  7 08:32:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  7 08:32:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c280a96d

dev-python/deepmerge: Keyword 1.0.0 arm, #831852

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
index 60565938e835..e9f8395456b7 100644
--- a/dev-python/deepmerge/deepmerge-1.0.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-12-19 Thread Arthur Zamarin 
commit: 00b396c7a0d0d26b5bb485cd66b5ae34a79e7802
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 19 20:47:07 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 19 20:50:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b396c7

dev-python/deepmerge: add 1.0.0

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-1.0.0.ebuild | 24 
 2 files changed, 25 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 8cd32614929d..b8843e19e05e 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 
33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e
 SHA512 
2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47
+DIST deepmerge-1.0.0.gh.tar.gz 14789 BLAKE2B 
0a3f7cb72b718995252361864a9208de4b57c32df6da6dc52e6491fa7871be2dcd19be3bcef3eba2d8793009945bfe8e412959da52f9fb1072898026a5ff8837
 SHA512 
687483ef47f385df345dca6e127897a346a48424eea51c6b8ff35c254517daae0e713f8e86ff2f140ede6ecde98517ddfd9edb5599956f4c716f1f8f2bfcf22a

diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild 
b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
new file mode 100644
index ..60565938e835
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-05-09 Thread Michał Górny 
commit: 089a51eb064dc054b8a6ffe4a29d1f437710c51f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri May  7 12:10:50 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May  9 11:35:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089a51eb

dev-python/deepmerge: Port to python3.10

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/dev-python/deepmerge/deepmerge-0.3.0.ebuild 
b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
index 3bd2c651aa4..fa53622bb87 100644
--- a/dev-python/deepmerge/deepmerge-0.3.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Tools to handle merging of nested data structures in python"

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-05-09 Thread Michał Górny 
commit: a976531eff5ffc7f2e55f2af8fa57242d3fdcfdb
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri May  7 12:11:03 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May  9 11:35:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a976531e

dev-python/deepmerge: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/deepmerge/Manifest  |  2 --
 dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild | 24 
 dev-python/deepmerge/deepmerge-0.2.1.ebuild| 24 
 3 files changed, 50 deletions(-)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index e9d83979015..8cd32614929 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1 @@
-DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 
0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f
 SHA512 
72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
-DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 
0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e
 SHA512 
e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
 DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 
33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e
 SHA512 
2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47

diff --git a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild 
b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
deleted file mode 100644
index 05d1db1f270..000
--- a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
-SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-   sed -i -e '/vcver/d' setup.py || die
-   distutils-r1_python_prepare_all
-}

diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild 
b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
deleted file mode 100644
index 3bd2c651aa4..000
--- a/dev-python/deepmerge/deepmerge-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 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="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
-SRC_URI="
-   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-04-25 Thread Michał Górny 
commit: 4b9957c3e25a4da2691f1602857c4ff0af22afe5
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 25 21:25:33 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 25 21:58:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9957c3

dev-python/deepmerge: Bump to 0.3.0

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

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-0.3.0.ebuild | 24 
 2 files changed, 25 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index cb375e6d32d..e9d83979015 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1,3 @@
 DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 
0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f
 SHA512 
72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
 DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 
0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e
 SHA512 
e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
+DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 
33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e
 SHA512 
2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47

diff --git a/dev-python/deepmerge/deepmerge-0.3.0.ebuild 
b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
new file mode 100644
index 000..3bd2c651aa4
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-03-11 Thread Michał Górny 
commit: b72aa3a4ecc1eaf8dc36f6cfbfdd98f5f6dd9f80
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar 11 08:25:17 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar 11 08:48:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72aa3a4

dev-python/deepmerge: Bump to 0.2.1

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

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-0.2.1.ebuild | 24 
 2 files changed, 25 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index d555e29077f..cb375e6d32d 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 
0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f
 SHA512 
72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
+DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 
0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e
 SHA512 
e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0

diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild 
b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
new file mode 100644
index 000..3bd2c651aa4
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
+SRC_URI="
+   https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-03-09 Thread Joonas Niilola 
commit: a8f150a837a8da4586de60d6c5b6ddc53de78e8f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Mar  5 10:30:26 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  9 09:13:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f150a8

dev-python/deepmerge: Add tests

* Upstream doesn't ship tests in pypi tarballs, and latest github release is
outdated, so let's just use the commit tag (no changes with regards to 0.1.1
except for tests).

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/deepmerge/Manifest  |  1 +
 dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild | 24 
 2 files changed, 25 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 2a50239627c..bf713bbb191 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 
18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18
 SHA512 
209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0
+DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 
0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f
 SHA512 
72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083

diff --git a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild 
b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
new file mode 100644
index 000..05d1db1f270
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
+SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   sed -i -e '/vcver/d' setup.py || die
+   distutils-r1_python_prepare_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-03-09 Thread Joonas Niilola 
commit: af99a329727e42409efe7300e93eb3fb7987f7ac
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Mar  5 10:30:43 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  9 09:13:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af99a329

dev-python/deepmerge: Remove 0.1.1

Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/19771
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/deepmerge/Manifest   |  1 -
 dev-python/deepmerge/deepmerge-0.1.1.ebuild | 23 ---
 2 files changed, 24 deletions(-)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index bf713bbb191..d555e29077f 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,2 +1 @@
-DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 
18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18
 SHA512 
209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0
 DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 
0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f
 SHA512 
72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083

diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild 
b/dev-python/deepmerge/deepmerge-0.1.1.ebuild
deleted file mode 100644
index 721eb6b566e..000
--- a/dev-python/deepmerge/deepmerge-0.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 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="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# pypi doesn't ship tests, and last github release is 0.0.5
-RESTRICT="test"
-
-python_prepare_all() {
-   sed -i -e '/vcver/d' setup.py || die
-   distutils-r1_python_prepare_all
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/deepmerge/

2021-02-26 Thread Sam James 
commit: 296981f8b01ea9a55178dac7813b0a240ff88445
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Feb 25 18:01:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 26 14:25:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296981f8

dev-python/deepmerge: Tool to merge nested data structures

* New dependency of net-im/err

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Sam James  gentoo.org>

 dev-python/deepmerge/Manifest   |  1 +
 dev-python/deepmerge/deepmerge-0.1.1.ebuild | 23 +++
 dev-python/deepmerge/metadata.xml   |  9 +
 3 files changed, 33 insertions(+)

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
new file mode 100644
index 000..2a50239627c
--- /dev/null
+++ b/dev-python/deepmerge/Manifest
@@ -0,0 +1 @@
+DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 
18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18
 SHA512 
209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0

diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild 
b/dev-python/deepmerge/deepmerge-0.1.1.ebuild
new file mode 100644
index 000..721eb6b566e
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# pypi doesn't ship tests, and last github release is 0.0.5
+RESTRICT="test"
+
+python_prepare_all() {
+   sed -i -e '/vcver/d' setup.py || die
+   distutils-r1_python_prepare_all
+}

diff --git a/dev-python/deepmerge/metadata.xml 
b/dev-python/deepmerge/metadata.xml
new file mode 100644
index 000..4c200a4ba24
--- /dev/null
+++ b/dev-python/deepmerge/metadata.xml
@@ -0,0 +1,9 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   
+   
+   deepmerge
+   
+