[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/
commit: 3074eb67b6dbec76e6f0adedd49fb8f647e4b265
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jul 20 01:50:58 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jul 20 01:52:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3074eb67
dev-python/cbor: Fix test failure bug 719648
Adds trivial patches to main code, fixes test_cbor.py test_sortkeys()
wrongly assuming dictionary keys may not always be sorted when added
in sorted order.
Fix the test phase not finding the c extension module.
Update metadata.xml to github repo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec gentoo.org>
dev-python/cbor/cbor-1.0.0-r1.ebuild | 40 +
dev-python/cbor/cbor-1.0.0.ebuild | 22 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 ++
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 ++
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 +++
dev-python/cbor/metadata.xml | 2 +-
6 files changed, 192 insertions(+), 23 deletions(-)
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild
b/dev-python/cbor/cbor-1.0.0-r1.ebuild
new file mode 100644
index 000..7d99ec53094
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://github.com/brianolson/cbor_py
+ https://pypi.org/project/cbor/";
+SRC_URI="
+ https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+ "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+ "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+ "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+ distutils_install_for_testing
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_cbor.py|| die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_objects.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_usage.py || die
"Testsuite failed under ${EPYTHON}"
+ PYTHONPATH="${BUILD_DIR}/lib" \
+ "${PYTHON:-python}" cbor/tests/test_vectors.py || die
"Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild
b/dev-python/cbor/cbor-1.0.0.ebuild
deleted file mode 100644
index 11a29f2d6cf..000
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/brianolson/cbor_py
- https://pypi.org/project/cbor/";
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
new file mode 100644
index 000..e7867d12cc2
--- /dev/null
+++ b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
@@ -0,0 +1,43 @@
+From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+Date: Sun, 19 Jul 2020 16:31:42 -0700
+Subject: [PATCH] Fix issue #6 broken test_sortkeys()
+
+Newer python dictionaries are keeping the order the keys were added in.
+As a result since both lists were pre-sorted and identicle so the later
+test failed to find any differences causing the failure.
+This change introduces 3 entries that are out of sorted order for both
+the obytes and xbytes lists. This ensures a valid test of sorting.
+---
+ cbor/tests/test_cbor.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
+index 78b3ddb..6ce068b 100644
+--- a/cbor/tests/test_cbor.py
b/cbor/tests/test_cbor.py
+@@ -281,6 +281,10 @@ class XTestCBOR(object):
+ xbytes = []
+ for n in _r
[gentoo-commits] repo/gentoo:master commit in: dev-python/cbor/, dev-python/cbor/files/, profiles/
commit: b7e905a90bc51d70655ed0f344e04fb2c7d36c72
Author: David Seifert gentoo org>
AuthorDate: Thu May 11 10:12:27 2023 +
Commit: David Seifert gentoo org>
CommitDate: Thu May 11 10:12:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e905a9
dev-python/cbor: treeclean
Closes: https://bugs.gentoo.org/903261
Signed-off-by: David Seifert gentoo.org>
dev-python/cbor/Manifest | 1 -
dev-python/cbor/cbor-1.0.0-r2.ebuild | 40 -
.../cbor-1.0.0.Fix-broken-test_sortkeys.patch | 43 --
...cbor-1.0.0.Replace-deprecated-logger.warn.patch | 98 --
.../cbor/files/cbor-1.0.0.zero-length-bytes.patch | 10 ---
dev-python/cbor/metadata.xml | 25 --
profiles/package.mask | 6 --
7 files changed, 223 deletions(-)
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
deleted file mode 100644
index 0909a13cb5db..
--- a/dev-python/cbor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B
dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee
SHA512
88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
diff --git a/dev-python/cbor/cbor-1.0.0-r2.ebuild
b/dev-python/cbor/cbor-1.0.0-r2.ebuild
deleted file mode 100644
index b6e1bf203303..
--- a/dev-python/cbor/cbor-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,40 +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
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
- https://github.com/brianolson/cbor_py/
- https://pypi.org/project/cbor/
-"
-SRC_URI="
- https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-# upstream PR: https://github.com/brianolson/cbor_py/pull/19
-# upstream PR: https://github.com/brianolson/cbor_py/pull/11
-PATCHES=(
- "${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
- "${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
- "${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
-)
-
-python_test() {
- "${EPYTHON}" cbor/tests/test_cbor.py|| die "Testsuite failed under
${EPYTHON}"
- "${EPYTHON}" cbor/tests/test_objects.py || die "Testsuite failed under
${EPYTHON}"
- "${EPYTHON}" cbor/tests/test_usage.py || die "Testsuite failed under
${EPYTHON}"
- "${EPYTHON}" cbor/tests/test_vectors.py || die "Testsuite failed under
${EPYTHON}"
-}
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
deleted file mode 100644
index e7867d12cc29..
--- a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Sun, 19 Jul 2020 16:31:42 -0700
-Subject: [PATCH] Fix issue #6 broken test_sortkeys()
-
-Newer python dictionaries are keeping the order the keys were added in.
-As a result since both lists were pre-sorted and identicle so the later
-test failed to find any differences causing the failure.
-This change introduces 3 entries that are out of sorted order for both
-the obytes and xbytes lists. This ensures a valid test of sorting.
- cbor/tests/test_cbor.py | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
-index 78b3ddb..6ce068b 100644
a/cbor/tests/test_cbor.py
-+++ b/cbor/tests/test_cbor.py
-@@ -281,6 +281,10 @@ class XTestCBOR(object):
- xbytes = []
- for n in _range(2, 27):
- ob = {u'{:02x}'.format(x):x for x in _range(n)}
-+# ensure some "ob" have unsorted key:value entries
-+if n in [4, 6, 9]:
-+ob.pop('01')
-+ob["01"] = 1
- obytes.append(self.dumps(ob, sort_keys=True))
- xbytes.append(self.dumps(ob, sort_keys=False))
- allOGood = True
a/setup.py 2016-02-09 15:10:34.0 -0800
-+++ b/setup.py 2020-07-19 13:46:18.586936516 -0700
-@@ -75,7 +75,7 @@
- author='Brian Olson',
- author_email='bol...@bolson.org',
- url='https://bitbucket.org/bodhisnarkva/cbor',
--packages=['cbor'],
-+packages=['cbor', 'cbor/tests'],
- package_dir={'cbor':'cbor'},
- ext_modules=[
- Extension(
---
-libgit2 1.0.1
-
diff --git
a/dev-python/cbor/fi
