diff --git a/.gitignore b/.gitignore index fb279e3..292a87d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /astroquery-0.3.6.tar.gz /astroquery-0.3.7.tar.gz /astroquery-0.3.8.tar.gz +/astroquery-0.3.9.tar.gz diff --git a/f11a0ff530a7954836262930f7b433ecf50624b7.patch b/f11a0ff530a7954836262930f7b433ecf50624b7.patch deleted file mode 100644 index b89bdd6..0000000 --- a/f11a0ff530a7954836262930f7b433ecf50624b7.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f11a0ff530a7954836262930f7b433ecf50624b7 Mon Sep 17 00:00:00 2001 -From: Christian Dersch -Date: Fri, 6 Jul 2018 16:11:26 +0200 -Subject: [PATCH] vo_conesearch: Renamed async to vo_async as async is reserved - keyword stating with Python 3.7 - ---- - astroquery/vo_conesearch/conesearch.py | 2 +- - astroquery/vo_conesearch/{async.py => vo_async.py} | 0 - 2 files changed, 1 insertion(+), 1 deletion(-) - rename astroquery/vo_conesearch/{async.py => vo_async.py} (100%) - -diff --git a/astroquery/vo_conesearch/conesearch.py b/astroquery/vo_conesearch/conesearch.py -index 460826d3f..1ea03728f 100644 ---- a/astroquery/vo_conesearch/conesearch.py -+++ b/astroquery/vo_conesearch/conesearch.py -@@ -23,7 +23,7 @@ - - # LOCAL - from . import vos_catalog --from .async import AsyncBase -+from .vo_async import AsyncBase - from .core import ConeSearchClass, _validate_sr - from .exceptions import ConeSearchError, VOSError - -diff --git a/astroquery/vo_conesearch/async.py b/astroquery/vo_conesearch/vo_async.py -similarity index 100% -rename from astroquery/vo_conesearch/async.py -rename to astroquery/vo_conesearch/vo_async.py diff --git a/python-astroquery.spec b/python-astroquery.spec index 5505815..ba3881e 100644 --- a/python-astroquery.spec +++ b/python-astroquery.spec @@ -2,18 +2,14 @@ %global sum Python module to access astronomical online data resources Name: python-%{srcname} -Version: 0.3.8 -Release: 3%{?dist} +Version: 0.3.9 +Release: 1%{?dist} Summary: %{sum} License: BSD URL: http://pypi.python.org/pypi/%{srcname} Source0: https://files.pythonhosted.org/packages/source/a/%{srcname}/%{srcname}-%{version}.tar.gz -# Rename async to vo_async (internal API only) to be Python 3.7+ compatible -# Filed upstream: https://github.com/astropy/astroquery/pull/1185 -Patch0: https://github.com/astropy/astroquery/commit/f11a0ff530a7954836262930f7b433ecf50624b7.patch - BuildArch: noarch BuildRequires: python3-astropy BuildRequires: python3-beautifulsoup4 @@ -61,6 +57,10 @@ chmod 755 %{buildroot}%{python3_sitelib}/%{srcname}/alma/tests/data/downloadRequ %exclude %{python3_sitelib}/%{srcname}/cosmosim/tests/test_cosmosim.py %changelog +* Thu Jan 31 2019 Christian Dersch - 0.3.9-1 +- new version +- drop patch applied upstream + * Tue Oct 16 2018 Christian Dersch - 0.3.8-3 - remove python2 subpackage diff --git a/sources b/sources index 3f7f1c1..fdc7dd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (astroquery-0.3.8.tar.gz) = 8636cd107339c9de9a319553568266dfac7f640cb8f1b486ed78db8619fe032fd3c0110bfff42b61102ae3abe0d61aafc0b2aff3a12f189da548ce59f1589902 +SHA512 (astroquery-0.3.9.tar.gz) = 0da57f687ac0aa7611cd97085771d79c99e9ac8c11f0828fcbc7390faf24e1e87d86812020e0ae8be1749f5f2ae9cb3733e5922d38a897a9e212247175c28e52