diff --git a/1185.patch b/1185.patch deleted file mode 100644 index 10c4d22..0000000 --- a/1185.patch +++ /dev/null @@ -1,134 +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 1/5] 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 - -From bea404676185e91ff8097fe9a5de68b5b4f30920 Mon Sep 17 00:00:00 2001 -From: Christian Dersch -Date: Fri, 6 Jul 2018 16:23:29 +0200 -Subject: [PATCH 2/5] Proper changelog entry - ---- - CHANGES | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CHANGES b/CHANGES -index 3b47e513a..d118571a3 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -8,7 +8,7 @@ - - MAST: Enable converting list of products into S3 uris [#1126] - - NASA_ADS: Use new API [#1162] - - VO_CONESEARCH: Service validator now uses new STScI VAO TAP registry. [#1114] -- -+- VO_CONESEARCH: Renamed async to vo_async as async is reserved keyword starting with Python 3.7. [#1185] - - 0.3.8 (2018-04-27) - ------------------ - -From acc891a579ce92ccbf655c3c0b0ab71374b372b4 Mon Sep 17 00:00:00 2001 -From: Christian Dersch -Date: Fri, 6 Jul 2018 16:40:20 +0200 -Subject: [PATCH 3/5] Revert "Proper changelog entry", we don't need an entry - here (internal change) - -This reverts commit bea404676185e91ff8097fe9a5de68b5b4f30920. ---- - CHANGES | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CHANGES b/CHANGES -index d118571a3..3b47e513a 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -8,7 +8,7 @@ - - MAST: Enable converting list of products into S3 uris [#1126] - - NASA_ADS: Use new API [#1162] - - VO_CONESEARCH: Service validator now uses new STScI VAO TAP registry. [#1114] --- VO_CONESEARCH: Renamed async to vo_async as async is reserved keyword starting with Python 3.7. [#1185] -+ - - 0.3.8 (2018-04-27) - ------------------ - -From abaf504ec74aefe720e23cee5d94a824bac8b95e Mon Sep 17 00:00:00 2001 -From: Christian Dersch -Date: Fri, 6 Jul 2018 16:54:32 +0200 -Subject: [PATCH 4/5] Fix documentation for rename async -> vo_async in - vo_conesearch - ---- - docs/vo_conesearch/vo_conesearch.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/vo_conesearch/vo_conesearch.rst b/docs/vo_conesearch/vo_conesearch.rst -index 4dc0ceb32..017c3ecb8 100644 ---- a/docs/vo_conesearch/vo_conesearch.rst -+++ b/docs/vo_conesearch/vo_conesearch.rst -@@ -216,7 +216,7 @@ Reference/API - .. automodapi:: astroquery.vo_conesearch.conesearch - :no-inheritance-diagram: - --.. automodapi:: astroquery.vo_conesearch.async -+.. automodapi:: astroquery.vo_conesearch.vo_async - :no-inheritance-diagram: - - .. automodapi:: astroquery.vo_conesearch.exceptions - -From d3229dadee88756a69eefc3ffb50b11f52655df1 Mon Sep 17 00:00:00 2001 -From: Christian Dersch -Date: Fri, 6 Jul 2018 17:12:47 +0200 -Subject: [PATCH 5/5] Fix documentation for rename async -> vo_async in - vo_conesearch, take two - ---- - astroquery/vo_conesearch/conesearch.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/astroquery/vo_conesearch/conesearch.py b/astroquery/vo_conesearch/conesearch.py -index 1ea03728f..b7f951394 100644 ---- a/astroquery/vo_conesearch/conesearch.py -+++ b/astroquery/vo_conesearch/conesearch.py -@@ -44,7 +44,7 @@ class AsyncConeSearch(AsyncBase): - - .. note:: - -- See :class:`~astroquery.vo_conesearch.async.AsyncBase` -+ See :class:`~astroquery.vo_conesearch.vo_async.AsyncBase` - for more details. - - Parameters -@@ -260,7 +260,7 @@ class AsyncSearchAll(AsyncBase): - - .. note:: - -- See :class:`~astroquery.vo_conesearch.async.AsyncBase` -+ See :class:`~astroquery.vo_conesearch.vo_async.AsyncBase` - for more details. - - Parameters diff --git a/f11a0ff530a7954836262930f7b433ecf50624b7.patch b/f11a0ff530a7954836262930f7b433ecf50624b7.patch new file mode 100644 index 0000000..b89bdd6 --- /dev/null +++ b/f11a0ff530a7954836262930f7b433ecf50624b7.patch @@ -0,0 +1,29 @@ +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 068fc00..edae174 100644 --- a/python-astroquery.spec +++ b/python-astroquery.spec @@ -12,7 +12,7 @@ Source0: https://files.pythonhosted.org/packages/source/a/%{srcname}/%{sr # 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/pull/1185.patch +Patch0: https://github.com/astropy/astroquery/commit/f11a0ff530a7954836262930f7b433ecf50624b7.patch BuildArch: noarch BuildRequires: python2-astropy