public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/
@ 2021-09-03 19:24 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-09-03 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ab28d3524f9f21caf37fe2b8481ec5ef58e1e113
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  3 19:24:30 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 19:24:30 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ab28d352

dev-python/jupyterlab: add new package

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/jupyterlab/jupyterlab-3.1.10.ebuild | 34 ++++++++++++++++++++++++++
 dev-python/jupyterlab/metadata.xml             |  8 ++++++
 2 files changed, 42 insertions(+)

diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
new file mode 100644
index 000000000..c57e032ef
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package openapi et al
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/nbclassic[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# TODO: package myst_parser
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme

diff --git a/dev-python/jupyterlab/metadata.xml b/dev-python/jupyterlab/metadata.xml
new file mode 100644
index 000000000..ae9640ffb
--- /dev/null
+++ b/dev-python/jupyterlab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/
@ 2021-09-03 19:45 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-09-03 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f0c8d2359cc0805bb5ec3078556d2f1ceac05a0c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  3 19:45:41 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 19:45:41 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f0c8d235

dev-python/jupyterlab: build assets in postinst

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/jupyterlab/jupyterlab-3.1.10.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
index c57e032ef..415bfa0ad 100644
--- a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
@@ -32,3 +32,7 @@ RDEPEND="
 distutils_enable_tests pytest
 # TODO: package myst_parser
 #distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+pkg_postinst() {
+	jupyter-lab build || die "Failed to build jupyter assets"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/
@ 2021-09-07 18:01 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-09-07 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d22723191e8cbb104437511c1a9eb141a0247ef1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 18:00:54 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 18:00:54 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d2272319

dev-python/jupyterlab: also clean upon pkg_prerm

and include the licenses of the js stuff

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/jupyterlab/jupyterlab-3.1.10.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
index 415bfa0ad..6940fff45 100644
--- a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="JupyterLab computational environment"
 HOMEPAGE="https://jupyter.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -34,5 +34,10 @@ distutils_enable_tests pytest
 #distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
 
 pkg_postinst() {
-	jupyter-lab build || die "Failed to build jupyter assets"
+	# We have to do this here because we need internet since this uses yarn
+	jupyter-lab build -y || die "Failed to build jupyterlab javascript assets"
+}
+
+pkg_prerm() {
+	jupyter-lab clean -y || die "Failed to clean jupyterlab javascript assets"
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/
@ 2021-09-07 18:44 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-09-07 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f7e055139d73a096f937e4ff5b1736661405c3f4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 18:43:50 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 18:43:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f7e05513

dev-python/jupyterlab: ewarn instead of die

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/jupyterlab/jupyterlab-3.1.10.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
index 6940fff45..7d3603c67 100644
--- a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
@@ -35,9 +35,17 @@ distutils_enable_tests pytest
 
 pkg_postinst() {
 	# We have to do this here because we need internet since this uses yarn
-	jupyter-lab build -y || die "Failed to build jupyterlab javascript assets"
+	jupyter-lab build -y || ( \
+		ewarn "Failed to build jupyterlab javascript assets, please run"
+		ewarn "'jupyter-lab build' manually before starting jupyter-lab."
+		ewarn "Note that this will likely require network access."
+		)
 }
 
 pkg_prerm() {
-	jupyter-lab clean -y || die "Failed to clean jupyterlab javascript assets"
+	jupyter-lab clean -y --static || ( \
+		ewarn "Failed to clean jupyterlab javascript assets, please remove"
+		ewarn "/usr/share/jupyter/lab/staging and /usr/share/jupyter/lab/static"
+		ewarn "manually."
+	)
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/
@ 2021-09-07 19:09 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-09-07 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6fa9b784963ad6227f124cf2601113902e06c341
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 19:09:31 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 19:09:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6fa9b784

dev-python/jupyterlab: depend on jupyter_packaging

to take care of the js stuff, makes life nice and easy

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...lab-3.1.10.ebuild => jupyterlab-3.1.10-r1.ebuild} | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild b/dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild
similarity index 62%
rename from dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
rename to dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild
index 7d3603c67..3fb54861a 100644
--- a/dev-python/jupyterlab/jupyterlab-3.1.10.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.1.10-r1.ebuild
@@ -18,6 +18,8 @@ KEYWORDS="~amd64"
 # TODO: package openapi et al
 RESTRICT="test"
 
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -33,19 +35,7 @@ distutils_enable_tests pytest
 # TODO: package myst_parser
 #distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
 
-pkg_postinst() {
-	# We have to do this here because we need internet since this uses yarn
-	jupyter-lab build -y || ( \
-		ewarn "Failed to build jupyterlab javascript assets, please run"
-		ewarn "'jupyter-lab build' manually before starting jupyter-lab."
-		ewarn "Note that this will likely require network access."
-		)
-}
-
-pkg_prerm() {
-	jupyter-lab clean -y --static || ( \
-		ewarn "Failed to clean jupyterlab javascript assets, please remove"
-		ewarn "/usr/share/jupyter/lab/staging and /usr/share/jupyter/lab/static"
-		ewarn "manually."
-	)
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-07 19:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-07 18:44 [gentoo-commits] proj/sci:master commit in: dev-python/jupyterlab/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-09-07 19:09 Andrew Ammerlaan
2021-09-07 18:01 Andrew Ammerlaan
2021-09-03 19:45 Andrew Ammerlaan
2021-09-03 19:24 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox