From 9e8d09001758b4ea55e7658981a57d9c36b214ee Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Oct 21 2018 13:52:00 +0000 Subject: Retired for Python 2 mass removal (#1640540) --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 14fa019..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/astropy-2.0.5.tar.gz -/astropy-2.0.6.tar.gz -/astropy-2.0.7.tar.gz -/astropy-2.0.8.tar.gz -/astropy-2.0.9.tar.gz diff --git a/astropy-README.dist b/astropy-README.dist deleted file mode 100644 index b37e9b0..0000000 --- a/astropy-README.dist +++ /dev/null @@ -1,12 +0,0 @@ - -Differences between upstream astropy and the current version python-astropy - -Bundled python packages -======================= -Upstream astropy bundles several python packages under `astropy.extern`. -The following packages have been unbundled and the code patched so that astropy -uses the system package: - - * configobj - * six - * ply diff --git a/astropy-ply.py b/astropy-ply.py deleted file mode 100644 index 4aa0077..0000000 --- a/astropy-ply.py +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed under a 3-clause BSD style license - see LICENSE.rst - -""" -Handle loading ply package from system or from the bundled copy -""" - -import imp -from distutils.version import StrictVersion - - -def _find_module(name, path=None): - """ - Alternative to `imp.find_module` that can also search in subpackages. - """ - - parts = name.split('.') - - for part in parts: - if path is not None: - path = [path] - - fh, path, descr = imp.find_module(part, path) - - return fh, path, descr - -_PLY_MIN_VERSION = StrictVersion('3.9') - -# Update this to prevent Astropy from using its bundled copy of ply -# (but only if some other version of at least _PLY_MIN_VERSION can -# be provided) -_PLY_SEARCH_PATH = ['ply'] - - -for mod_name in _PLY_SEARCH_PATH: - try: - mod_info = _find_module(mod_name) - #mod_lex_info = _find_module(mod_name + '.lex') - except ImportError: - continue - - mod = imp.load_module(__name__, *mod_info) - #mod_lex = imp.load_module(__name__ + '.lex', *mod_lex_info) - - try: - # if StrictVersion(mod_lex.__version__) >= _PLY_MIN_VERSION: - # break - break - except (AttributeError, ValueError): - # Attribute error if the ply module isn't what it should be and doesn't - # have a .__version__; ValueError if the version string exists but is - # somehow bogus/unparseable - continue -else: - raise ImportError( - "Astropy requires the 'ply' module of minimum version {0}; " - "normally this is bundled with the astropy package so if you get " - "this warning consult the packager of your Astropy " - "distribution.".format(_PLY_MIN_VERSION)) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..b1285f9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retired for Python 2 mass removal (#1640540) diff --git a/python-astropy-system-configobj.patch b/python-astropy-system-configobj.patch deleted file mode 100644 index 72d116d..0000000 --- a/python-astropy-system-configobj.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur astropy-1.2.1/astropy/config/configuration.py astropy-1.2.1.co/astropy/config/configuration.py ---- astropy-1.2.1/astropy/config/configuration.py 2016-06-22 16:32:13.000000000 +0200 -+++ astropy-1.2.1.co/astropy/config/configuration.py 2016-07-14 22:12:58.211075218 +0200 -@@ -19,7 +19,7 @@ - import re - from warnings import warn - --from ..extern.configobj import configobj, validate -+import configobj, validate - from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning - from ..utils import find_current_module - from ..utils.introspection import resolve_name diff --git a/python-astropy-system-six.patch b/python-astropy-system-six.patch deleted file mode 100644 index 8bfab98..0000000 --- a/python-astropy-system-six.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur astropy-0.4.1/astropy/extern/six.py astropy-0.4.1.six/astropy/extern/six.py ---- astropy-0.4.1/astropy/extern/six.py 2014-09-01 21:57:56.663393218 +0200 -+++ astropy-0.4.1.six/astropy/extern/six.py 2014-09-01 21:59:02.940933294 +0200 -@@ -13,7 +13,7 @@ - # Update this to prevent Astropy from using its bundled copy of six - # (but only if some other version of at least _SIX_MIN_VERSION can - # be provided) --_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six'] -+_SIX_SEARCH_PATH = ['six', 'astropy.extern.bundled.six'] - - - def _find_module(name, path=None): diff --git a/python2-astropy.spec b/python2-astropy.spec deleted file mode 100644 index 12a1f24..0000000 --- a/python2-astropy.spec +++ /dev/null @@ -1,185 +0,0 @@ -# Works with system erfa -%bcond_without system_erfa - -# EPEL has older wcslib -%if 0%{?fedora} -%bcond_without system_wcslib -%else -%bcond_with system_wcslib -%endif - -%global srcname astropy - -Name: python2-%{srcname} -Version: 2.0.9 -Release: 1%{?dist} -Summary: A Community Python Library for Astronomy - -License: BSD -URL: http://astropy.org -Source0: https://files.pythonhosted.org/packages/source/a/%{srcname}/%{srcname}-%{version}.tar.gz -Source1: astropy-README.dist -Source2: astropy-ply.py -Patch0: python-astropy-system-configobj.patch -Patch1: python-astropy-system-six.patch - -BuildRequires: gcc -BuildRequires: git -BuildRequires: graphviz -BuildRequires: cfitsio-devel -BuildRequires: expat-devel -%if %{with system_erfa} -BuildRequires: erfa-devel -%else -Provides: bundled(erfa) = 1.3.0 -%endif -%if %{with system_wcslib} -BuildRequires: wcslib-devel >= 5.14 -%else -Provides: bundled(wcslib) = 5.16 -%endif -BuildRequires: texlive-ucs -BuildRequires: python2-configobj -BuildRequires: python2-Cython -BuildRequires: python2-devel -BuildRequires: python2-h5py -BuildRequires: python2-matplotlib -BuildRequires: python2-numpy -BuildRequires: python2-pandas -BuildRequires: python2-ply -BuildRequires: python2-pytest -BuildRequires: python2-pyyaml -BuildRequires: python2-scipy -BuildRequires: python2-setuptools -BuildRequires: python2-six -BuildRequires: python2-sphinx - -Requires: python2-configobj -Requires: python2-h5py -Requires: python2-matplotlib -Requires: python2-numpy -Requires: python2-ply -Requires: python2-pytest -Requires: python2-pyyaml -Requires: python2-scipy -Requires: python2-six -Requires: /usr/bin/xmllint - -# Pandas is not a strict requirement, but useful -Recommends: python2-pandas - -%{?python_provide:%python_provide python2-%{srcname}} -Provides: bundled(jquery) = 1.11 - -# wcsaxes has been merged into astropy, therefore we obsolete and provide -# the old python-wcsaxes package here -Provides: python2-wcsaxes = %{version}-%{release} -Obsoletes: python2-wcsaxes < 0.9-9 - -%description -The Astropy project is a common effort to develop a single core package -for Astronomy. Major packages such as PyFITS, PyWCS, vo, and asciitable -already merged in, and many more components being worked on. In -particular, we are developing imaging, photometric, and spectroscopic -functionality, as well as frameworks for cosmology, unit handling, and -coordinate transformations. - -%package doc -Summary: Documentation for %{name}, includes full API docs -# Disabled for the moment to avoid name collision -# of generated names between arches -# BuildArch: noarch -%{?python_provide:%python_provide python2-%{srcname}-doc} - -%description doc -This package contains the full API documentation for %{name}. - - -%prep -%autosetup -p1 -n %{srcname}-%{version} -cp %{SOURCE1} README.dist -# Required to support wcslib 4.5 -find -name wcsconfig.h -delete -rm -rf astropy*egg-info -# Use system ply -cp %{SOURCE2} astropy/extern/ply.py - -# Remove expat, erfa, cfitsio and wcslib -rm -rf cextern/cfitsio -%if %{with system_erfa} -rm -rf cextern/erfa -%endif -rm -rf cextern/expat -%if %{with system_wcslib} -rm -rf cextern/wcslib -%endif - -echo "[build]" >> setup.cfg -#echo "use_system_libraries=1" >> setup.cfg -echo "use_system_cfitsio=1" >> setup.cfg -%if %{with system_erfa} -echo "use_system_erfa=1" >> setup.cfg -%endif -echo "use_system_expat=1" >> setup.cfg -%if %{with system_wcslib} -echo "use_system_wcslib=1" >> setup.cfg -%endif - - -%build -%global py_setup_args --offline -%py2_build -# Use cairo backend due to https://bugzilla.redhat.com/show_bug.cgi?id=1394975 -export MPLBACKEND=cairo -%{__python2} setup.py build_sphinx --offline %{?epel:|| :} -rm -f docs/_build/html/.buildinfo - - -%install -%py2_install -find %{buildroot} -name "*.so" | xargs chmod 755 - -%check -%ifnarch s390x -pushd %{buildroot}/%{python2_sitearch} -py.test-%{python2_version} -k "not test_write_read_roundtrip" astropy -popd -%endif # ifnarch s390x - - -%files -%doc README.rst README.dist -%license LICENSE.rst -# We exclude the "binaries" here, they are part of the astropy-tools package -# (subpackage of python-astropy). No need for Python 2 versions here. -%exclude %{_bindir}/* -%{python2_sitearch}/* - -%files doc -%doc README.rst README.dist docs/_build/html -%license LICENSE.rst - -%changelog -* Sun Oct 21 2018 Christian Dersch - 2.0.9-1 -- new version - -* Mon Aug 13 2018 Miro Hrončok - 2.0.8-2 -- Enable s390x (#1612539) - -* Sun Aug 05 2018 Christian Dersch - 2.0.8-1 -- new version -- ExcludeArch s390x due to numpy issue (#1612539) - -* Sun Jul 15 2018 Christian Dersch - 2.0.7-1 -- new version - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat May 26 2018 Christian Dersch - 2.0.6-1 -- new version - -* Wed Mar 14 2018 Christian Dersch - 2.0.5-2 -- initial package, splitting out the python2 subpackage of python-astropy (new - upstream releases Python 3 only) - diff --git a/sources b/sources deleted file mode 100644 index 5276efa..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (astropy-2.0.9.tar.gz) = 6d3cb34b2b152776565819380b0fa32c5b300d109ed8f2d481d7b8288a17dbfe799dd716acda953c05d9ef1b2372af00c636811de67609a62dacf7ba09e91da4