diff --git a/.gitignore b/.gitignore index 1f1cdb5..90d0500 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /APLpy-0.9.13.tar.gz /APLpy-0.9.14.tar.gz /APLpy-1.0.tar.gz +/APLpy.spec +/APLpy-1.1.tar.gz diff --git a/APLpy.spec b/APLpy.spec index 0defbcd..21396c3 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,24 +1,18 @@ -%global with_python3 1 +%global srcname APLpy Name: APLpy -Version: 1.0 -Release: 6%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages License: MIT URL: http://aplpy.github.com -Source0: https://pypi.python.org/packages/source/A/%{name}/%{name}-%{version}.tar.gz +Source0: https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar.gz Patch0: aplpy-system-decorator.patch BuildArch: noarch -BuildRequires: python2-devel numpy python-matplotlib python-astropy -BuildRequires: python-matplotlib-tk pytest python-decorator -# For checks -BuildRequires: python-nose python-pillow -Requires: numpy python-matplotlib python-astropy python-decorator -Requires: python-nose -Provides: python2-APLpy +BuildRequires: python2-devel python3-devel %description APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at @@ -27,32 +21,44 @@ The module uses Matplotlib, a powerful and interactive plotting package. It is capable of creating output files in several graphical formats, including EPS, PDF, PS, PNG, and SVG. -Main features: - -o Make plots interactively or using scripts -o Show grayscale, colorscale, and 3-color RGB images of FITS files -o Generate co-aligned FITS cubes to make 3-color RGB images -o Overlay any number of contour sets -o Overlay markers with fully customizable symbols -o Plot customizable shapes like circles, ellipses, and rectangles -o Overlay ds9 region files -o Overlay coordinate grids -o Show colorbars, scalebars, and beams -o Customize the appearance of labels and ticks -o Hide, show, and remove different contour and marker layers -o Pan, zoom, and save any view as a full publication-quality plot -o Save plots as EPS, PDF, PS, PNG, and SVG - -%if 0%{?with_python3} -%package -n python3-APLpy +%package -n python2-APLpy Summary: The Astronomical Plotting Library in Python +%{?python_provide:%python_provide python2-%{srcname}} +BuildRequires: python2-numpy +BuildRequires: python2-matplotlib +BuildRequires: python2-astropy +BuildRequires: python2-decorator +BuildRequires: python2-pillow +BuildRequires: python2-pytest + +Requires: python2-numpy +Requires: python2-matplotlib +Requires: python2-astropy +Requires: python2-decorator +Recommends: python2-pillow + +%description -n python2-APLpy +APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at +producing publication-quality plots of astronomical imaging data in FITS format. +The module uses Matplotlib, a powerful and interactive plotting package. It is +capable of creating output files in several graphical formats, including EPS, +PDF, PS, PNG, and SVG. -BuildRequires: python3-devel python3-numpy python3-matplotlib python3-astropy -BuildRequires: python3-matplotlib-tk python3-pytest python3-decorator -# For checks -BuildRequires: python3-nose python3-pillow -Requires: python3-numpy python3-matplotlib python3-astropy python3-decorator -Requires: python3-nose +%package -n python3-APLpy +Summary: The Astronomical Plotting Library in Python +%{?python_provide:%python_provide python3-%{srcname}} +BuildRequires: python3-numpy +BuildRequires: python3-matplotlib +BuildRequires: python3-astropy +BuildRequires: python3-decorator +BuildRequires: python3-pillow +BuildRequires: python3-pytest + +Requires: python3-numpy +Requires: python3-matplotlib +Requires: python3-astropy +Requires: python3-decorator +Recommends: python3-pillow %description -n python3-APLpy APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at @@ -61,94 +67,57 @@ The module uses Matplotlib, a powerful and interactive plotting package. It is capable of creating output files in several graphical formats, including EPS, PDF, PS, PNG, and SVG. -Main features: - -o Make plots interactively or using scripts -o Show grayscale, colorscale, and 3-color RGB images of FITS files -o Generate co-aligned FITS cubes to make 3-color RGB images -o Overlay any number of contour sets -o Overlay markers with fully customizable symbols -o Plot customizable shapes like circles, ellipses, and rectangles -o Overlay ds9 region files -o Overlay coordinate grids -o Show colorbars, scalebars, and beams -o Customize the appearance of labels and ticks -o Hide, show, and remove different contour and marker layers -o Pan, zoom, and save any view as a full publication-quality plot -o Save plots as EPS, PDF, PS, PNG, and SVG - -%endif # 0%{?with_python3} - %prep %setup -q -n %{name}-%{version} rm -rf aplpy/decorator.py %patch0 -p1 -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' -%endif # 0%{?with_python3} - -find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' - %build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif # 0%{?with_python3} +%py2_build +%py3_build %install -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # 0%{?with_python3} - -%{__python2} setup.py install --skip-build --root %{buildroot} +%py2_install +%py3_install %check -# Disable some failing tests (https://github.com/aplpy/aplpy/issues/278) -# - -# Fake matplotlibrc +# Empty matplotlibrc mkdir matplotlib touch matplotlib/matplotlibrc export XDG_CONFIG_HOME=`pwd` pushd %{buildroot}/%{python2_sitelib} -py.test-%{python2_version} -k "not test_images and not test_rgb" aplpy +py.test-%{python2_version} aplpy popd -%if 0%{?with_python3} pushd %{buildroot}/%{python3_sitelib} -py.test-%{python3_version} -k "not test_images and not test_rgb" aplpy +py.test-%{python3_version} aplpy popd -%endif # 0%{?with_python3} -%files -%doc CHANGES.rst README.rst -%license LICENSE.rst +# CHANGES.rst and LICENSE.rst missing from upstream tarball +# https://github.com/aplpy/aplpy/issues/316 +%files -n python2-APLpy +#%doc CHANGES.rst README.rst +%doc CHANGES.rst +#%license LICENSE.rst %{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/aplpy/ -%if 0%{?with_python3} %files -n python3-APLpy -%doc CHANGES.rst README.rst -%license LICENSE.rst +#%doc CHANGES.rst README.rst +%doc CHANGES.rst +#%license LICENSE.rst %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/aplpy/ -%endif # 0%{?with_python3} %changelog -* Tue Jul 19 2016 Fedora Release Engineering -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages +* Sun Oct 02 2016 Sergio Pascual - 1.1-1 +- New upstream version (1.1) +- Updated spec +- Fixes bz #1380134 * Wed Feb 03 2016 Fedora Release Engineering - 1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Tue Nov 17 2025 Sergio Pascual - 1.0-4 +* Tue Nov 17 2015 Sergio Pascual - 1.0-4 - Disable some failing tests (https://github.com/aplpy/aplpy/issues/278) * Tue Nov 10 2015 Fedora Release Engineering - 1.0-3 diff --git a/sources b/sources index d7a0fad..3a976e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a660dc5a5e62536e32bf61e44a5eb6c8 APLpy-1.0.tar.gz +d9ae00edaeacf8f5dae00ffbf4b6e17c APLpy-1.1.tar.gz