diff --git a/.gitignore b/.gitignore index abcfbb0..28649aa 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/python-astropy-system-configobj.patch b/python-astropy-system-configobj.patch index 936a17e..d388a43 100644 --- a/python-astropy-system-configobj.patch +++ b/python-astropy-system-configobj.patch @@ -1,9 +1,9 @@ -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 +diff -ur astropy-5.2/astropy/config/configuration.py astropy-5.2.config/astropy/config/configuration.py +--- astropy-5.2/astropy/config/configuration.py 2022-12-12 11:57:50.000000000 +0100 ++++ astropy-5.2.config/astropy/config/configuration.py 2023-01-07 00:39:52.705836236 +0100 @@ -20,7 +20,7 @@ + from textwrap import TextWrapper from warnings import warn - from contextlib import contextmanager, nullcontext -from astropy.extern.configobj import configobj, validate +import configobj, validate diff --git a/python-astropy-system-ply.patch b/python-astropy-system-ply.patch index 04172cb..9d1b37c 100644 --- a/python-astropy-system-ply.patch +++ b/python-astropy-system-ply.patch @@ -1,33 +1,21 @@ -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 @@ +diff -ur astropy-5.2/astropy/utils/parsing.py astropy-5.2.ply/astropy/utils/parsing.py +--- astropy-5.2/astropy/utils/parsing.py 2022-12-12 11:57:50.000000000 +0100 ++++ astropy-5.2.ply/astropy/utils/parsing.py 2023-01-07 00:46:01.246483036 +0100 +@@ -82,7 +82,7 @@ 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 @@ 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") diff --git a/python-astropy.spec b/python-astropy.spec index a4dc521..ac82c7b 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -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 @@ popd %license LICENSE.rst %changelog +* Fri Jan 06 2023 Sergio Pascual - 5.2-1 +- New upstream source 5.2 + * Thu Dec 29 2022 Maxwell G - 5.1-4 - Rebuild for cfitsio 4.2 diff --git a/sources b/sources index 9bc9921..4d2c6a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (astropy-5.1.tar.gz) = fe81429734be6184a9f4321fc34cf9ccf174eb4ee61deeb311e497adabe4321c388476ad2174c7756848575246caadf42b71c5f3587815761b34aa998641c37f +SHA512 (astropy-5.2.tar.gz) = b4954bf33834080bde44f90af2a66b887b4de0b5cf0b4ccd824816ffd5ea8604c5d55617dbe4d6aef30286db0e6d1578c962f101facc3272f10c0a0ecdbd72fe