public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-astropy] main: Update to version 8.0.1
@ 2026-07-06 11:53 Sergio Pascual
  0 siblings, 0 replies; only message in thread
From: Sergio Pascual @ 2026-07-06 11:53 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-astropy
            Branch : main
            Commit : 36c6fed128ee280bee9506102ce19c61baf16cda
            Author : Sergio Pascual <sergiopr@fedoraproject.org>
            Date   : 2026-07-06T13:53:09+02:00
            Stats  : +8/-107 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-astropy/c/36c6fed128ee280bee9506102ce19c61baf16cda?branch=main

            Log:
            Update to version 8.0.1

... Do not unbundle PLY

---
diff --git a/.gitignore b/.gitignore
index c51f7e9..fd71f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /astropy-7.2.0.tar.gz
 /astropy-8.0.0b1.tar.gz
 /astropy-8.0.0.tar.gz
+/astropy-8.0.1.tar.gz

diff --git a/python-astropy-system-ply.patch b/python-astropy-system-ply.patch
deleted file mode 100644
index 07d57d8..0000000
--- a/python-astropy-system-ply.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur a/astropy/units/format/base.py b/astropy/units/format/base.py
---- a/astropy/units/format/base.py	2025-12-23 00:29:38.179985148 +0100
-+++ b/astropy/units/format/base.py	2025-12-23 00:33:29.893239203 +0100
-@@ -6,7 +6,7 @@
- 
- import numpy as np
- 
--from astropy.extern.ply.lex import LexToken
-+from ply.lex import LexToken
- from astropy.units.core import (
-     CompositeUnit,
-     NamedUnit,
-diff -ur a/astropy/units/format/cds.py b/astropy/units/format/cds.py
---- a/astropy/units/format/cds.py	2025-12-23 00:29:38.180041365 +0100
-+++ b/astropy/units/format/cds.py	2025-12-23 00:32:21.990679072 +0100
-@@ -15,7 +15,7 @@
- import re
- from typing import ClassVar, Literal
- 
--from astropy.extern.ply.lex import Lexer
-+from ply.lex import Lexer
- from astropy.units.core import CompositeUnit, Unit, UnitBase
- from astropy.units.enums import DeprecatedUnitAction
- from astropy.units.utils import is_effectively_unity
-diff -ur a/astropy/units/format/generic.py b/astropy/units/format/generic.py
---- a/astropy/units/format/generic.py	2025-12-23 00:29:38.180231273 +0100
-+++ b/astropy/units/format/generic.py	2025-12-23 00:32:38.310651608 +0100
-@@ -23,7 +23,7 @@
- 
- import numpy as np
- 
--from astropy.extern.ply.lex import Lexer
-+from ply.lex import Lexer
- from astropy.units.core import CompositeUnit, Unit, UnitBase, get_current_unit_registry
- from astropy.units.enums import DeprecatedUnitAction
- from astropy.units.errors import UnitsWarning
-diff -ur a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py
---- a/astropy/units/format/ogip.py	2025-12-23 00:29:38.180396189 +0100
-+++ b/astropy/units/format/ogip.py	2025-12-23 00:32:54.743889518 +0100
-@@ -23,7 +23,7 @@
- 
- import numpy as np
- 
--from astropy.extern.ply.lex import Lexer
-+from ply.lex import Lexer
- from astropy.units.core import CompositeUnit, UnitBase
- from astropy.units.enums import DeprecatedUnitAction
- from astropy.units.errors import UnitParserWarning, UnitsWarning
-diff -ur a/astropy/units/format/vounit.py b/astropy/units/format/vounit.py
---- a/astropy/units/format/vounit.py	2025-12-23 00:29:38.180551429 +0100
-+++ b/astropy/units/format/vounit.py	2025-12-23 00:33:16.628397910 +0100
-@@ -10,7 +10,7 @@
- 
- import numpy as np
- 
--from astropy.extern.ply.lex import LexToken
-+from ply.lex import LexToken
- from astropy.units.core import (
-     CompositeUnit,
-     NamedUnit,
-diff -ur a/astropy/utils/parsing.py b/astropy/utils/parsing.py
---- a/astropy/utils/parsing.py	2025-12-23 00:29:38.185581059 +0100
-+++ b/astropy/utils/parsing.py	2025-12-23 00:32:02.409799898 +0100
-@@ -11,8 +11,8 @@
- from pathlib import Path
- from types import ModuleType
- 
--from astropy.extern.ply.lex import Lexer
--from astropy.extern.ply.yacc import LRParser
-+from ply.lex import Lexer
-+from ply.yacc import LRParser
- 
- __all__ = ["ThreadSafeParser", "lex", "yacc"]
- 
-@@ -84,7 +84,7 @@
-     reflags : int
-         Passed to ``ply.lex``.
-     """
--    from astropy.extern.ply import lex
-+    from ply import lex
- 
-     caller_dir = Path(lex.get_caller_module_dict(2)["__file__"]).parent
-     with _LOCK, _patch_ply_module(lex, caller_dir / (lextab + ".py"), package):
-@@ -131,7 +131,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_dir = Path(yacc.get_caller_module_dict(2)["__file__"]).parent
-     with _LOCK, _patch_ply_module(yacc, caller_dir / (tabmodule + ".py"), package):

diff --git a/python-astropy.spec b/python-astropy.spec
index 838f4c6..1595331 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -1,7 +1,7 @@
 %bcond_without check
 
 %global srcname astropy
-%global srcversion 8.0.0
+%global srcversion 8.0.1
 
 Name: python-%{srcname}
 Version: %{srcversion}
@@ -17,12 +17,12 @@ Source: astropy-README.dist
 # Please, do not change the compilation flags
 Patch: restore-compilation-flags.patch
 Patch: python-astropy-system-configobj.patch
-Patch: python-astropy-system-ply.patch
 Patch: fix-doctest.patch
 
 BuildRequires: gcc
 BuildRequires: expat-devel
-BuildRequires: wcslib-devel >= 8.4
+# Not unbundled
+#BuildRequires: wcslib-devel >= 8.6
 BuildRequires: python3-devel
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
@@ -49,22 +49,16 @@ BuildRequires: %{py3_dist h5py}
 BuildRequires: %{py3_dist scikit-image}
 # Unbundled
 BuildRequires: %{py3_dist configobj}
-BuildRequires: %{py3_dist ply}
 Requires: %{py3_dist configobj}
-Requires: %{py3_dist ply}
 # Bundled
 Provides: bundled(cfitsio) = 4.6.3
 Provides: bundled(jquery) = 3.60
 Provides: bundled(wcslib) = 8.6
-
-# Drop doc subpackage, is empty 
+Provides: bundled(python-ply) = 3.11
 
 %description -n python3-%{srcname}
 %_description
 
-Provides: python3-%{srcname}-doc = %{version}-%{release}
-Obsoletes: python3-%{srcname}-doc < 6.0.1-1
-
 %package -n %{srcname}-tools
 Summary: Astropy utility tools
 BuildArch: noarch
@@ -76,7 +70,6 @@ Utilities provided by Astropy.
 %prep
 %autosetup -n %{srcname}-%{srcversion} -p1
 rm -rf astropy/extern/configobj
-rm -rf astropy/extern/ply
 rm -rf cextern/expat
 # The buils system requires a subset of the header files
 # cel.h, lin.h, prj.h, spc.h, spx.h, tab.h, wcs.h, 
@@ -86,7 +79,6 @@ rm -rf cextern/expat
 # Apparently, --current-env doesn't like {list_dependencies_command}
 sed -i 's/{list_dependencies_command}/python -m pip freeze --all/g' tox.ini
 
-#export ASTROPY_USE_SYSTEM_ALL=1
 export ASTROPY_USE_SYSTEM_ERFA=1
 export ASTROPY_USE_SYSTEM_EXPAT=1
 #export ASTROPY_USE_SYSTEM_WCSLIB=1
@@ -98,17 +90,17 @@ export ASTROPY_USE_SYSTEM_EXPAT=1
 %endif
 
 %build
-#export ASTROPY_USE_SYSTEM_ALL=1
 export ASTROPY_USE_SYSTEM_ERFA=1
 export ASTROPY_USE_SYSTEM_EXPAT=1
+#export ASTROPY_USE_SYSTEM_WCSLIB=1
 # Search for headers in subdirs
 #export CPATH="/usr/include/wcslib"
 %pyproject_wheel
 
 %install
-#export ASTROPY_USE_SYSTEM_ALL=1
 export ASTROPY_USE_SYSTEM_ERFA=1
 export ASTROPY_USE_SYSTEM_EXPAT=1
+#export ASTROPY_USE_SYSTEM_WCSLIB=1
 # Search for headers in subdirs
 #export CPATH="/usr/include/wcslib"
 %pyproject_install

diff --git a/sources b/sources
index e23483b..aa66cfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (astropy-8.0.0.tar.gz) = f726c6c10ad01742caf4a1190240c53f1d85cd2ba013141256dae54c180637cb86838d528fd3fbcbac641d66c3a5c7598fd9285d6018c83bfee8b37ed123cd5f
+SHA512 (astropy-8.0.1.tar.gz) = 5b71b01174786b679b9d5b689a3adbc103f9cad3db2dde4e6278da65e450345d682838569ccf28147fd4f2658ffd68bf04d59b5142181feedb11bf50e9249deb

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-06 11:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-06 11:53 [rpms/python-astropy] main: Update to version 8.0.1 Sergio Pascual

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox