[gentoo-commits] proj/sci:master commit in: dev-python/jupyter_core/, dev-python/jupyter_core/files/

[Marius Brehler]

commit:     d984aa2f439bb5a4533c919f32ff06839bd161a3
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Nov 28 17:54:09 2015 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Nov 28 17:54:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d984aa2f

dev-python/jupyter_core: Moved to tree; Drop old

Package-Manager: portage-2.2.20.1

 dev-python/jupyter_core/ChangeLog                  |  5 ++
 .../files/jupyter_core-4.0.4-add-test-files.patch  | 50 --------------------
 .../jupyter_core/jupyter_core-4.0.4-r1.ebuild      | 39 ----------------
 dev-python/jupyter_core/jupyter_core-4.0.6.ebuild  | 54 ----------------------
 4 files changed, 5 insertions(+), 143 deletions(-)

diff --git a/dev-python/jupyter_core/ChangeLog b/dev-python/jupyter_core/ChangeLog
index c9aaae2..2fb28e0 100644
--- a/dev-python/jupyter_core/ChangeLog
+++ b/dev-python/jupyter_core/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  28 Nov 2015; Marius Brehler <marbre@××××××××××××××.de> -Manifest,
+  -files/jupyter_core-4.0.4-add-test-files.patch, -jupyter_core-4.0.4-r1.ebuild,
+  -jupyter_core-4.0.6.ebuild:
+  dev-python/jupyter_core: Moved to tree; Drop old
+
   21 Sep 2015; Marius Brehler <marbre@××××××××××××××.de>
   jupyter_core-9999.ebuild:
   dev-python/jupyter_core: Add ~x86 to KEYWORDS

diff --git a/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch b/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch
deleted file mode 100644
index d7b448c..0000000
--- a/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Patch to fix testing. Fixes
-https://github.com/gentoo-science/sci/issues/479
-
-Upstream issue:
-https://github.com/jupyter/jupyter_core/issues/50
-
-From 38b01f31f4793f4ccd427f0dee095bcb2a99b3c9 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@×××××.com>
-Date: Tue, 1 Sep 2015 09:28:17 +0200
-Subject: [PATCH] add test files to package data
-
----
- setup.py | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 0653dbd..f155663 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,6 +31,19 @@ version_ns = {}
- with open(pjoin(here, 'jupyter_core', 'version.py')) as f:
-     exec(f.read(), {}, version_ns)
- 
-+def find_package_data():
-+    """Find package data (testing support files)"""
-+    package_data = {}
-+    package_data['jupyter_core.tests'] = test_files = []
-+    test_dir = pjoin('jupyter_core', 'tests')
-+    prefix_len = len(test_dir) + len(os.sep)
-+    for parent, dirs, files in os.walk(test_dir):
-+        if files:
-+            test_files.append(pjoin(parent[prefix_len:], '*.*'))
-+    
-+    return package_data
-+
-+package_data = find_package_data()
- 
- setup_args = dict(
-     name                = 'jupyter_core',
-@@ -38,6 +51,7 @@ setup_args = dict(
-     packages            = ['jupyter_core',
-                            'jupyter_core.utils',
-                            'jupyter_core.tests'],
-+    package_data        = package_data,
-     scripts             = glob(pjoin('scripts', '*')),
-     description         = "Jupyter core package. A base package on which Jupyter projects rely.",
-     long_description    = """There is no reason to install this package on its own.""",
--- 
-2.4.6
-

diff --git a/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild
deleted file mode 100644
index 3df560f..0000000
--- a/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://raw.githubusercontent.com/gentoo-science/sci/master/patches/${P}-tests-dotipython.patch"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-test-files.patch
-	"${DISTDIR}"/${P}-tests-dotipython.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test jupyter_core || die
-}

diff --git a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
deleted file mode 100644
index 97392a8..0000000
--- a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test jupyter_core || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}