New upstream source 4.3.1
This commit is contained in:
Sergio Pascual
parent
009415e948
commit
53066ae42b
|
|
@ -35,3 +35,4 @@
|
|||
/astropy-4.0.1.post1.tar.gz
|
||||
/astropy-4.2.tar.gz
|
||||
/astropy-4.2.1.tar.gz
|
||||
/astropy-4.3.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -ur astropy-4.2/astropy/config/configuration.py astropy-4.2.configobj/astropy/config/configuration.py
|
||||
--- astropy-4.2/astropy/config/configuration.py 2020-11-25 08:28:48.000000000 +0100
|
||||
+++ astropy-4.2.configobj/astropy/config/configuration.py 2021-02-15 23:12:16.720541628 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
diff -ur astropy-4.3.1/astropy/config/configuration.py astropy-4.3.1.config/astropy/config/configuration.py
|
||||
--- astropy-4.3.1/astropy/config/configuration.py 2021-08-11 22:17:12.000000000 +0200
|
||||
+++ astropy-4.3.1.config/astropy/config/configuration.py 2021-09-09 20:46:52.753940849 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
from warnings import warn
|
||||
from contextlib import contextmanager
|
||||
|
||||
|
|
@ -9,4 +9,4 @@ diff -ur astropy-4.2/astropy/config/configuration.py astropy-4.2.configobj/astro
|
|||
+import configobj, validate
|
||||
from astropy.utils import find_current_module, silence
|
||||
from astropy.utils.exceptions import AstropyDeprecationWarning, AstropyWarning
|
||||
from astropy.utils.introspection import resolve_name
|
||||
from astropy.utils.compat.context import nullcontext
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -ur astropy-4.2/astropy/coordinates/angle_utilities.py astropy-4.2.ply/astropy/coordinates/angle_utilities.py
|
||||
--- astropy-4.2/astropy/coordinates/angle_utilities.py 2020-11-25 08:28:48.000000000 +0100
|
||||
+++ astropy-4.2.ply/astropy/coordinates/angle_utilities.py 2021-02-15 23:22:45.935721825 +0100
|
||||
@@ -88,7 +88,7 @@
|
||||
diff -ur astropy-4.3.1/astropy/coordinates/angle_formats.py astropy-4.3.1.ply/astropy/coordinates/angle_formats.py
|
||||
--- astropy-4.3.1/astropy/coordinates/angle_formats.py 2021-08-11 22:17:12.000000000 +0200
|
||||
+++ astropy-4.3.1.ply/astropy/coordinates/angle_formats.py 2021-09-09 21:08:11.871724229 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
@classmethod
|
||||
def _make_parser(cls):
|
||||
|
|
@ -10,66 +10,24 @@ diff -ur astropy-4.2/astropy/coordinates/angle_utilities.py astropy-4.2.ply/astr
|
|||
|
||||
# List of token names.
|
||||
tokens = (
|
||||
diff -ur astropy-4.2/astropy/units/format/cds.py astropy-4.2.ply/astropy/units/format/cds.py
|
||||
--- astropy-4.2/astropy/units/format/cds.py 2020-11-25 08:28:48.000000000 +0100
|
||||
+++ astropy-4.2.ply/astropy/units/format/cds.py 2021-02-15 23:22:29.190476911 +0100
|
||||
@@ -82,7 +82,7 @@
|
||||
@classmethod
|
||||
def _make_lexer(cls):
|
||||
diff -ur astropy-4.3.1/astropy/utils/parsing.py astropy-4.3.1.ply/astropy/utils/parsing.py
|
||||
--- astropy-4.3.1/astropy/utils/parsing.py 2021-08-11 22:17:12.000000000 +0200
|
||||
+++ astropy-4.3.1.ply/astropy/utils/parsing.py 2021-09-09 21:08:42.559223258 +0200
|
||||
@@ -84,7 +84,7 @@
|
||||
reflags : int
|
||||
Passed to ``ply.lex``.
|
||||
"""
|
||||
- from astropy.extern.ply import lex
|
||||
+ from ply import lex
|
||||
|
||||
- from astropy.extern.ply import lex
|
||||
+ from ply import lex
|
||||
|
||||
tokens = cls._tokens
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
<https://bitbucket.org/nxg/unity/>`_.
|
||||
"""
|
||||
|
||||
- from astropy.extern.ply import yacc
|
||||
+ from ply import yacc
|
||||
|
||||
tokens = cls._tokens
|
||||
|
||||
diff -ur astropy-4.2/astropy/units/format/generic.py astropy-4.2.ply/astropy/units/format/generic.py
|
||||
--- astropy-4.2/astropy/units/format/generic.py 2020-11-25 08:28:48.000000000 +0100
|
||||
+++ astropy-4.2.ply/astropy/units/format/generic.py 2021-02-15 23:21:39.375748327 +0100
|
||||
@@ -118,7 +118,7 @@
|
||||
|
||||
@classmethod
|
||||
def _make_lexer(cls):
|
||||
- from astropy.extern.ply import lex
|
||||
+ from ply import lex
|
||||
|
||||
tokens = cls._tokens
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
formats, the only difference being the set of available unit
|
||||
strings.
|
||||
"""
|
||||
- from astropy.extern.ply import yacc
|
||||
+ from ply import yacc
|
||||
|
||||
tokens = cls._tokens
|
||||
|
||||
diff -ur astropy-4.2/astropy/units/format/ogip.py astropy-4.2.ply/astropy/units/format/ogip.py
|
||||
--- astropy-4.2/astropy/units/format/ogip.py 2020-11-25 08:28:48.000000000 +0100
|
||||
+++ astropy-4.2.ply/astropy/units/format/ogip.py 2021-02-15 23:22:06.526145425 +0100
|
||||
@@ -111,7 +111,7 @@
|
||||
|
||||
@classmethod
|
||||
def _make_lexer(cls):
|
||||
- from astropy.extern.ply import lex
|
||||
+ from ply import lex
|
||||
|
||||
tokens = cls._tokens
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
<https://bitbucket.org/nxg/unity/>`_.
|
||||
"""
|
||||
|
||||
- from astropy.extern.ply import yacc
|
||||
+ from ply import yacc
|
||||
|
||||
tokens = cls._tokens
|
||||
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 @@
|
||||
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')
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
%global srcname astropy
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 4.2.1
|
||||
Release: 4%{?dist}
|
||||
Version: 4.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: A Community Python Library for Astronomy
|
||||
License: BSD
|
||||
|
||||
|
|
@ -13,6 +13,10 @@ Source0: %{pypi_source}
|
|||
Source1: astropy-README.dist
|
||||
Patch0: python-astropy-system-configobj.patch
|
||||
Patch1: python-astropy-system-ply.patch
|
||||
# bundled versions
|
||||
# expat 2.2.9
|
||||
# cfitsio 3.49
|
||||
# wcslib 7.6
|
||||
|
||||
%global _description %{expand:
|
||||
The Astropy project is a common effort to develop a single core package
|
||||
|
|
@ -28,9 +32,9 @@ coordinate transformations.}
|
|||
Summary: %{summary}
|
||||
BuildRequires: gcc
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: expat-devel >= 2.2.9
|
||||
BuildRequires: cfitsio-devel >= 3.490
|
||||
BuildRequires: wcslib-devel
|
||||
BuildRequires: wcslib-devel >= 7.6
|
||||
BuildRequires: %{py3_dist setuptools}
|
||||
BuildRequires: %{py3_dist setuptools_scm}
|
||||
BuildRequires: %{py3_dist Cython}
|
||||
|
|
@ -101,15 +105,15 @@ export CPATH="/usr/include/cfitsio:/usr/include/wcslib"
|
|||
export PYTEST_ADDOPTS='-p no:cacheprovider'
|
||||
|
||||
pytest_args=(
|
||||
--deselect astropy/coordinates/tests/accuracy/test_altaz_icrs.py::test_against_pyephem
|
||||
#--deselect astropy/coordinates/tests/accuracy/test_altaz_icrs.py::test_against_pyephem
|
||||
|
||||
# wcs tests fail due to the different
|
||||
# version of wcslib
|
||||
--deselect astropy/wcs/tests/test_wcsprm.py::test_fix
|
||||
--deselect astropy/wcs/tests/test_wcs.py::test_fixes
|
||||
--deselect astropy/wcs/tests/test_wcs.py::test_pix2world
|
||||
--deselect astropy/wcs/tests/test_wcs.py::test_warning_about_defunct_keywords
|
||||
--deselect astropy/wcs/tests/test_wcs.py::test_validate
|
||||
#--deselect astropy/wcs/tests/test_wcsprm.py::test_fix
|
||||
#--deselect astropy/wcs/tests/test_wcs.py::test_fixes
|
||||
#--deselect astropy/wcs/tests/test_wcs.py::test_pix2world
|
||||
#--deselect astropy/wcs/tests/test_wcs.py::test_warning_about_defunct_keywords
|
||||
#--deselect astropy/wcs/tests/test_wcs.py::test_validate
|
||||
|
||||
%ifarch armv7hl
|
||||
--deselect astropy/table/tests/test_showtable.py::test_stats
|
||||
|
|
@ -127,9 +131,10 @@ pytest_args=(
|
|||
--deselect astropy/tests/test_logger.py::test_warnings_logging
|
||||
--deselect astropy/tests/test_logger.py::test_warnings_logging_with_custom_class
|
||||
--deselect astropy/tests/test_logger.py::test_warning_logging_with_io_votable_warning
|
||||
--deselect astropy/time/tests/test_precision.py::test_sidereal_lat_independent
|
||||
--deselect astropy/time/tests/test_precision.py::test_datetime_difference_agrees_with_timedelta
|
||||
--deselect astropy/time/tests/test_precision.py::test_datetime_to_timedelta
|
||||
# Previously disabled but currently working
|
||||
#--deselect astropy/time/tests/test_precision.py::test_sidereal_lat_independent
|
||||
#--deselect astropy/time/tests/test_precision.py::test_datetime_difference_agrees_with_timedelta
|
||||
#--deselect astropy/time/tests/test_precision.py::test_datetime_to_timedelta
|
||||
)
|
||||
|
||||
pushd %{buildroot}/%{python3_sitearch}
|
||||
|
|
@ -154,6 +159,9 @@ popd
|
|||
%license LICENSE.rst
|
||||
|
||||
%changelog
|
||||
* Fri Sep 10 2021 Sergio Pascual <sergiopr@fedoraproject.org> - 4.3.1-1
|
||||
- New upstream source 4.3.1
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (astropy-4.2.1.tar.gz) = 0566af1e06b0fb96c592f90534ffd3e8d23ad29222b9b6ee4a6067dfd61403f818c7156a9bfb94d4a20e39bbf421b02a2895ce5f735780ca86dc1ef82594ef09
|
||||
SHA512 (astropy-4.3.1.tar.gz) = ca674ef9773ddce33e8849c41e3ed8a5bf66fc8b983f6bc9cfd82f1c7c282bbb05f59ab48a112c21c0ec6895b5e8982b1067e5ae97f21c9d63527a78bd0a8ad7
|
||||
|
|
|
|||
Loading…
Reference in New Issue