From 9c058995c41fc7ac9765813f24fd916b931444df5f60c7491b6668cfc3101b92 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 May 2017 17:04:25 +0000 Subject: [PATCH] Accepting request 493376 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/493376 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pandas?expand=0&rev=3 --- python-pandas-doc.changes | 5 ++++ python-pandas-doc.spec | 47 +++++++++++++++++++---------------- python-pandas.changes | 10 ++++++++ python-pandas.spec | 52 ++++++++++++++++++++++----------------- 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/python-pandas-doc.changes b/python-pandas-doc.changes index 3131887..79f14f0 100644 --- a/python-pandas-doc.changes +++ b/python-pandas-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 25 18:39:03 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. + ------------------------------------------------------------------- Thu Mar 30 15:00:41 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pandas-doc.spec b/python-pandas-doc.spec index 5018a51..76ef9c1 100644 --- a/python-pandas-doc.spec +++ b/python-pandas-doc.spec @@ -16,30 +16,31 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pandas-doc Version: 0.19.2 Release: 0 -Summary: Documentation for python3-pandas +Summary: Documentation for python-pandas License: BSD-3-Clause Group: Documentation/HTML Url: http://pandas.pydata.org/ Source0: https://files.pythonhosted.org/packages/source/p/pandas/pandas-%{version}.tar.gz -BuildRequires: python-pandas = %{version} +BuildRequires: %{python_module pandas = %{version}} BuildRequires: gcc-c++ -BuildRequires: python-Cython -BuildRequires: python-Sphinx -BuildRequires: python-dateutil -BuildRequires: python-devel -BuildRequires: python-matplotlib -BuildRequires: python-numpy-devel >= 1.7.0 -BuildRequires: python-pytz -BuildRequires: python-scipy -BuildRequires: python-setuptools -BuildRequires: python-jupyter_client -BuildRequires: python-jupyter_ipykernel -BuildRequires: python-jupyter_nbconvert -BuildRequires: python-jupyter_nbformat -Recommends: python-pandas = %{version} +BuildRequires: python-rpm-macros +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-Sphinx +BuildRequires: python3-dateutil >= 1.5 +BuildRequires: python3-jupyter_client +BuildRequires: python3-jupyter_ipykernel +BuildRequires: python3-jupyter_nbconvert +BuildRequires: python3-jupyter_nbformat +BuildRequires: python3-matplotlib +BuildRequires: python3-numpy-devel >= 1.7.1 +BuildRequires: python3-pytz +BuildRequires: python3-scipy +Provides: %{python_module pandas-doc = %{version}} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -50,15 +51,19 @@ Documentation, help files, and examples for python3-pandas. %setup -q -n pandas-%{version} %build -python setup.py build_ext --inplace +python3 setup.py build_ext --inplace + +pushd doc +python3 make.py html +popd %install -pushd doc -python make.py html -popd +mkdir -p %{buildroot}%{_docdir}/python-pandas +cp -r doc/build/html %{buildroot}%{_docdir}/python-pandas/ %files %defattr(-,root,root) -%doc doc/build/html/ +%doc LICENSE +%{_docdir}/python-pandas/ %changelog diff --git a/python-pandas.changes b/python-pandas.changes index 13bc889..8e6e877 100644 --- a/python-pandas.changes +++ b/python-pandas.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon May 8 03:37:27 UTC 2017 - toddrme2178@gmail.com + +- Fix dateutil dependency + +------------------------------------------------------------------- +Tue Apr 25 18:39:03 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. + ------------------------------------------------------------------- Thu Mar 30 15:00:41 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pandas.spec b/python-pandas.spec index b74306e..1690cea 100644 --- a/python-pandas.spec +++ b/python-pandas.spec @@ -16,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pandas Version: 0.19.2 Release: 0 @@ -26,36 +27,42 @@ Url: http://pandas.pydata.org/ Source0: https://files.pythonhosted.org/packages/source/p/pandas/pandas-%{version}.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: python-Cython -BuildRequires: python-dateutil -BuildRequires: python-devel -BuildRequires: python-numpy-devel >= 1.7.0 -BuildRequires: python-pytz -BuildRequires: python-setuptools -Requires: python-dateutil -Requires: python-numpy >= 1.7.0 +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module numpy-devel >= 1.7.1} +BuildRequires: %{python_module python-dateutil >= 1.5} +BuildRequires: %{python_module pytz} +Requires: python-numpy >= 1.7.1 +Requires: python-python-dateutil >= 1.5 Requires: python-pytz Recommends: python-Bottleneck Recommends: python-Jinja2 +Recommends: python-SQLAlchemy >= 0.8.1 Recommends: python-beautifulsoup4 Recommends: python-blosc Recommends: python-boto +Recommends: python-google-api-python-client Recommends: python-html5lib Recommends: python-lxml Recommends: python-matplotlib Recommends: python-numexpr >= 2.1 -Recommends: python-openpyxl +Recommends: python-oauth2client +Recommends: python-openpyxl >= 2.2 +Recommends: python-python-gflags Recommends: python-scipy -Recommends: python-statsmodels -Recommends: python-SQLAlchemy -Recommends: python-statsmodels Recommends: python-tables >= 3.0.0 -Recommends: python-xarray +Recommends: python-xarray >= 0.7.0 Recommends: python-xlrd -Recommends: python-xlsxwriter +Recommends: python-XlsxWriter Recommends: python-xlwt Recommends: xclip +%ifpython2 +Recommends: python-backports.lzma +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%python_subpackages %description pandas is a Python package providing fast, flexible, and expressive data @@ -69,20 +76,21 @@ analysis / manipulation tool available in any language. %setup -q -n pandas-%{version} %build -CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build +export CFLAGS="%{optflags} -fno-strict-aliasing" +%python_build %install -python setup.py install --root %{buildroot} --prefix=%{_prefix} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} -rm -r %{buildroot}%{python_sitearch}/pandas/tests -%fdupes %{buildroot}%{python_sitearch} +%python_expand rm -r %{buildroot}%{$python_sitearch}/pandas/tests # Fix python-bytecode-inconsistent-mtime -pushd %{buildroot}%{python_sitearch} -%py_compile . -popd +# pushd %{buildroot}%{python_sitearch} +# %py_compile . +# popd -%files +%files %{python_files} %defattr(-,root,root) %doc LICENSE doc/README.rst RELEASE.md %{python_sitearch}/pandas/