Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

[skip changelog]

.gitignore

@@ -7,3 +7,7 @@
 /APLpy-1.0.tar.gz
 /APLpy.spec
 /APLpy-1.1.tar.gz
+/APLpy-1.1.1.tar.gz
+/APLpy-2.0.tar.gz
+/APLpy-2.0.3.tar.gz
+/aplpy-2.2.0.tar.gz

APLpy.spec

@@ -1,18 +1,17 @@
-%global srcname APLpy
+%global srcname aplpy
 
 Name:           APLpy
-Version:        1.1
-Release:        1%{?dist}
+Version:        2.2.0
+Release:        %autorelease
 Summary:        The Astronomical Plotting Library in Python
 
-Group:          Development/Languages
+# SPDX license is MIT
 License:        MIT
 URL:            http://aplpy.github.com
-Source0:        https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar.gz
-Patch0:         aplpy-system-decorator.patch
+Source0:        %{pypi_source}
 
 BuildArch:      noarch
-BuildRequires:  python2-devel python3-devel 
+BuildRequires:  python3-devel 
 
 %description
 APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at 
@@ -21,44 +20,10 @@ 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.
 
-%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.
-
 %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
+BuildRequires: python3dist(setuptools)
 
 %description -n python3-APLpy
 APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at 
@@ -68,117 +33,24 @@ capable of creating output files in several graphical formats, including EPS,
 PDF, PS, PNG, and SVG.
 
 %prep
-%setup -q -n %{name}-%{version}
-rm -rf aplpy/decorator.py
-%patch0 -p1
+%autosetup -n %{srcname}-%{version} -p1
+
+%generate_buildrequires
+%pyproject_buildrequires -x test
 
 %build
-%py2_build
-%py3_build
+%pyproject_wheel
 
 %install
-%py2_install
-%py3_install
+%pyproject_install 
+
+%pyproject_save_files -l aplpy
 
 %check
-# Empty matplotlibrc
-mkdir matplotlib
-touch matplotlib/matplotlibrc
-export XDG_CONFIG_HOME=`pwd`
-pushd %{buildroot}/%{python2_sitelib}
-py.test-%{python2_version} aplpy
-popd
-pushd %{buildroot}/%{python3_sitelib}
-py.test-%{python3_version} aplpy
-popd
+%pyproject_check_import -t
 
-# 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/
-
-%files -n python3-APLpy
-#%doc CHANGES.rst README.rst
-%doc CHANGES.rst
-#%license LICENSE.rst
-%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
-%{python3_sitelib}/aplpy/
+%files -n python3-APLpy -f %{pyproject_files}
+%doc CHANGES.md CITATION README.rst
 
 %changelog
-* Sun Oct 02 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1-1
-- New upstream version (1.1)
-- Updated spec
-- Fixes bz #1380134
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Nov 17 2015 Sergio Pascual <sergiopr@fedoraproject.org> - 1.0-4
-- Disable some failing tests (https://github.com/aplpy/aplpy/issues/278)
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Mar 02 2015 Sergio Pascual <sergiopr@fedoraproject.org> - 1.0-1
-- New upstream version (1.0)
-- Use license macro
-
-* Thu Dec 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.14-2
-- Disable python3 tests
-
-* Thu Dec 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.14-1
-- New upstream source (0.9.14), several bug fixes
-
-* Tue Oct 07 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.13-1
-- New upstream source (0.9.13), fixes bug in 0.9.11 and 0.9.12
-
-* Thu Sep 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.12-2
-- Provide python3 subpackage
-- Unbundle decorator
-
-* Thu Sep 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.12-1
-- New upstream source (0.9.12)
-- Tests enabled
-
-* Wed Sep 10 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.11-2
-- Disable tests for the moment
-
-* Tue Jul 08 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.11-1
-- Updated to new version
-- Run tests on installed version
-- Use python2 macros
-
-* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu May 03 2012 Germán A. Racca <skytux@fedoraproject.org> - 0.9.8-1
-- Updated to new version
-- Included tests in %%check and corresponding BRs
-- Packaged tests in %%doc section
-
-* Mon Feb 06 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-3
-- Minor changes to spec file after approval
-- Removed INSTALL file
-
-* Mon Jan 30 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-2
-- Changed name of spec file to match the project name
-
-* Mon Jan 23 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-1
-- Initial release of RPM package
-
+%autochangelog

aplpy-system-decorator.patch

@@ -1,13 +0,0 @@
-Sólo en APLpy-0.9.12/aplpy: decorator.py
-diff -ur APLpy-0.9.12/aplpy/decorators.py APLpy-0.9.12dec/aplpy/decorators.py
---- APLpy-0.9.12/aplpy/decorators.py	2014-09-11 12:18:49.933438183 +0200
-+++ APLpy-0.9.12dec/aplpy/decorators.py	2014-09-11 12:21:13.560661630 +0200
-@@ -2,7 +2,7 @@
- 
- import threading
- 
--from .decorator import decorator
-+from decorator import decorator
- 
- 
- mydata = threading.local()

changelog

@@ -0,0 +1,197 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jun 22 2024 Sergio Pascual <sergiopr@fedoraproject.org> - 2.0.3-27
+- Fix FTBS with python 3.13
+- Update packaging macros
+
+* Tue Jun 18 2024 Python Maint <python-maint@redhat.com> - 2.0.3-26
+- Rebuilt for Python 3.13
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jul 12 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.3-21
+- Workaround for python 3.12 change of imp module removal
+- Workaround for astropy 5.1 astropy.tests.plugins.display removal and so on
+
+* Wed Jul 12 2023 Python Maint <python-maint@redhat.com> - 2.0.3-20
+- Rebuilt for Python 3.12
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul  3 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.3-17
+- Backport upstream patch for test failure w.r.t compatibility with astropy 5.0.1
+
+* Fri Jun 17 2022 Python Maint <python-maint@redhat.com> - 2.0.3-16
+- Rebuilt for Python 3.11
+
+* Thu Feb 17 2022 Sergio Pascual <sergiopr@fedoraproject.org> - 2.0.3-15
+- Fix astropy 5 function incompatibility
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.0.3-12
+- Rebuilt for Python 3.10
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 02 2020 Sergio Pascual <sergiopr@fedoraproject.org> - 2.0.3-9
+- Add BR python3-setuptools
+- Add BR python3-reproject
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-8
+- Rebuilt for Python 3.9
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-6
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-5
+- Rebuilt for Python 3.8
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0.3-4
+- Rebuilt for Python 3.8
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 04 2019 Christian Dersch <lupinix@mailbox.org> - 2.0.3-2
+- Disable automatic dependency generators until we fixed (optional) deps
+
+* Mon Feb 25 2019 Sergio Pascual <sergiopr@fedoraproject.org> - 2.0.3-1
+- New upstream version (2.0.3)
+
+* Sun Feb 17 2019 Sergio Pascual <sergiopr@fedoraproject.org> - 2.0-1
+- New upstream version (2.0)
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 05 2018 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1.1-2
+- Drop python2 subpackage
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jul 08 2018 Christian Dersch <lupinix@mailbox.org> - 1.1.1-6
+- Failing tests are only deprecation warnings... Ignore them and report upstream
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-5
+- Rebuilt for Python 3.7
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1.1-1
+- New upstream version (1.1.1)
+- Include license file
+- Do not write pyc files when running tests
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.1-3
+- Rebuild for Python 3.6
+
+* Sun Oct 02 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1-2
+- EVR bump
+
+* Sun Sep 25 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1-1
+- New upstream version (1.1)
+- Updated spec
+- Fixes bz #1380134
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Nov 17 2015 Sergio Pascual <sergiopr@fedoraproject.org> - 1.0-4
+- Disable some failing tests (https://github.com/aplpy/aplpy/issues/278)
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Mar 02 2015 Sergio Pascual <sergiopr@fedoraproject.org> - 1.0-1
+- New upstream version (1.0)
+- Use license macro
+
+* Thu Dec 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.14-2
+- Disable python3 tests
+
+* Thu Dec 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.14-1
+- New upstream source (0.9.14), several bug fixes
+
+* Tue Oct 07 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.13-1
+- New upstream source (0.9.13), fixes bug in 0.9.11 and 0.9.12
+
+* Thu Sep 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.12-2
+- Provide python3 subpackage
+- Unbundle decorator
+
+* Thu Sep 11 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.12-1
+- New upstream source (0.9.12)
+- Tests enabled
+
+* Wed Sep 10 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.11-2
+- Disable tests for the moment
+
+* Tue Jul 08 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.11-1
+- Updated to new version
+- Run tests on installed version
+- Use python2 macros
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu May 03 2012 Germán A. Racca <skytux@fedoraproject.org> - 0.9.8-1
+- Updated to new version
+- Included tests in %%check and corresponding BRs
+- Packaged tests in %%doc section
+
+* Mon Feb 06 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-3
+- Minor changes to spec file after approval
+- Removed INSTALL file
+
+* Mon Jan 30 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-2
+- Changed name of spec file to match the project name
+
+* Mon Jan 23 2012 Germán A. Racca <skytux@fedoraproject.org> 0.9.6-1
+- Initial release of RPM package

sources

@@ -1 +1 @@
-d9ae00edaeacf8f5dae00ffbf4b6e17c  APLpy-1.1.tar.gz
+SHA512 (aplpy-2.2.0.tar.gz) = efb5af12da698861c596d3935580ca5dbe168779382702064ed8c728f9a56e82c06eb6ee101a0c66afaf35e7e55c7a9f53fa07aba379b91e13f2fa4ddce0ec98