* [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/
@ 2015-09-04 5:46 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-09-04 5:46 UTC (permalink / raw
To: gentoo-commits
commit: c287c4d651277884ca128ff4b68eddbe67625668
Author: Sean Vig <sean.v.775 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 2 20:25:38 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 13:18:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c287c4d6
dev-python/nbconvert: Use upstream patch for new pandoc versions
dev-python/nbconvert/ChangeLog | 4 +++
.../nbconvert-4.0.0-pandoc-highlighting.patch | 37 ++++++++++++++++++++++
dev-python/nbconvert/nbconvert-9999.ebuild | 1 +
3 files changed, 42 insertions(+)
diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog
index a3ec671..796004b 100644
--- a/dev-python/nbconvert/ChangeLog
+++ b/dev-python/nbconvert/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 02 Sep 2015; Sean Vig <sean.v.775@gmail.com>
+ +files/nbconvert-4.0.0-pandoc-highlighting.patch nbconvert-9999.ebuild:
+ dev-python/nbconvert: Use upstream patch for new pandoc versions
+
02 Sep 2015; Sean Vig <sean.v.775@gmail.com> nbconvert-9999.ebuild:
dev-python/nbconvert: Add note about pandoc
diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
new file mode 100644
index 0000000..793856a
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
@@ -0,0 +1,37 @@
+commit 983473d2e5f71ebef07dab51ae497596af5bc9ac
+Author: James Hetherington <jamespjh@googlemail.com>
+Date: Mon Aug 31 18:06:46 2015 +0100
+
+ Add highlighting commands from more recent pandoc
+
+diff --git a/nbconvert/templates/latex/base.tplx b/nbconvert/templates/latex/base.tplx
+index 7d45c5d..a1568c5 100644
+--- a/nbconvert/templates/latex/base.tplx
++++ b/nbconvert/templates/latex/base.tplx
+@@ -84,6 +84,26 @@ This template does not define a docclass, the inheriting class must define this.
+ \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
+ \newcommand{\NormalTok}[1]{{#1}}
+
++ % Additional commands for more recent versions of Pandoc
++ \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{{#1}}}
++ \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
++ \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
++ \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{{#1}}}
++ \newcommand{\ImportTok}[1]{{#1}}
++ \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{{#1}}}}
++ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
++ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
++ \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{{#1}}}
++ \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{{#1}}}}
++ \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{{#1}}}
++ \newcommand{\BuiltInTok}[1]{{#1}}
++ \newcommand{\ExtensionTok}[1]{{#1}}
++ \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{{#1}}}
++ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{{#1}}}
++ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
++ \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
++
++
+ % Define a nice break command that doesn't care if a line doesn't already
+ % exist.
+ \def\br{\hspace*{\fill} \\* }
diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild
index 79299b1..d775d3e 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-9999.ebuild
@@ -18,6 +18,7 @@ if [ ${PV} == "9999" ] ; then
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
+ PATCHES=( "${FILESDIR}"/${P}-pandoc-highlighting.patch )
fi
LICENSE="BSD"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/
@ 2015-09-07 6:49 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-09-07 6:49 UTC (permalink / raw
To: gentoo-commits
commit: aebbd4d8cf833cd96c58b62010795ec21a8d6ff9
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Sep 5 09:55:44 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 09:55:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=aebbd4d8
dev-python/nbconvert: Patch docs/Makefile, add pandoc dependency. Fixes bug #559594.
Package-Manager: portage-2.2.20.1
dev-python/nbconvert/ChangeLog | 8 ++++++++
.../nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch | 16 ++++++++++++++++
...{nbconvert-4.0.0.ebuild => nbconvert-4.0.0-r1.ebuild} | 0
dev-python/nbconvert/nbconvert-9999.ebuild | 12 ++++++++----
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog
index 796004b..9867de6 100644
--- a/dev-python/nbconvert/ChangeLog
+++ b/dev-python/nbconvert/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*nbconvert-4.0.0-r1 (05 Sep 2015)
+
+ 05 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ +files/nbconvert-4.0.0-docs-Makefile.patch, +nbconvert-4.0.0-r1.ebuild,
+ -nbconvert-4.0.0.ebuild, nbconvert-9999.ebuild:
+ dev-python/nbconvert: Patch docs/Makefile, add pandoc dependency. Fixes bug
+ #559594.
+
02 Sep 2015; Sean Vig <sean.v.775@gmail.com>
+files/nbconvert-4.0.0-pandoc-highlighting.patch nbconvert-9999.ebuild:
dev-python/nbconvert: Use upstream patch for new pandoc versions
diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
new file mode 100644
index 0000000..130a4af
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
@@ -0,0 +1,16 @@
+nbconvert is not yet installed at time of doc generation.
+
+Patch by Marius Brehler
+--- docs/Makefile
++++ docs/Makefile
+@@ -61,8 +61,8 @@ source/config_options.rst:
+ @echo "Created docs for config options"
+
+ ipynb2rst:
+- jupyter nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
+- jupyter nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
++ ../scripts/jupyter-nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
++ ../scripts/jupyter-nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
+ @echo "Converted notebooks to rst"
+
+ dirhtml:
diff --git a/dev-python/nbconvert/nbconvert-4.0.0.ebuild b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild
similarity index 100%
rename from dev-python/nbconvert/nbconvert-4.0.0.ebuild
rename to dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild
diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild
index d775d3e..ab0314a 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
inherit distutils-r1
@@ -12,13 +12,14 @@ MY_PN="nbconvert"
DESCRIPTION="Converting Jupyter Notebooks"
HOMEPAGE="http://jupyter.org"
+PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
if [ ${PV} == "9999" ] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git"
-else
+ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
- PATCHES=( "${FILESDIR}"/${P}-pandoc-highlighting.patch )
+ PATCHES+=( "${FILESDIR}"/${P}-pandoc-highlighting.patch )
fi
LICENSE="BSD"
@@ -34,7 +35,10 @@ RDEPEND="
dev-python/traitlets[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ app-text/pandoc
+ )
test? (
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/
@ 2015-11-28 18:02 Marius Brehler
0 siblings, 0 replies; 4+ messages in thread
From: Marius Brehler @ 2015-11-28 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 50f0eb0d541e4ff09bdc008e4ed54674ab8998a0
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Nov 28 18:01:09 2015 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Nov 28 18:01:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=50f0eb0d
dev-python/nbconvert: Drop old patch
Package-Manager: portage-2.2.20.1
dev-python/nbconvert/ChangeLog | 4 +++
.../nbconvert-4.0.0-pandoc-highlighting.patch | 37 ----------------------
2 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog
index b03b909..5893b22 100644
--- a/dev-python/nbconvert/ChangeLog
+++ b/dev-python/nbconvert/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 28 Nov 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -files/nbconvert-4.0.0-pandoc-highlighting.patch:
+ dev-python/nbconvert: Drop old patch
+
28 Nov 2015; Marius Brehler <marbre@linux.sungazer.de> -Manifest,
-nbconvert-4.0.0-r1.ebuild, -nbconvert-4.1.0.ebuild:
dev-python/nbconvert: Moved to tree
diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
deleted file mode 100644
index 793856a..0000000
--- a/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 983473d2e5f71ebef07dab51ae497596af5bc9ac
-Author: James Hetherington <jamespjh@googlemail.com>
-Date: Mon Aug 31 18:06:46 2015 +0100
-
- Add highlighting commands from more recent pandoc
-
-diff --git a/nbconvert/templates/latex/base.tplx b/nbconvert/templates/latex/base.tplx
-index 7d45c5d..a1568c5 100644
---- a/nbconvert/templates/latex/base.tplx
-+++ b/nbconvert/templates/latex/base.tplx
-@@ -84,6 +84,26 @@ This template does not define a docclass, the inheriting class must define this.
- \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
- \newcommand{\NormalTok}[1]{{#1}}
-
-+ % Additional commands for more recent versions of Pandoc
-+ \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{{#1}}}
-+ \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
-+ \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
-+ \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{{#1}}}
-+ \newcommand{\ImportTok}[1]{{#1}}
-+ \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{{#1}}}}
-+ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+ \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{{#1}}}
-+ \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{{#1}}}}
-+ \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{{#1}}}
-+ \newcommand{\BuiltInTok}[1]{{#1}}
-+ \newcommand{\ExtensionTok}[1]{{#1}}
-+ \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{{#1}}}
-+ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{{#1}}}
-+ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+ \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+
-+
- % Define a nice break command that doesn't care if a line doesn't already
- % exist.
- \def\br{\hspace*{\fill} \\* }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/
@ 2016-05-17 11:59 Marius Brehler
0 siblings, 0 replies; 4+ messages in thread
From: Marius Brehler @ 2016-05-17 11:59 UTC (permalink / raw
To: gentoo-commits
commit: ecf10062252a59dcd236530e65bf16688c363c0a
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 17 11:08:11 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue May 17 11:08:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ecf10062
dev-python/nbconvert: Version bump to 4.2.0; Drop patch
Package-Manager: portage-2.2.28
.../nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch | 16 ----------------
.../{nbconvert-9999.ebuild => nbconvert-4.2.0.ebuild} | 12 +++++-------
dev-python/nbconvert/nbconvert-9999.ebuild | 4 +---
3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
deleted file mode 100644
index 130a4af..0000000
--- a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-nbconvert is not yet installed at time of doc generation.
-
-Patch by Marius Brehler
---- docs/Makefile
-+++ docs/Makefile
-@@ -61,8 +61,8 @@ source/config_options.rst:
- @echo "Created docs for config options"
-
- ipynb2rst:
-- jupyter nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
-- jupyter nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
-+ ../scripts/jupyter-nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
-+ ../scripts/jupyter-nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
- @echo "Converted notebooks to rst"
-
- dirhtml:
diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
similarity index 86%
copy from dev-python/nbconvert/nbconvert-9999.ebuild
copy to dev-python/nbconvert/nbconvert-4.2.0.ebuild
index 7c757e7..ead2495 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,20 +6,17 @@ EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-inherit distutils-r1 git-r3
-
-MY_PN="nbconvert"
+inherit distutils-r1
DESCRIPTION="Converting Jupyter Notebooks"
HOMEPAGE="http://jupyter.org"
-EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="doc test"
-PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
-
RDEPEND="
dev-python/jupyter_core[${PYTHON_USEDEP}]
dev-python/nbformat[${PYTHON_USEDEP}]
@@ -27,6 +24,7 @@ RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/traitlets[${PYTHON_USEDEP}]
+ dev-python/entrypoints[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
doc? (
diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild
index 7c757e7..6c287b9 100644
--- a/dev-python/nbconvert/nbconvert-9999.ebuild
+++ b/dev-python/nbconvert/nbconvert-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,8 +18,6 @@ LICENSE="BSD"
SLOT="0"
IUSE="doc test"
-PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch )
-
RDEPEND="
dev-python/jupyter_core[${PYTHON_USEDEP}]
dev-python/nbformat[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-17 11:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-28 18:02 [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/ Marius Brehler
-- strict thread matches above, loose matches on Subject: below --
2016-05-17 11:59 Marius Brehler
2015-09-07 6:49 Justin Lecher
2015-09-04 5:46 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox