From a4807704fd4dd65b3133dc886652ed6d480d8b4e Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Date: Sun, 26 Jan 2020 19:54:51 +0100
Subject: dev-python/python-jsonrpc-server: Version bump 0.3.4

Bug fix, github release tarball does not contain
correct version info

Bug: https://bugs.gentoo.org/706420
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 dev-python/python-jsonrpc-server/Manifest          |  2 +-
 ...sonrpc-server-0.3.4-remove-pytest-cov-dep.patch | 15 +++++++++++
 .../python-jsonrpc-server-0.3.2.ebuild             | 31 ----------------------
 .../python-jsonrpc-server-0.3.4.ebuild             | 30 +++++++++++++++++++++
 4 files changed, 46 insertions(+), 32 deletions(-)
 create mode 100644 dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
 delete mode 100644 dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
 create mode 100644 dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild

(limited to 'dev-python/python-jsonrpc-server')

diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 97268a633401..31efd0bc4240 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1 +1 @@
-DIST python-jsonrpc-server-0.3.2.tar.gz 32493 BLAKE2B b1e89c798e247b3b039645b99ca25898fa846676c646e58d8fabfdbd772e3efa1ad895dfa7b31931f1e7d91252c4327a324b929cd861b16bc2be32a64e064db1 SHA512 1d29858b8f6850a017c8e7e94196a972c985e72e9f57956afa2964feb109d9b5cfa33d534d279d817bd5a1454dfcde7d32cd13149c9a53fe1f9e6e0a5899f15c
+DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
new file mode 100644
index 000000000000..a81919eae4bd
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
@@ -0,0 +1,15 @@
+pytest-cov is a deprecated dep
+diff --git a/setup.cfg b/setup.cfg
+index 03b63df..165c746 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -13,9 +13,6 @@ exclude = test/plugins/.ropeproject,test/.ropeproject
+ 
+ [tool:pytest]
+ testpaths = test
+-addopts = 
+-	--cov-report html --cov-report term --junitxml=pytest.xml
+-	--cov pyls --cov test
+ 
+ [egg_info]
+ tag_build = 
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
deleted file mode 100644
index c3430e9a8277..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
+++ /dev/null
@@ -1,31 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="https://github.com/palantir/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
new file mode 100644
index 000000000000..8881d6a78bb4
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
+HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/ujson[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-remove-pytest-cov-dep.patch" )
+
+distutils_enable_tests pytest
-- 
cgit v1.2.3