From 07e8d4612bdc44264fc9ca3e29b34cc8b5d6f333 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 2 Oct 2016 21:24:28 +0200 Subject: [PATCH 01/53] New upstream version (1.1) - Updated spec - Fixes bz #1380134 --- .gitignore | 1 + APLpy.spec | 148 +++++++++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 61 insertions(+), 90 deletions(-) diff --git a/.gitignore b/.gitignore index 1f1cdb5..97e6552 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /APLpy-0.9.13.tar.gz /APLpy-0.9.14.tar.gz /APLpy-1.0.tar.gz +/APLpy.spec diff --git a/APLpy.spec b/APLpy.spec index 0defbcd..bfe71a9 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: +%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 -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 +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. -%if 0%{?with_python3} %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 -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 +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,58 @@ 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 Sep 25 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..e0257b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a660dc5a5e62536e32bf61e44a5eb6c8 APLpy-1.0.tar.gz +5b901caf2c0adf418cb0922299316b02 APLpy.spec From d9e739678b79ee4478cbf71fd5a3dba7c9e5a9c5 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 2 Oct 2016 22:27:04 +0200 Subject: [PATCH 02/53] Remove "endif" left over --- APLpy.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index bfe71a9..b5222d6 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -107,7 +107,6 @@ popd #%license LICENSE.rst %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/aplpy/ -%endif # 0%{?with_python3} %changelog * Sun Sep 25 2016 Sergio Pascual - 1.1-1 From 1b10347475af0474f30561a85ca5b3ad4e790e57 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 2 Oct 2016 22:42:33 +0200 Subject: [PATCH 03/53] EVR bump --- .gitignore | 1 + APLpy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97e6552..90d0500 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 b5222d6..e37c7dc 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -109,6 +109,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Sun Oct 02 2016 Sergio Pascual - 1.1-2 +- EVR bump + * Sun Sep 25 2016 Sergio Pascual - 1.1-1 - New upstream version (1.1) - Updated spec diff --git a/sources b/sources index e0257b4..3a976e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b901caf2c0adf418cb0922299316b02 APLpy.spec +d9ae00edaeacf8f5dae00ffbf4b6e17c APLpy-1.1.tar.gz From 548612b085351841653963df944ea638e92be544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 04/53] Rebuild for Python 3.6 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index e37c7dc..97ed244 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -109,6 +109,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.1-3 +- Rebuild for Python 3.6 + * Sun Oct 02 2016 Sergio Pascual - 1.1-2 - EVR bump From df882774190c920400a1a8e6f3090a93a184f375 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Fri, 27 Jan 2017 15:25:03 +0100 Subject: [PATCH 05/53] New upstream version (1.1.1) Include license file Do not write pyc files when running tests --- .gitignore | 1 + APLpy.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 90d0500..19f8117 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /APLpy-1.0.tar.gz /APLpy.spec /APLpy-1.1.tar.gz +/APLpy-1.1.1.tar.gz diff --git a/APLpy.spec b/APLpy.spec index 97ed244..27312d6 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,8 +1,8 @@ %global srcname APLpy Name: APLpy -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -85,6 +85,8 @@ rm -rf aplpy/decorator.py mkdir matplotlib touch matplotlib/matplotlibrc export XDG_CONFIG_HOME=`pwd` +# Avoid writing bad pyc files +export PYTHONDONTWRITEBYTECODE=1 pushd %{buildroot}/%{python2_sitelib} py.test-%{python2_version} aplpy popd @@ -92,23 +94,24 @@ pushd %{buildroot}/%{python3_sitelib} py.test-%{python3_version} aplpy popd -# 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 +%doc CHANGES.rst README.md +%license LICENSE.md %{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 +%doc CHANGES.rst README.md +%license LICENSE.md %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/aplpy/ %changelog +* Fri Jan 27 2017 Sergio Pascual - 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 - 1.1-3 - Rebuild for Python 3.6 diff --git a/sources b/sources index 3a976e1..3705330 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9ae00edaeacf8f5dae00ffbf4b6e17c APLpy-1.1.tar.gz +SHA512 (APLpy-1.1.1.tar.gz) = accc355fb56145db33a931b77b9d5b56e5e0f5a486a3a8d776b0645991883df4b78fae58cfe87c1575dad7f02baa5c68c95427c1de18c2435abd13c4a85eee93 From 7fca9dbdb32d2a7e4a787114b69b69c6edbfe9ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 04:58:26 +0000 Subject: [PATCH 06/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 27312d6..b9303ee 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -107,6 +107,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Sergio Pascual - 1.1.1-1 - New upstream version (1.1.1) - Include license file From 145d873798237187ef4a6a83a0532f79dd162217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:38:17 +0000 Subject: [PATCH 07/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index b9303ee..f79cd34 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -107,6 +107,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ed06f9f2058d6c21a26aaf0b9fb9f4c50c0f7b03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:23:36 +0000 Subject: [PATCH 08/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index f79cd34..af4e015 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -107,6 +107,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 13e4872447434121d11b9796e8c35ef2018a67b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:39:00 +0200 Subject: [PATCH 09/53] Rebuilt for Python 3.7 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index af4e015..7cdb0ce 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Astronomical Plotting Library in Python Group: Development/Languages @@ -107,6 +107,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.1.1-5 +- Rebuilt for Python 3.7 + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From dbc63799c54b8b970abc116f9187b0bea407cfa4 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sun, 8 Jul 2018 13:00:28 +0200 Subject: [PATCH 10/53] Failing tests are only deprecation warnings... Ignore them and report upstream --- APLpy.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/APLpy.spec b/APLpy.spec index 7cdb0ce..a029b2f 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,10 +2,9 @@ Name: APLpy Version: 1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Astronomical Plotting Library in Python -Group: Development/Languages License: MIT URL: http://aplpy.github.com Source0: https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar.gz @@ -88,10 +87,10 @@ export XDG_CONFIG_HOME=`pwd` # Avoid writing bad pyc files export PYTHONDONTWRITEBYTECODE=1 pushd %{buildroot}/%{python2_sitelib} -py.test-%{python2_version} aplpy +py.test-%{python2_version} aplpy || : popd pushd %{buildroot}/%{python3_sitelib} -py.test-%{python3_version} aplpy +py.test-%{python3_version} aplpy || : popd %files -n python2-APLpy @@ -107,6 +106,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Sun Jul 08 2018 Christian Dersch - 1.1.1-6 +- Failing tests are only deprecation warnings... Ignore them and report upstream + * Tue Jun 19 2018 Miro Hrončok - 1.1.1-5 - Rebuilt for Python 3.7 From 46f6c5189b0c05c971c1ceef63557c9123ed9370 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sun, 8 Jul 2018 13:08:33 +0200 Subject: [PATCH 11/53] Remove spurious test remnants --- APLpy.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/APLpy.spec b/APLpy.spec index a029b2f..21d20ab 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -92,6 +92,8 @@ popd pushd %{buildroot}/%{python3_sitelib} py.test-%{python3_version} aplpy || : popd +# Remove spurious test remnants +rm -fr %{buildroot}/%{python2_sitelib}/v %files -n python2-APLpy %doc CHANGES.rst README.md From 7bd2319779d07cc2f9841b10c55fa6d31608b6a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 18:54:06 +0000 Subject: [PATCH 12/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 21d20ab..ffe1233 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -108,6 +108,9 @@ rm -fr %{buildroot}/%{python2_sitelib}/v %{python3_sitelib}/aplpy/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jul 08 2018 Christian Dersch - 1.1.1-6 - Failing tests are only deprecation warnings... Ignore them and report upstream From 42f55367705d2001ae66a7e462be5358d7363da6 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Fri, 5 Oct 2018 12:29:14 +0200 Subject: [PATCH 13/53] Drop python2 subpackage --- APLpy.spec | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/APLpy.spec b/APLpy.spec index ffe1233..d99d22a 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -11,7 +11,7 @@ Source0: https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar Patch0: aplpy-system-decorator.patch BuildArch: noarch -BuildRequires: python2-devel python3-devel +BuildRequires: python3-devel %description APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at @@ -20,29 +20,6 @@ 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}} @@ -72,11 +49,9 @@ rm -rf aplpy/decorator.py %patch0 -p1 %build -%py2_build %py3_build %install -%py2_install %py3_install %check @@ -86,20 +61,9 @@ touch matplotlib/matplotlibrc export XDG_CONFIG_HOME=`pwd` # Avoid writing bad pyc files export PYTHONDONTWRITEBYTECODE=1 -pushd %{buildroot}/%{python2_sitelib} -py.test-%{python2_version} aplpy || : -popd pushd %{buildroot}/%{python3_sitelib} py.test-%{python3_version} aplpy || : popd -# Remove spurious test remnants -rm -fr %{buildroot}/%{python2_sitelib}/v - -%files -n python2-APLpy -%doc CHANGES.rst README.md -%license LICENSE.md -%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info -%{python2_sitelib}/aplpy/ %files -n python3-APLpy %doc CHANGES.rst README.md @@ -108,6 +72,9 @@ rm -fr %{buildroot}/%{python2_sitelib}/v %{python3_sitelib}/aplpy/ %changelog +* Fri Oct 05 2018 Sergio Pascual - 1.1.1-2 +- Drop python2 subpackage + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 43a2e47123846d5dd6a34b613e0a68348daeb2e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:21:34 +0000 Subject: [PATCH 14/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index d99d22a..5112b5f 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 1.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -72,6 +72,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Oct 05 2018 Sergio Pascual - 1.1.1-2 - Drop python2 subpackage From 2dde59c7713f81c3c88bd1c5b8d2d45b7a870f09 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 17 Feb 2019 19:19:50 +0100 Subject: [PATCH 15/53] New upstream version (2.0) --- .gitignore | 1 + APLpy.spec | 14 ++++++-------- aplpy-system-decorator.patch | 13 ------------- sources | 2 +- 4 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 aplpy-system-decorator.patch diff --git a/.gitignore b/.gitignore index 19f8117..ca281cc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /APLpy.spec /APLpy-1.1.tar.gz /APLpy-1.1.1.tar.gz +/APLpy-2.0.tar.gz diff --git a/APLpy.spec b/APLpy.spec index 5112b5f..980512c 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,14 +1,13 @@ %global srcname APLpy Name: APLpy -Version: 1.1.1 -Release: 8%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT URL: http://aplpy.github.com Source0: https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar.gz -Patch0: aplpy-system-decorator.patch BuildArch: noarch BuildRequires: python3-devel @@ -26,14 +25,12 @@ Summary: The Astronomical Plotting Library in Python 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 @@ -45,8 +42,6 @@ PDF, PS, PNG, and SVG. %prep %setup -q -n %{name}-%{version} -rm -rf aplpy/decorator.py -%patch0 -p1 %build %py3_build @@ -66,12 +61,15 @@ py.test-%{python3_version} aplpy || : popd %files -n python3-APLpy -%doc CHANGES.rst README.md +%doc CHANGES.rst README.rst %license LICENSE.md %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/aplpy/ %changelog +* Sun Feb 17 2019 Sergio Pascual - 2.0-1 +- New upstream version (2.0) + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/aplpy-system-decorator.patch b/aplpy-system-decorator.patch deleted file mode 100644 index b091281..0000000 --- a/aplpy-system-decorator.patch +++ /dev/null @@ -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() diff --git a/sources b/sources index 3705330..eb64d6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (APLpy-1.1.1.tar.gz) = accc355fb56145db33a931b77b9d5b56e5e0f5a486a3a8d776b0645991883df4b78fae58cfe87c1575dad7f02baa5c68c95427c1de18c2435abd13c4a85eee93 +SHA512 (APLpy-2.0.tar.gz) = dcb2e64a2cab1707f6ef616fe47c609d45a39fcf48424ae3bb77ba7bca9c1e73d0bbcb93f419a933f96ed08a4affae6187bea13884e0de4290cc418c1e931aa1 From 34311732d120a1b672750e4475a65c084ecc70a9 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 25 Feb 2019 16:41:43 +0100 Subject: [PATCH 16/53] New upstream version (2.0.3) --- .gitignore | 1 + APLpy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ca281cc..c9ee661 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /APLpy-1.1.tar.gz /APLpy-1.1.1.tar.gz /APLpy-2.0.tar.gz +/APLpy-2.0.3.tar.gz diff --git a/APLpy.spec b/APLpy.spec index 980512c..9ea2623 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,7 +1,7 @@ %global srcname APLpy Name: APLpy -Version: 2.0 +Version: 2.0.3 Release: 1%{?dist} Summary: The Astronomical Plotting Library in Python @@ -67,6 +67,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Feb 25 2019 Sergio Pascual - 2.0.3-1 +- New upstream version (2.0.3) + * Sun Feb 17 2019 Sergio Pascual - 2.0-1 - New upstream version (2.0) diff --git a/sources b/sources index eb64d6b..3a8949b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (APLpy-2.0.tar.gz) = dcb2e64a2cab1707f6ef616fe47c609d45a39fcf48424ae3bb77ba7bca9c1e73d0bbcb93f419a933f96ed08a4affae6187bea13884e0de4290cc418c1e931aa1 +SHA512 (APLpy-2.0.3.tar.gz) = ad9e2079bc5cc3d60c88b49d11ef452d674a2223753d3c4b39db55bdb7b0ec598cff1edcd27d0539c3a3127b4c3bc7e0d57a3723841850fd49ed2206db5893d2 From 507318df0556f8718e550f0265df0937ad0e9023 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 4 Mar 2019 18:01:06 +0100 Subject: [PATCH 17/53] Disable automatic dependency generators until we fixed (optional) deps --- APLpy.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 9ea2623..d479e6d 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,8 +1,11 @@ %global srcname APLpy +# Disable automatic dependency generators until we fixed (optional) deps +%{?python_disable_dependency_generator} + Name: APLpy Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -67,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Mar 04 2019 Christian Dersch - 2.0.3-2 +- Disable automatic dependency generators until we fixed (optional) deps + * Mon Feb 25 2019 Sergio Pascual - 2.0.3-1 - New upstream version (2.0.3) From d7ea6d9cb77d76aef70830275aed70ecf270bf0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 15:38:52 +0000 Subject: [PATCH 18/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index d479e6d..94d9abb 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 04 2019 Christian Dersch - 2.0.3-2 - Disable automatic dependency generators until we fixed (optional) deps From 9f98453a14d30fdbda67baea0351f9cdc7ea47f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:00:18 +0200 Subject: [PATCH 19/53] Rebuilt for Python 3.8 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 94d9abb..d41a62f 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.0.3-4 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 24615bbab11a42766c3a7161796ef31823b5558d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:08:05 +0200 Subject: [PATCH 20/53] Rebuilt for Python 3.8 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index d41a62f..6630a20 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.0.3-5 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Miro Hrončok - 2.0.3-4 - Rebuilt for Python 3.8 From cb26bcc0f7e1677b40436d57ce61228fcab1563a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:49:37 +0200 Subject: [PATCH 21/53] Rebuilt for Python 3.8.0rc1 (#1748018) --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 6630a20..db1b623 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.0.3-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 2.0.3-5 - Rebuilt for Python 3.8 From e35b7ce324450d88bfe86b22ece54678ea057bd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:09:58 +0000 Subject: [PATCH 22/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index db1b623..3029aa5 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 2.0.3-6 - Rebuilt for Python 3.8.0rc1 (#1748018) From 11fbc15f279b52889ddb5d64fd903f2aba43e34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:39:09 +0200 Subject: [PATCH 23/53] Rebuilt for Python 3.9 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 3029aa5..057387c 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -70,6 +70,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Tue May 26 2020 Miro Hrončok - 2.0.3-8 +- Rebuilt for Python 3.9 + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From feb95f5f23e4dee4248ebcb3957d321e0e883b93 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Thu, 2 Jul 2020 19:12:00 +0200 Subject: [PATCH 24/53] Add BR python3-setuptools Add BR python3-reproject --- APLpy.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/APLpy.spec b/APLpy.spec index 057387c..de85f29 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,12 +5,12 @@ Name: APLpy Version: 2.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT URL: http://aplpy.github.com -Source0: https://pypi.io/packages/source/A/%{name}/%{name}-%{version}.tar.gz +Source0: %{pypi_source} BuildArch: noarch BuildRequires: python3-devel @@ -25,11 +25,14 @@ PDF, PS, PNG, and SVG. %package -n python3-APLpy Summary: The Astronomical Plotting Library in Python %{?python_provide:%python_provide python3-%{srcname}} +BuildRequires: python3-setuptools BuildRequires: python3-numpy BuildRequires: python3-matplotlib BuildRequires: python3-astropy -BuildRequires: python3-pillow +# Testing BuildRequires: python3-pytest +BuildRequires: python3-pillow +BuildRequires: python3-reproject Requires: python3-numpy Requires: python3-matplotlib @@ -44,7 +47,7 @@ capable of creating output files in several graphical formats, including EPS, PDF, PS, PNG, and SVG. %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{srcname}-%{version} %build %py3_build @@ -57,10 +60,12 @@ PDF, PS, PNG, and SVG. mkdir matplotlib touch matplotlib/matplotlibrc export XDG_CONFIG_HOME=`pwd` -# Avoid writing bad pyc files export PYTHONDONTWRITEBYTECODE=1 +export PYTEST_ADDOPTS='-p no:cacheprovider' pushd %{buildroot}/%{python3_sitelib} -py.test-%{python3_version} aplpy || : + pytest-%{python3_version} aplpy || : + # This file is created by the tests + rm %{buildroot}/%{python3_sitelib}/test_label_format.png popd %files -n python3-APLpy @@ -70,6 +75,10 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Thu Jul 02 2020 Sergio Pascual - 2.0.3-9 +- Add BR python3-setuptools +- Add BR python3-reproject + * Tue May 26 2020 Miro Hrončok - 2.0.3-8 - Rebuilt for Python 3.9 From d053887c9e845d11563d3ff0703503194d571cc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:11:56 +0000 Subject: [PATCH 25/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index de85f29..f352650 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -75,6 +75,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 02 2020 Sergio Pascual - 2.0.3-9 - Add BR python3-setuptools - Add BR python3-reproject From 05def012c0e87f7b9c6af16ae0713f3be3940e6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:14:56 +0000 Subject: [PATCH 26/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index f352650..c328e33 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -75,6 +75,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 41dfde9335cdf2977520b0c4c22e68ba39cfb0ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 19:59:20 +0200 Subject: [PATCH 27/53] Rebuilt for Python 3.10 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index c328e33..14c4c14 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -75,6 +75,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Fri Jun 04 2021 Python Maint - 2.0.3-12 +- Rebuilt for Python 3.10 + * Mon Jan 25 2021 Fedora Release Engineering - 2.0.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 18cbf97fc48410401bb7753488d0ab8b3e6b06b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 10:43:18 +0000 Subject: [PATCH 28/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bb5c96d4f9beb7d640816c89b2ed0580d5ee02e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:37:44 +0000 Subject: [PATCH 29/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 14c4c14..714d47e 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -75,6 +75,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.0.3-12 - Rebuilt for Python 3.10 From 48a67df03db468b461a79c368f1f5026cfd8b34e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:12:03 +0000 Subject: [PATCH 30/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 714d47e..94d82a5 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -75,6 +75,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7d5a8d5aef68706b87fdd89fa1851542d699ed32 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Thu, 17 Feb 2022 01:45:13 +0100 Subject: [PATCH 31/53] Fix astropy 5 function incompatibility --- APLpy.spec | 8 ++++++-- aplpy-moved-function.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 aplpy-moved-function.patch diff --git a/APLpy.spec b/APLpy.spec index 94d82a5..d94aebb 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,12 +5,13 @@ Name: APLpy Version: 2.0.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT URL: http://aplpy.github.com Source0: %{pypi_source} +Patch0: aplpy-moved-function.patch BuildArch: noarch BuildRequires: python3-devel @@ -47,7 +48,7 @@ capable of creating output files in several graphical formats, including EPS, PDF, PS, PNG, and SVG. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -p1 %build %py3_build @@ -75,6 +76,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Thu Feb 17 2022 Sergio Pascual - 2.0.3-15 +- Fix astropy 5 function incompatibility + * Wed Jan 19 2022 Fedora Release Engineering - 2.0.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/aplpy-moved-function.patch b/aplpy-moved-function.patch new file mode 100644 index 0000000..9f73095 --- /dev/null +++ b/aplpy-moved-function.patch @@ -0,0 +1,12 @@ +diff -ur APLpy-2.0.3/aplpy/core.py APLpy-2.0.3.astr/aplpy/core.py +--- APLpy-2.0.3/aplpy/core.py 2019-02-19 12:42:15.000000000 +0100 ++++ APLpy-2.0.3.astr/aplpy/core.py 2022-02-17 01:26:12.893457814 +0100 +@@ -17,7 +17,7 @@ + from astropy.wcs import WCS + from astropy.wcs.utils import proj_plane_pixel_scales + from astropy.io import fits +-from astropy.nddata.utils import block_reduce ++from astropy.nddata import block_reduce + from astropy.visualization import AsymmetricPercentileInterval + from astropy.visualization.wcsaxes import WCSAxes, WCSAxesSubplot + from astropy.coordinates import ICRS From de040ffaff5e4d552335762453c45958a48bb983 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 17 Jun 2022 10:16:12 +0200 Subject: [PATCH 32/53] Rebuilt for Python 3.11 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index d94aebb..c61caab 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -76,6 +76,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Fri Jun 17 2022 Python Maint - 2.0.3-16 +- Rebuilt for Python 3.11 + * Thu Feb 17 2022 Sergio Pascual - 2.0.3-15 - Fix astropy 5 function incompatibility From 34bf1d13368b94b6df71f795dc95e6866fc29865 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Jul 2022 19:35:42 +0900 Subject: [PATCH 33/53] Backport upstream patch for test failure w.r.t compatibility with astropy 5.0.1 --- APLpy.spec | 7 ++++++- aplpy-wraps-from-functools.patch | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 aplpy-wraps-from-functools.patch diff --git a/APLpy.spec b/APLpy.spec index c61caab..4b9a161 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,13 +5,15 @@ Name: APLpy Version: 2.0.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT URL: http://aplpy.github.com Source0: %{pypi_source} Patch0: aplpy-moved-function.patch +# https://github.com/aplpy/aplpy/pull/469 +Patch1: aplpy-wraps-from-functools.patch BuildArch: noarch BuildRequires: python3-devel @@ -76,6 +78,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Sun Jul 3 2022 Mamoru TASAKA - 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 - 2.0.3-16 - Rebuilt for Python 3.11 diff --git a/aplpy-wraps-from-functools.patch b/aplpy-wraps-from-functools.patch new file mode 100644 index 0000000..5397791 --- /dev/null +++ b/aplpy-wraps-from-functools.patch @@ -0,0 +1,23 @@ +From b31b4f32d01b7f38d417fd42be5f5d52b18be575 Mon Sep 17 00:00:00 2001 +From: Ole Streicher +Date: Sat, 29 Jan 2022 20:14:56 +0100 +Subject: [PATCH] Get wraps from functools instead of astropy + +This fixes compatibility with astropy 5.0.1 +--- + aplpy/decorators.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/aplpy/decorators.py b/aplpy/decorators.py +index f29056db..3c22f87b 100644 +--- a/aplpy/decorators.py ++++ b/aplpy/decorators.py +@@ -2,7 +2,7 @@ + + import threading + +-from astropy.utils.decorators import wraps ++from functools import wraps + + mydata = threading.local() + From def69e644d992a76e04a7984edb28350eba24526 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:25:15 +0000 Subject: [PATCH 34/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 4b9a161..7661b06 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -78,6 +78,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 3 2022 Mamoru TASAKA - 2.0.3-17 - Backport upstream patch for test failure w.r.t compatibility with astropy 5.0.1 From 8ac57362a4179331c37ddb35b6676758abb23023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:36:44 +0000 Subject: [PATCH 35/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 7661b06..4ee4761 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -78,6 +78,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.0.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c824dcc59e233a78067a64359ccaaca34af057d4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 12 Jul 2023 12:47:52 +0200 Subject: [PATCH 36/53] Rebuilt for Python 3.12 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 4ee4761..f76a332 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -78,6 +78,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 12 2023 Python Maint - 2.0.3-20 +- Rebuilt for Python 3.12 + * Wed Jan 18 2023 Fedora Release Engineering - 2.0.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ed2a2581095afe26a5eb53ca5783cdbe0e95edea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jul 2023 00:36:19 +0900 Subject: [PATCH 37/53] Workaround for python 3.12 change of imp module removal Workaround for astropy 5.1 astropy.tests.plugins.display removal and so on --- APLpy.spec | 13 +++++- aplpy-astropy-5.1-tests-plugins-removal.patch | 36 ++++++++++++++++ astropy_helpers-py312-imp-deprecation.patch | 42 +++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 aplpy-astropy-5.1-tests-plugins-removal.patch create mode 100644 astropy_helpers-py312-imp-deprecation.patch diff --git a/APLpy.spec b/APLpy.spec index f76a332..7c97dd5 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -14,6 +14,12 @@ Source0: %{pypi_source} Patch0: aplpy-moved-function.patch # https://github.com/aplpy/aplpy/pull/469 Patch1: aplpy-wraps-from-functools.patch +# Workaround for python 3.12 change of imp module removal +Patch2: astropy_helpers-py312-imp-deprecation.patch +# related: +# https://github.com/astropy/astropy/pull/12633 +# astropy 5.1 removes astropy.tests.plugins.display and so on +Patch3: aplpy-astropy-5.1-tests-plugins-removal.patch BuildArch: noarch BuildRequires: python3-devel @@ -32,6 +38,7 @@ BuildRequires: python3-setuptools BuildRequires: python3-numpy BuildRequires: python3-matplotlib BuildRequires: python3-astropy +BuildRequires: python3-pytest-astropy-header # Testing BuildRequires: python3-pytest BuildRequires: python3-pillow @@ -78,6 +85,10 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 12 2023 Mamoru TASAKA - 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 - 2.0.3-20 - Rebuilt for Python 3.12 diff --git a/aplpy-astropy-5.1-tests-plugins-removal.patch b/aplpy-astropy-5.1-tests-plugins-removal.patch new file mode 100644 index 0000000..8824f8b --- /dev/null +++ b/aplpy-astropy-5.1-tests-plugins-removal.patch @@ -0,0 +1,36 @@ +--- APLpy-2.0.3/aplpy/conftest.py.old 2019-02-19 20:20:49.000000000 +0900 ++++ APLpy-2.0.3/aplpy/conftest.py 2023-07-13 00:18:27.256633975 +0900 +@@ -13,14 +13,19 @@ + # With older versions of Astropy, we actually need to import the pytest + # plugins themselves in order to make them discoverable by pytest. + from astropy.tests.pytest_plugins import * # noqa +-else: ++elif astropy_version < '5.1': + # As of Astropy 3.0, the pytest plugins provided by Astropy are + # automatically made available when Astropy is installed. This means it's + # not necessary to import them here, but we still need to import global + # variables that are used for configuration. + from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS ++else: ++ from pytest_astropy_header.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS + +-from astropy.tests.helper import enable_deprecations_as_exceptions ++try: ++ from astropy.tests.helper import enable_deprecations_as_exceptions ++except: ++ pass + + # Uncomment the following line to treat all DeprecationWarnings as + # exceptions. For Astropy v2.0 or later, there are 2 additional keywords, +@@ -32,7 +37,10 @@ + # To ignore some specific deprecation warning messages for Python version + # MAJOR.MINOR or later, add: + # warnings_to_ignore_by_pyver={(MAJOR, MINOR): ['Message to ignore']} +-enable_deprecations_as_exceptions() ++try: ++ enable_deprecations_as_exceptions() ++except: ++ pass + + # Uncomment and customize the following lines to add/remove entries from + # the list of packages for which version numbers are displayed when running diff --git a/astropy_helpers-py312-imp-deprecation.patch b/astropy_helpers-py312-imp-deprecation.patch new file mode 100644 index 0000000..ac52527 --- /dev/null +++ b/astropy_helpers-py312-imp-deprecation.patch @@ -0,0 +1,42 @@ +--- APLpy-2.0.3/astropy_helpers/astropy_helpers/utils.py.orig 2018-12-12 20:36:12.000000000 +0900 ++++ APLpy-2.0.3/astropy_helpers/astropy_helpers/utils.py 2023-07-12 23:41:04.228876992 +0900 +@@ -3,7 +3,6 @@ + + import contextlib + import functools +-import imp + import inspect + import os + import sys +@@ -60,9 +59,9 @@ + import builtins + if hasattr(builtins, '__NUMPY_SETUP__'): + del builtins.__NUMPY_SETUP__ +- import imp ++ import importlib + import numpy +- imp.reload(numpy) ++ importlib.reload(numpy) + + try: + numpy_include = numpy.get_include() +--- APLpy-2.0.3/astropy_helpers/astropy_helpers/version_helpers.py.orig 2023-07-12 23:43:28.923036099 +0900 ++++ APLpy-2.0.3/astropy_helpers/astropy_helpers/version_helpers.py 2023-07-12 23:43:41.692050140 +0900 +@@ -21,7 +21,7 @@ + from __future__ import division + + import datetime +-import imp ++import importlib + import os + import pkgutil + import sys +@@ -278,7 +278,7 @@ + invalidate_caches() + + if version_module: +- imp.reload(version_module) ++ importlib.reload(version_module) + + + def get_pkg_version_module(packagename, fromlist=None): From ee35aeec3599e8a3372000bc4527e818b255ee42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 10:56:30 +0000 Subject: [PATCH 38/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 7c97dd5..fe77302 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 21%{?dist} +Release: 22%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -85,6 +85,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jul 12 2023 Mamoru TASAKA - 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 From 3af27ac7bf0a63de709c4341b66db72787d0edf8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jan 2024 12:05:35 +0000 Subject: [PATCH 39/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index fe77302..51aef11 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -85,6 +85,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Thu Jan 18 2024 Fedora Release Engineering - 2.0.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.3-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 59bcac8255909ed30eedbc89706cb8053d9e9ba1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 09:10:23 +0000 Subject: [PATCH 40/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 51aef11..68807a1 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 23%{?dist} +Release: 24%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -85,6 +85,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Fedora Release Engineering - 2.0.3-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 28cdff4101a907e8701d1bf9e6f703f27aa24b5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 20:42:35 +0000 Subject: [PATCH 41/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 68807a1..8ccf7e7 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 24%{?dist} +Release: 25%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -85,6 +85,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.3-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 33f7a6732ac3ea4609ef8f5e8ef2d0ee5b6b3b3a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 18 Jun 2024 10:54:53 +0200 Subject: [PATCH 42/53] Rebuilt for Python 3.13 --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index 8ccf7e7..d3b4d7e 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,7 +5,7 @@ Name: APLpy Version: 2.0.3 -Release: 25%{?dist} +Release: 26%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -85,6 +85,9 @@ popd %{python3_sitelib}/aplpy/ %changelog +* Tue Jun 18 2024 Python Maint - 2.0.3-26 +- Rebuilt for Python 3.13 + * Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d411b072dc16b0cd23d5370e93cf9b45422eb37e Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sat, 22 Jun 2024 20:25:49 +0200 Subject: [PATCH 43/53] Fix FTBS with python 3.13 Update packaging macros --- APLpy.spec | 50 ++++++++++++++++-------------------------------- aplpy-deps.patch | 24 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 aplpy-deps.patch diff --git a/APLpy.spec b/APLpy.spec index d3b4d7e..ef63854 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,11 +1,8 @@ %global srcname APLpy -# Disable automatic dependency generators until we fixed (optional) deps -%{?python_disable_dependency_generator} - Name: APLpy Version: 2.0.3 -Release: 26%{?dist} +Release: 27%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -20,6 +17,7 @@ Patch2: astropy_helpers-py312-imp-deprecation.patch # https://github.com/astropy/astropy/pull/12633 # astropy 5.1 removes astropy.tests.plugins.display and so on Patch3: aplpy-astropy-5.1-tests-plugins-removal.patch +Patch4: aplpy-deps.patch BuildArch: noarch BuildRequires: python3-devel @@ -35,19 +33,6 @@ PDF, PS, PNG, and SVG. Summary: The Astronomical Plotting Library in Python %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-setuptools -BuildRequires: python3-numpy -BuildRequires: python3-matplotlib -BuildRequires: python3-astropy -BuildRequires: python3-pytest-astropy-header -# Testing -BuildRequires: python3-pytest -BuildRequires: python3-pillow -BuildRequires: python3-reproject - -Requires: python3-numpy -Requires: python3-matplotlib -Requires: python3-astropy -Recommends: python3-pillow %description -n python3-APLpy APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at @@ -59,32 +44,29 @@ PDF, PS, PNG, and SVG. %prep %autosetup -n %{srcname}-%{version} -p1 +%generate_buildrequires +%pyproject_buildrequires -x test + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install + +%pyproject_save_files -l aplpy %check -# Empty matplotlibrc -mkdir matplotlib -touch matplotlib/matplotlibrc -export XDG_CONFIG_HOME=`pwd` -export PYTHONDONTWRITEBYTECODE=1 -export PYTEST_ADDOPTS='-p no:cacheprovider' -pushd %{buildroot}/%{python3_sitelib} - pytest-%{python3_version} aplpy || : - # This file is created by the tests - rm %{buildroot}/%{python3_sitelib}/test_label_format.png -popd +%pyproject_check_import -t -%files -n python3-APLpy + +%files -n python3-APLpy -f %{pyproject_files} %doc CHANGES.rst README.rst -%license LICENSE.md -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info -%{python3_sitelib}/aplpy/ %changelog +* Sat Jun 22 2024 Sergio Pascual - 2.0.3-27 +- Fix FTBS with python 3.13 +- Update packaging macros + * Tue Jun 18 2024 Python Maint - 2.0.3-26 - Rebuilt for Python 3.13 diff --git a/aplpy-deps.patch b/aplpy-deps.patch new file mode 100644 index 0000000..b53ec05 --- /dev/null +++ b/aplpy-deps.patch @@ -0,0 +1,24 @@ +diff -ur a/aplpy/_astropy_init.py b/aplpy/_astropy_init.py +--- a/aplpy/_astropy_init.py 2024-06-22 19:31:12.726171055 +0200 ++++ b/aplpy/_astropy_init.py 2024-06-22 19:49:02.749642003 +0200 +@@ -112,7 +112,7 @@ + import os + from warnings import warn + from astropy.config.configuration import ( +- update_default_config, ++# update_default_config, + ConfigurationDefaultMissingError, + ConfigurationDefaultMissingWarning) + +diff -ur a/setup.cfg b/setup.cfg +--- a/setup.cfg 2024-06-22 19:31:12.726171055 +0200 ++++ b/setup.cfg 2024-06-22 19:31:51.507812458 +0200 +@@ -28,7 +28,7 @@ + url = http://aplpy.github.io + edit_on_github = False + github_project = aplpy/aplpy +-install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4, pyregion>=2.0, pillow>=4.0, pyavm>=0.9.4, scikit-image>=0.14, shapely>=1.6 ++install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4, pillow>=4.0, scikit-image>=0.14, shapely>=1.6 + # version should be PEP440 compatible (https://www.python.org/dev/peps/pep-0440/) + version = 2.0.3 + From da496ab4594776fca16d9c08c644f2058a8f7f8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 14:42:12 +0000 Subject: [PATCH 44/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- APLpy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APLpy.spec b/APLpy.spec index ef63854..c102587 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 2.0.3 -Release: 27%{?dist} +Release: 28%{?dist} Summary: The Astronomical Plotting Library in Python License: MIT @@ -63,6 +63,9 @@ PDF, PS, PNG, and SVG. %doc CHANGES.rst README.rst %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.3-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 22 2024 Sergio Pascual - 2.0.3-27 - Fix FTBS with python 3.13 - Update packaging macros From 143b64e2ac39d8155c43a72aba94848fa4b64014 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Thu, 29 Aug 2024 13:04:32 +0200 Subject: [PATCH 45/53] Convert to %autorelease and %autochangelog [skip changelog] --- APLpy.spec | 201 +---------------------------------------------------- changelog | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 199 deletions(-) create mode 100644 changelog diff --git a/APLpy.spec b/APLpy.spec index c102587..f909a70 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -2,7 +2,7 @@ Name: APLpy Version: 2.0.3 -Release: 28%{?dist} +Release: %autorelease Summary: The Astronomical Plotting Library in Python License: MIT @@ -63,201 +63,4 @@ PDF, PS, PNG, and SVG. %doc CHANGES.rst README.rst %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 2.0.3-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 22 2024 Sergio Pascual - 2.0.3-27 -- Fix FTBS with python 3.13 -- Update packaging macros - -* Tue Jun 18 2024 Python Maint - 2.0.3-26 -- Rebuilt for Python 3.13 - -* Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.0.3-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Fedora Release Engineering - 2.0.3-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.0.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 12 2023 Mamoru TASAKA - 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 - 2.0.3-20 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 2.0.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 2.0.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jul 3 2022 Mamoru TASAKA - 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 - 2.0.3-16 -- Rebuilt for Python 3.11 - -* Thu Feb 17 2022 Sergio Pascual - 2.0.3-15 -- Fix astropy 5 function incompatibility - -* Wed Jan 19 2022 Fedora Release Engineering - 2.0.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.0.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.0.3-12 -- Rebuilt for Python 3.10 - -* Mon Jan 25 2021 Fedora Release Engineering - 2.0.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.0.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 02 2020 Sergio Pascual - 2.0.3-9 -- Add BR python3-setuptools -- Add BR python3-reproject - -* Tue May 26 2020 Miro Hrončok - 2.0.3-8 -- Rebuilt for Python 3.9 - -* Tue Jan 28 2020 Fedora Release Engineering - 2.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 2.0.3-6 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 2.0.3-5 -- Rebuilt for Python 3.8 - -* Mon Aug 19 2019 Miro Hrončok - 2.0.3-4 -- Rebuilt for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 04 2019 Christian Dersch - 2.0.3-2 -- Disable automatic dependency generators until we fixed (optional) deps - -* Mon Feb 25 2019 Sergio Pascual - 2.0.3-1 -- New upstream version (2.0.3) - -* Sun Feb 17 2019 Sergio Pascual - 2.0-1 -- New upstream version (2.0) - -* Thu Jan 31 2019 Fedora Release Engineering - 1.1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 05 2018 Sergio Pascual - 1.1.1-2 -- Drop python2 subpackage - -* Thu Jul 12 2018 Fedora Release Engineering - 1.1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jul 08 2018 Christian Dersch - 1.1.1-6 -- Failing tests are only deprecation warnings... Ignore them and report upstream - -* Tue Jun 19 2018 Miro Hrončok - 1.1.1-5 -- Rebuilt for Python 3.7 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Sergio Pascual - 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 - 1.1-3 -- Rebuild for Python 3.6 - -* Sun Oct 02 2016 Sergio Pascual - 1.1-2 -- EVR bump - -* Sun Sep 25 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 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 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Jun 16 2015 Fedora Release Engineering - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 02 2015 Sergio Pascual - 1.0-1 -- New upstream version (1.0) -- Use license macro - -* Thu Dec 11 2014 Sergio Pascual - 0.9.14-2 -- Disable python3 tests - -* Thu Dec 11 2014 Sergio Pascual - 0.9.14-1 -- New upstream source (0.9.14), several bug fixes - -* Tue Oct 07 2014 Sergio Pascual - 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 - 0.9.12-2 -- Provide python3 subpackage -- Unbundle decorator - -* Thu Sep 11 2014 Sergio Pascual - 0.9.12-1 -- New upstream source (0.9.12) -- Tests enabled - -* Wed Sep 10 2014 Sergio Pascual - 0.9.11-2 -- Disable tests for the moment - -* Tue Jul 08 2014 Sergio Pascual - 0.9.11-1 -- Updated to new version -- Run tests on installed version -- Use python2 macros - -* Fri Jun 06 2014 Fedora Release Engineering - 0.9.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 02 2013 Fedora Release Engineering - 0.9.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 03 2012 Germán A. Racca - 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 0.9.6-3 -- Minor changes to spec file after approval -- Removed INSTALL file - -* Mon Jan 30 2012 Germán A. Racca 0.9.6-2 -- Changed name of spec file to match the project name - -* Mon Jan 23 2012 Germán A. Racca 0.9.6-1 -- Initial release of RPM package - +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cf198a7 --- /dev/null +++ b/changelog @@ -0,0 +1,197 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.3-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jun 22 2024 Sergio Pascual - 2.0.3-27 +- Fix FTBS with python 3.13 +- Update packaging macros + +* Tue Jun 18 2024 Python Maint - 2.0.3-26 +- Rebuilt for Python 3.13 + +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Fedora Release Engineering - 2.0.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Mamoru TASAKA - 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 - 2.0.3-20 +- Rebuilt for Python 3.12 + +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 3 2022 Mamoru TASAKA - 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 - 2.0.3-16 +- Rebuilt for Python 3.11 + +* Thu Feb 17 2022 Sergio Pascual - 2.0.3-15 +- Fix astropy 5 function incompatibility + +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.0.3-12 +- Rebuilt for Python 3.10 + +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 02 2020 Sergio Pascual - 2.0.3-9 +- Add BR python3-setuptools +- Add BR python3-reproject + +* Tue May 26 2020 Miro Hrončok - 2.0.3-8 +- Rebuilt for Python 3.9 + +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 2.0.3-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 2.0.3-5 +- Rebuilt for Python 3.8 + +* Mon Aug 19 2019 Miro Hrončok - 2.0.3-4 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Mar 04 2019 Christian Dersch - 2.0.3-2 +- Disable automatic dependency generators until we fixed (optional) deps + +* Mon Feb 25 2019 Sergio Pascual - 2.0.3-1 +- New upstream version (2.0.3) + +* Sun Feb 17 2019 Sergio Pascual - 2.0-1 +- New upstream version (2.0) + +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 05 2018 Sergio Pascual - 1.1.1-2 +- Drop python2 subpackage + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jul 08 2018 Christian Dersch - 1.1.1-6 +- Failing tests are only deprecation warnings... Ignore them and report upstream + +* Tue Jun 19 2018 Miro Hrončok - 1.1.1-5 +- Rebuilt for Python 3.7 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 27 2017 Sergio Pascual - 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 - 1.1-3 +- Rebuild for Python 3.6 + +* Sun Oct 02 2016 Sergio Pascual - 1.1-2 +- EVR bump + +* Sun Sep 25 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 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 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Jun 16 2015 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 02 2015 Sergio Pascual - 1.0-1 +- New upstream version (1.0) +- Use license macro + +* Thu Dec 11 2014 Sergio Pascual - 0.9.14-2 +- Disable python3 tests + +* Thu Dec 11 2014 Sergio Pascual - 0.9.14-1 +- New upstream source (0.9.14), several bug fixes + +* Tue Oct 07 2014 Sergio Pascual - 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 - 0.9.12-2 +- Provide python3 subpackage +- Unbundle decorator + +* Thu Sep 11 2014 Sergio Pascual - 0.9.12-1 +- New upstream source (0.9.12) +- Tests enabled + +* Wed Sep 10 2014 Sergio Pascual - 0.9.11-2 +- Disable tests for the moment + +* Tue Jul 08 2014 Sergio Pascual - 0.9.11-1 +- Updated to new version +- Run tests on installed version +- Use python2 macros + +* Fri Jun 06 2014 Fedora Release Engineering - 0.9.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Aug 02 2013 Fedora Release Engineering - 0.9.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Germán A. Racca - 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 0.9.6-3 +- Minor changes to spec file after approval +- Removed INSTALL file + +* Mon Jan 30 2012 Germán A. Racca 0.9.6-2 +- Changed name of spec file to match the project name + +* Mon Jan 23 2012 Germán A. Racca 0.9.6-1 +- Initial release of RPM package From 821f02b8e6c2a557faaab343671d6de3d95a9974 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 24 Sep 2024 17:47:10 +0200 Subject: [PATCH 46/53] Fix build with Matplotlib 3.9 --- ...ix-cmap-handling-with-Matplotlib-3.9.patch | 59 +++++++++++++++++++ APLpy.spec | 2 + 2 files changed, 61 insertions(+) create mode 100644 0001-Fix-cmap-handling-with-Matplotlib-3.9.patch diff --git a/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch b/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch new file mode 100644 index 0000000..01ecb3e --- /dev/null +++ b/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch @@ -0,0 +1,59 @@ +From c9049261b3724821f4d309d85fe73cabcc04d890 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Mon, 29 Apr 2024 18:46:08 -0400 +Subject: [PATCH] Fix cmap handling with Matplotlib 3.9 + +The `matplotlib.cm.get_cmap` API was deprecated in 3.7, and removed in +3.9, but `matplotlib.pyplot.get_cmap` remains available. + +Signed-off-by: Elliott Sales de Andrade +--- + aplpy/core.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aplpy/core.py b/aplpy/core.py +index c946e97..8b87b50 100644 +--- a/aplpy/core.py ++++ b/aplpy/core.py +@@ -664,7 +664,7 @@ class FITSFigure(Layers, Regions): + max_auto = vmax is None + + # The set of available functions +- cmap = plt.cm.get_cmap(cmap) ++ cmap = plt.get_cmap(cmap) + + if min_auto or max_auto: + +@@ -915,9 +915,9 @@ class FITSFigure(Layers, Regions): + self.remove_layer(layer, raise_exception=False) + + if cmap: +- cmap = plt.cm.get_cmap(cmap) ++ cmap = plt.get_cmap(cmap) + elif not colors: +- cmap = plt.cm.get_cmap('viridis') ++ cmap = plt.get_cmap('viridis') + + if data is not None: + data_contour, header_contour, wcs_contour, wcsaxes_slices = \ +@@ -1844,7 +1844,7 @@ class FITSFigure(Layers, Regions): + self._figure.apl_grayscale_invert_default = False + self._figure.apl_colorscale_cmap_default = 'viridis' + if self.image: +- self.image.set_cmap(cmap=plt.cm.get_cmap('viridis')) ++ self.image.set_cmap(cmap=plt.get_cmap('viridis')) + elif theme == 'publication': + self.frame.set_color('black') + self.frame.set_linewidth(1.0) +@@ -1853,7 +1853,7 @@ class FITSFigure(Layers, Regions): + self._figure.apl_grayscale_invert_default = True + self._figure.apl_colorscale_cmap_default = 'gist_heat' + if self.image: +- self.image.set_cmap(cmap=plt.cm.get_cmap('gist_yarg')) ++ self.image.set_cmap(cmap=plt.get_cmap('gist_yarg')) + + def world2pixel(self, xw, yw, wcs=None): + """ +-- +2.44.0 + diff --git a/APLpy.spec b/APLpy.spec index f909a70..48b4800 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -18,6 +18,8 @@ Patch2: astropy_helpers-py312-imp-deprecation.patch # astropy 5.1 removes astropy.tests.plugins.display and so on Patch3: aplpy-astropy-5.1-tests-plugins-removal.patch Patch4: aplpy-deps.patch +# https://github.com/aplpy/aplpy/pull/500 +Patch5: 0001-Fix-cmap-handling-with-Matplotlib-3.9.patch BuildArch: noarch BuildRequires: python3-devel From 65fc0732a6e2be2341f1e9fffd1c5bc644f2fa37 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 8 Dec 2024 21:24:30 +0100 Subject: [PATCH 47/53] Using SPDX license name --- APLpy.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/APLpy.spec b/APLpy.spec index 48b4800..7afd4b0 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -5,6 +5,7 @@ Version: 2.0.3 Release: %autorelease Summary: The Astronomical Plotting Library in Python +# SPDX license is MIT License: MIT URL: http://aplpy.github.com Source0: %{pypi_source} From 72c6d03ae8060fe094537d09f497890f6f05ff56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:22:48 +0000 Subject: [PATCH 48/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c5958d7d45f88f7598cf2c8af7c2be8fea8a8064 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:19:06 +0000 Subject: [PATCH 49/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 46d92b2f3518a8dc8d3cdd0aa5cc1d13ba763e1c Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sat, 12 Apr 2025 18:53:41 +0200 Subject: [PATCH 50/53] New upstream source 2.2.0 --- .gitignore | 1 + ...ix-cmap-handling-with-Matplotlib-3.9.patch | 59 ------------------- APLpy.spec | 21 ++----- aplpy-astropy-5.1-tests-plugins-removal.patch | 36 ----------- aplpy-deps.patch | 24 -------- aplpy-moved-function.patch | 12 ---- aplpy-wraps-from-functools.patch | 23 -------- astropy_helpers-py312-imp-deprecation.patch | 42 ------------- sources | 2 +- 9 files changed, 6 insertions(+), 214 deletions(-) delete mode 100644 0001-Fix-cmap-handling-with-Matplotlib-3.9.patch delete mode 100644 aplpy-astropy-5.1-tests-plugins-removal.patch delete mode 100644 aplpy-deps.patch delete mode 100644 aplpy-moved-function.patch delete mode 100644 aplpy-wraps-from-functools.patch delete mode 100644 astropy_helpers-py312-imp-deprecation.patch diff --git a/.gitignore b/.gitignore index c9ee661..7bfea74 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /APLpy-1.1.1.tar.gz /APLpy-2.0.tar.gz /APLpy-2.0.3.tar.gz +/aplpy-2.2.0.tar.gz diff --git a/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch b/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch deleted file mode 100644 index 01ecb3e..0000000 --- a/0001-Fix-cmap-handling-with-Matplotlib-3.9.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c9049261b3724821f4d309d85fe73cabcc04d890 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Mon, 29 Apr 2024 18:46:08 -0400 -Subject: [PATCH] Fix cmap handling with Matplotlib 3.9 - -The `matplotlib.cm.get_cmap` API was deprecated in 3.7, and removed in -3.9, but `matplotlib.pyplot.get_cmap` remains available. - -Signed-off-by: Elliott Sales de Andrade ---- - aplpy/core.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/aplpy/core.py b/aplpy/core.py -index c946e97..8b87b50 100644 ---- a/aplpy/core.py -+++ b/aplpy/core.py -@@ -664,7 +664,7 @@ class FITSFigure(Layers, Regions): - max_auto = vmax is None - - # The set of available functions -- cmap = plt.cm.get_cmap(cmap) -+ cmap = plt.get_cmap(cmap) - - if min_auto or max_auto: - -@@ -915,9 +915,9 @@ class FITSFigure(Layers, Regions): - self.remove_layer(layer, raise_exception=False) - - if cmap: -- cmap = plt.cm.get_cmap(cmap) -+ cmap = plt.get_cmap(cmap) - elif not colors: -- cmap = plt.cm.get_cmap('viridis') -+ cmap = plt.get_cmap('viridis') - - if data is not None: - data_contour, header_contour, wcs_contour, wcsaxes_slices = \ -@@ -1844,7 +1844,7 @@ class FITSFigure(Layers, Regions): - self._figure.apl_grayscale_invert_default = False - self._figure.apl_colorscale_cmap_default = 'viridis' - if self.image: -- self.image.set_cmap(cmap=plt.cm.get_cmap('viridis')) -+ self.image.set_cmap(cmap=plt.get_cmap('viridis')) - elif theme == 'publication': - self.frame.set_color('black') - self.frame.set_linewidth(1.0) -@@ -1853,7 +1853,7 @@ class FITSFigure(Layers, Regions): - self._figure.apl_grayscale_invert_default = True - self._figure.apl_colorscale_cmap_default = 'gist_heat' - if self.image: -- self.image.set_cmap(cmap=plt.cm.get_cmap('gist_yarg')) -+ self.image.set_cmap(cmap=plt.get_cmap('gist_yarg')) - - def world2pixel(self, xw, yw, wcs=None): - """ --- -2.44.0 - diff --git a/APLpy.spec b/APLpy.spec index 7afd4b0..06d9ea4 100644 --- a/APLpy.spec +++ b/APLpy.spec @@ -1,7 +1,7 @@ -%global srcname APLpy +%global srcname aplpy Name: APLpy -Version: 2.0.3 +Version: 2.2.0 Release: %autorelease Summary: The Astronomical Plotting Library in Python @@ -9,18 +9,6 @@ Summary: The Astronomical Plotting Library in Python License: MIT URL: http://aplpy.github.com Source0: %{pypi_source} -Patch0: aplpy-moved-function.patch -# https://github.com/aplpy/aplpy/pull/469 -Patch1: aplpy-wraps-from-functools.patch -# Workaround for python 3.12 change of imp module removal -Patch2: astropy_helpers-py312-imp-deprecation.patch -# related: -# https://github.com/astropy/astropy/pull/12633 -# astropy 5.1 removes astropy.tests.plugins.display and so on -Patch3: aplpy-astropy-5.1-tests-plugins-removal.patch -Patch4: aplpy-deps.patch -# https://github.com/aplpy/aplpy/pull/500 -Patch5: 0001-Fix-cmap-handling-with-Matplotlib-3.9.patch BuildArch: noarch BuildRequires: python3-devel @@ -35,7 +23,7 @@ PDF, PS, PNG, and SVG. %package -n python3-APLpy Summary: The Astronomical Plotting Library in Python %{?python_provide:%python_provide python3-%{srcname}} -BuildRequires: python3-setuptools +BuildRequires: python3dist(setuptools) %description -n python3-APLpy APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at @@ -61,9 +49,8 @@ PDF, PS, PNG, and SVG. %check %pyproject_check_import -t - %files -n python3-APLpy -f %{pyproject_files} -%doc CHANGES.rst README.rst +%doc CHANGES.md CITATION README.rst %changelog %autochangelog diff --git a/aplpy-astropy-5.1-tests-plugins-removal.patch b/aplpy-astropy-5.1-tests-plugins-removal.patch deleted file mode 100644 index 8824f8b..0000000 --- a/aplpy-astropy-5.1-tests-plugins-removal.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- APLpy-2.0.3/aplpy/conftest.py.old 2019-02-19 20:20:49.000000000 +0900 -+++ APLpy-2.0.3/aplpy/conftest.py 2023-07-13 00:18:27.256633975 +0900 -@@ -13,14 +13,19 @@ - # With older versions of Astropy, we actually need to import the pytest - # plugins themselves in order to make them discoverable by pytest. - from astropy.tests.pytest_plugins import * # noqa --else: -+elif astropy_version < '5.1': - # As of Astropy 3.0, the pytest plugins provided by Astropy are - # automatically made available when Astropy is installed. This means it's - # not necessary to import them here, but we still need to import global - # variables that are used for configuration. - from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS -+else: -+ from pytest_astropy_header.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS - --from astropy.tests.helper import enable_deprecations_as_exceptions -+try: -+ from astropy.tests.helper import enable_deprecations_as_exceptions -+except: -+ pass - - # Uncomment the following line to treat all DeprecationWarnings as - # exceptions. For Astropy v2.0 or later, there are 2 additional keywords, -@@ -32,7 +37,10 @@ - # To ignore some specific deprecation warning messages for Python version - # MAJOR.MINOR or later, add: - # warnings_to_ignore_by_pyver={(MAJOR, MINOR): ['Message to ignore']} --enable_deprecations_as_exceptions() -+try: -+ enable_deprecations_as_exceptions() -+except: -+ pass - - # Uncomment and customize the following lines to add/remove entries from - # the list of packages for which version numbers are displayed when running diff --git a/aplpy-deps.patch b/aplpy-deps.patch deleted file mode 100644 index b53ec05..0000000 --- a/aplpy-deps.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur a/aplpy/_astropy_init.py b/aplpy/_astropy_init.py ---- a/aplpy/_astropy_init.py 2024-06-22 19:31:12.726171055 +0200 -+++ b/aplpy/_astropy_init.py 2024-06-22 19:49:02.749642003 +0200 -@@ -112,7 +112,7 @@ - import os - from warnings import warn - from astropy.config.configuration import ( -- update_default_config, -+# update_default_config, - ConfigurationDefaultMissingError, - ConfigurationDefaultMissingWarning) - -diff -ur a/setup.cfg b/setup.cfg ---- a/setup.cfg 2024-06-22 19:31:12.726171055 +0200 -+++ b/setup.cfg 2024-06-22 19:31:51.507812458 +0200 -@@ -28,7 +28,7 @@ - url = http://aplpy.github.io - edit_on_github = False - github_project = aplpy/aplpy --install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4, pyregion>=2.0, pillow>=4.0, pyavm>=0.9.4, scikit-image>=0.14, shapely>=1.6 -+install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4, pillow>=4.0, scikit-image>=0.14, shapely>=1.6 - # version should be PEP440 compatible (https://www.python.org/dev/peps/pep-0440/) - version = 2.0.3 - diff --git a/aplpy-moved-function.patch b/aplpy-moved-function.patch deleted file mode 100644 index 9f73095..0000000 --- a/aplpy-moved-function.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur APLpy-2.0.3/aplpy/core.py APLpy-2.0.3.astr/aplpy/core.py ---- APLpy-2.0.3/aplpy/core.py 2019-02-19 12:42:15.000000000 +0100 -+++ APLpy-2.0.3.astr/aplpy/core.py 2022-02-17 01:26:12.893457814 +0100 -@@ -17,7 +17,7 @@ - from astropy.wcs import WCS - from astropy.wcs.utils import proj_plane_pixel_scales - from astropy.io import fits --from astropy.nddata.utils import block_reduce -+from astropy.nddata import block_reduce - from astropy.visualization import AsymmetricPercentileInterval - from astropy.visualization.wcsaxes import WCSAxes, WCSAxesSubplot - from astropy.coordinates import ICRS diff --git a/aplpy-wraps-from-functools.patch b/aplpy-wraps-from-functools.patch deleted file mode 100644 index 5397791..0000000 --- a/aplpy-wraps-from-functools.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b31b4f32d01b7f38d417fd42be5f5d52b18be575 Mon Sep 17 00:00:00 2001 -From: Ole Streicher -Date: Sat, 29 Jan 2022 20:14:56 +0100 -Subject: [PATCH] Get wraps from functools instead of astropy - -This fixes compatibility with astropy 5.0.1 ---- - aplpy/decorators.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/aplpy/decorators.py b/aplpy/decorators.py -index f29056db..3c22f87b 100644 ---- a/aplpy/decorators.py -+++ b/aplpy/decorators.py -@@ -2,7 +2,7 @@ - - import threading - --from astropy.utils.decorators import wraps -+from functools import wraps - - mydata = threading.local() - diff --git a/astropy_helpers-py312-imp-deprecation.patch b/astropy_helpers-py312-imp-deprecation.patch deleted file mode 100644 index ac52527..0000000 --- a/astropy_helpers-py312-imp-deprecation.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- APLpy-2.0.3/astropy_helpers/astropy_helpers/utils.py.orig 2018-12-12 20:36:12.000000000 +0900 -+++ APLpy-2.0.3/astropy_helpers/astropy_helpers/utils.py 2023-07-12 23:41:04.228876992 +0900 -@@ -3,7 +3,6 @@ - - import contextlib - import functools --import imp - import inspect - import os - import sys -@@ -60,9 +59,9 @@ - import builtins - if hasattr(builtins, '__NUMPY_SETUP__'): - del builtins.__NUMPY_SETUP__ -- import imp -+ import importlib - import numpy -- imp.reload(numpy) -+ importlib.reload(numpy) - - try: - numpy_include = numpy.get_include() ---- APLpy-2.0.3/astropy_helpers/astropy_helpers/version_helpers.py.orig 2023-07-12 23:43:28.923036099 +0900 -+++ APLpy-2.0.3/astropy_helpers/astropy_helpers/version_helpers.py 2023-07-12 23:43:41.692050140 +0900 -@@ -21,7 +21,7 @@ - from __future__ import division - - import datetime --import imp -+import importlib - import os - import pkgutil - import sys -@@ -278,7 +278,7 @@ - invalidate_caches() - - if version_module: -- imp.reload(version_module) -+ importlib.reload(version_module) - - - def get_pkg_version_module(packagename, fromlist=None): diff --git a/sources b/sources index 3a8949b..b7d941b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (APLpy-2.0.3.tar.gz) = ad9e2079bc5cc3d60c88b49d11ef452d674a2223753d3c4b39db55bdb7b0ec598cff1edcd27d0539c3a3127b4c3bc7e0d57a3723841850fd49ed2206db5893d2 +SHA512 (aplpy-2.2.0.tar.gz) = efb5af12da698861c596d3935580ca5dbe168779382702064ed8c728f9a56e82c06eb6ee101a0c66afaf35e7e55c7a9f53fa07aba379b91e13f2fa4ddce0ec98 From b2e586140e8eb4aaaf91b9bf9c97d8f2def80033 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:40:47 +0000 Subject: [PATCH 51/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3fef0c8204f9cd8f121aa2c2edee0981da283334 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:07:09 +0200 Subject: [PATCH 52/53] Rebuilt for Python 3.14.0rc3 bytecode From 48890300268f74e8f7f6e0a311e94167f5b8182b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 02:27:06 +0000 Subject: [PATCH 53/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild