| |
@@ -2,7 +2,7 @@
|
| |
|
| |
Name: python-%{pypi_name}
|
| |
Version: 5.2.1
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
Summary: Converting Jupyter Notebooks
|
| |
|
| |
License: BSD and MIT
|
| |
@@ -14,15 +14,17 @@
|
| |
BuildRequires: python2-devel
|
| |
BuildRequires: python-sphinx
|
| |
|
| |
+ BuildRequires: python3-pandocfilters
|
| |
BuildRequires: python3-setuptools
|
| |
- BuildRequires: python3-sphinx
|
| |
+ BuildRequires: python3-sphinx
|
| |
+ BuildRequires: python3-testpath
|
| |
BuildRequires: python3-devel
|
| |
|
| |
# for building docs
|
| |
- BuildRequires: python3-nbsphinx
|
| |
- BuildRequires: python3-ipython
|
| |
- BuildRequires: python3-ipython-sphinx
|
| |
- BuildRequires: pandoc
|
| |
+ BuildRequires: python3-nbsphinx
|
| |
+ BuildRequires: python3-ipython
|
| |
+ BuildRequires: python3-ipython-sphinx
|
| |
+ BuildRequires: pandoc
|
| |
|
| |
%description
|
| |
The nbconvert tool, jupyter nbconvert, converts notebooks to various other
|
| |
@@ -63,6 +65,10 @@
|
| |
Requires: python3-entrypoints
|
| |
Requires: python3-setuptools
|
| |
|
| |
+ # executables moved from py2 to py3
|
| |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1410332
|
| |
+ # Can be removed in Fedora 30
|
| |
+ Conflicts: python2-%{pypi_name} < 5.2.1-3
|
| |
|
| |
%description -n python3-%{pypi_name}
|
| |
|
| |
@@ -91,37 +97,31 @@
|
| |
rm -rf html/.{doctrees,buildinfo}
|
| |
|
| |
%install
|
| |
+ %py2_install
|
| |
+ rm %{buildroot}%{_bindir}/*
|
| |
+
|
| |
+ # fix permissions and shebangs
|
| |
+ sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
+ chmod 755 %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
+
|
| |
|
| |
%py3_install
|
| |
- mv %{buildroot}/%{_bindir}/jupyter-nbconvert %{buildroot}/%{_bindir}/jupyter-nbconvert-3
|
| |
- ln -sf %{_bindir}/jupyter-nbconvert-3 %{buildroot}/%{_bindir}/jupyter-nbconvert-%{python3_version}
|
| |
|
| |
# fix permissions and shebangs
|
| |
sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' %{buildroot}%{python3_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
chmod 755 %{buildroot}%{python3_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
|
| |
- %py2_install
|
| |
- cp %{buildroot}/%{_bindir}/jupyter-nbconvert %{buildroot}/%{_bindir}/jupyter-nbconvert-2
|
| |
- ln -sf %{_bindir}/jupyter-nbconvert-2 %{buildroot}/%{_bindir}/jupyter-nbconvert-%{python2_version}
|
| |
-
|
| |
- # fix permissions and shebangs
|
| |
- sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
- chmod 755 %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
|
| |
|
| |
%files -n python2-%{pypi_name}
|
| |
%license COPYING.md
|
| |
%doc docs/README.md
|
| |
- %{_bindir}/jupyter-nbconvert
|
| |
- %{_bindir}/jupyter-nbconvert-2
|
| |
- %{_bindir}/jupyter-nbconvert-%{python2_version}
|
| |
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
%{python2_sitelib}/%{pypi_name}/*
|
| |
|
| |
%files -n python3-%{pypi_name}
|
| |
%license COPYING.md
|
| |
%doc docs/README.md
|
| |
- %{_bindir}/jupyter-nbconvert-3
|
| |
- %{_bindir}/jupyter-nbconvert-%{python3_version}
|
| |
+ %{_bindir}/jupyter-nbconvert
|
| |
%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
%{python3_sitelib}/%{pypi_name}/*
|
| |
|
| |
@@ -129,6 +129,10 @@
|
| |
%doc html
|
| |
|
| |
%changelog
|
| |
+ * Fri Sep 01 2017 Miro Hrončok <mhroncok@redhat.com> - 5.2.1-3
|
| |
+ - Move executables from py2 to py3 (#1410332)
|
| |
+ - Add BRs to make the docs build
|
| |
+
|
| |
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.1-2
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
| |
|
| |
churchyard
commented 6 years ago
Also, relevant commits.
Koji scratchbuild: https://koji.fedoraproject.org/koji/taskinfo?taskID=21605177