PR#2: Update to 5.2. Fixes rhbz#2149852. - rpms/python-astropy

rpms / python-astropy

#2 Update to 5.2. Fixes rhbz#2149852.

Closed a year ago by gotmax23. Opened a year ago by gotmax23.

rpms/ gotmax23/python-astropy 5.2 into rawhide

Maxwell G • a year ago

d9e7eff

.gitignore

file modified

		`@@ -40,3 +40,4 @@`
		`/astropy-5.0.3.tar.gz`
		`/astropy-5.0.4.tar.gz`
		`/astropy-5.1.tar.gz`
		`+ /astropy-5.2.tar.gz`

python-astropy-system-configobj.patch

file modified

+18 -5

		`@@ -1,12 +1,25 @@`
		`- diff -Naur astropy-5.0/astropy/config/configuration.py astropy-5.0.new/astropy/config/configuration.py`
		`- --- astropy-5.0/astropy/config/configuration.py 2021-11-19 15:17:19.000000000 +0100`
		`- +++ astropy-5.0.new/astropy/config/configuration.py 2021-12-26 15:49:25.160408248 +0100`
		`- @@ -20,7 +20,7 @@`
		`+ From 844e5e6c24a2f82bcc352024805d926d255289ed Mon Sep 17 00:00:00 2001`
		`+ From: Maxwell G <gotmax@e.email>`
		`+ Date: Thu, 29 Dec 2022 14:25:41 -1000`
		`+ Subject: [PATCH 2/2] Use system configobj`
		`+`
		`+ ---`
		`+ astropy/config/configuration.py \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/astropy/config/configuration.py b/astropy/config/configuration.py`
		`+ index ef39984..0ac85e4 100644`
		`+ --- a/astropy/config/configuration.py`
		`+ +++ b/astropy/config/configuration.py`
		`+ @@ -20,7 +20,7 @@ from os import path`
		`+ from textwrap import TextWrapper`
		`from warnings import warn`
		`- from contextlib import contextmanager, nullcontext`

		`-from astropy.extern.configobj import configobj, validate`
		`+import configobj, validate`
		`from astropy.utils import find_current_module, silence`
		`from astropy.utils.decorators import deprecated`
		`from astropy.utils.exceptions import AstropyDeprecationWarning, AstropyWarning`
		`+ --`
		`+ 2.38.1`
		`+`

python-astropy-system-ply.patch

file modified

+22 -21

		`@@ -1,33 +1,34 @@`
		`- diff -Naur astropy-5.0/astropy/coordinates/angle_formats.py astropy-5.0.new/astropy/coordinates/angle_formats.py`
		`- --- astropy-5.0/astropy/coordinates/angle_formats.py 2021-11-19 15:17:19.000000000 +0100`
		`- +++ astropy-5.0.new/astropy/coordinates/angle_formats.py 2021-12-26 15:48:30.423519098 +0100`
		`- @@ -75,7 +75,7 @@`
		`-`
		`- @classmethod`
		`- def _make_parser(cls):`
		`- - from astropy.extern.ply import lex, yacc`
		`- + from ply import lex, yacc`
		`-`
		`- # List of token names.`
		`- tokens = (`
		`- diff -Naur astropy-5.0/astropy/utils/parsing.py astropy-5.0.new/astropy/utils/parsing.py`
		`- --- astropy-5.0/astropy/utils/parsing.py 2021-11-19 15:17:19.000000000 +0100`
		`- +++ astropy-5.0.new/astropy/utils/parsing.py 2021-12-26 15:48:30.425519094 +0100`
		`- @@ -84,7 +84,7 @@`
		`+ From a08d4ab80078430895e31075c54b1a2ac93987cb Mon Sep 17 00:00:00 2001`
		`+ From: Maxwell G <gotmax@e.email>`
		`+ Date: Thu, 29 Dec 2022 14:25:29 -1000`
		`+ Subject: [PATCH 1/2] Use system ply`
		`+`
		`+ ---`
		`+ astropy/utils/parsing.py \| 4 ++--`
		`+ 1 file changed, 2 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/astropy/utils/parsing.py b/astropy/utils/parsing.py`
		`+ index 10c3a88..919c222 100644`
		`+ --- a/astropy/utils/parsing.py`
		`+ +++ b/astropy/utils/parsing.py`
		`+ @@ -82,7 +82,7 @@ def lex(lextab, package, reflags=int(re.VERBOSE)):`
		`reflags : int`
		Passed to ``ply.lex``.
		`"""`
		`- from astropy.extern.ply import lex`
		`+ from ply import lex`

		`- caller_file = lex.get_caller_module_dict(2)['__file__']`
		`- lextab_filename = os.path.join(os.path.dirname(caller_file), lextab + '.py')`
		`- @@ -137,7 +137,7 @@`
		`+ caller_file = lex.get_caller_module_dict(2)["__file__"]`
		`+ lextab_filename = os.path.join(os.path.dirname(caller_file), lextab + ".py")`
		`+ @@ -138,7 +138,7 @@ def yacc(tabmodule, package):`
		`the output file. This is inserted into a comment in the generated`
		`file.`
		`"""`
		`- from astropy.extern.ply import yacc`
		`+ from ply import yacc`

		`- caller_file = yacc.get_caller_module_dict(2)['__file__']`
		`- tab_filename = os.path.join(os.path.dirname(caller_file), tabmodule + '.py')`
		`+ caller_file = yacc.get_caller_module_dict(2)["__file__"]`
		`+ tab_filename = os.path.join(os.path.dirname(caller_file), tabmodule + ".py")`
		`+ --`
		`+ 2.38.1`
		`+`

python-astropy.spec

file modified

+5 -2

		`@@ -3,8 +3,8 @@`
		`%global srcname astropy`

		`Name: python-%{srcname}`
		`- Version: 5.1`
		`- Release: 4%{?dist}`
		`+ Version: 5.2`
		`+ Release: 1%{?dist}`
		`Summary: A Community Python Library for Astronomy`
		`License: BSD`

		`@@ -151,6 +151,9 @@`
		`%license LICENSE.rst`

		`%changelog`
		`+ * Fri Dec 30 2022 Maxwell G <gotmax@e.email> - 5.2-1`
		`+ - Update to 5.2. Fixes rhbz#2149852.`
		`+`
		`* Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 5.1-4`
		`- Rebuild for cfitsio 4.2`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (astropy-5.1.tar.gz) = fe81429734be6184a9f4321fc34cf9ccf174eb4ee61deeb311e497adabe4321c388476ad2174c7756848575246caadf42b71c5f3587815761b34aa998641c37f`
		`+ SHA512 (astropy-5.2.tar.gz) = b4954bf33834080bde44f90af2a66b887b4de0b5cf0b4ccd824816ffd5ea8604c5d55617dbe4d6aef30286db0e6d1578c962f101facc3272f10c0a0ecdbd72fe`

no initial comment

gotmax23 commented a year ago

[citest]

gotmax23 commented a year ago

This succeeds on all arches except aarch64 where there's two test failures.

FAILED astropy/modeling/tests/test_quantities_fitting.py::test_fitting_with_initial_values[DogBoxLSQFitter]
FAILED astropy/wcs/tests/test_tabprm.py::test_tabprm_print - AssertionError: ...
= 2 failed, 23373 passed, 558 skipped, 34 deselected, 116 xfailed, 82 warnings in 280.20s (0:04:40) =