From 300275188731adec6c2e6c967c889dfe7e57b92b Mon Sep 17 00:00:00 2001
From: Jo Bovy <bovy@astro.utoronto.ca>
Date: Fri, 11 Mar 2022 00:14:49 -0500
Subject: [PATCH] Update astropy to 5.0.2 (#2268)

---
 docs/project/changelog.md                     |  2 +-
 packages/astropy/meta.yaml                    |  9 ++---
 ...into-functions-to-avoid-import-error.patch | 40 -------------------
 ...futures-import-into-function-to-avoi.patch | 35 ----------------
 4 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 packages/astropy/patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch
 delete mode 100644 packages/astropy/patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch

diff --git a/docs/project/changelog.md b/docs/project/changelog.md
index 74c4bb4c9..e1b2aeb1b 100644
--- a/docs/project/changelog.md
+++ b/docs/project/changelog.md
@@ -19,7 +19,7 @@ substitutions:
 - New packages: sqlalchemy {pr}`2112`, pydantic {pr}`2117`, wrapt {pr}`2165`,
   boost-histogram {pr}`2174`
 
-- Upgraded packages: distlib (0.3.4), lxml (4.8.0) {pr}`2239`,
+- Upgraded packages: distlib (0.3.4), lxml (4.8.0) {pr}`2239`, astropy (5.0.2)
 
 ### Uncategorized
 
diff --git a/packages/astropy/meta.yaml b/packages/astropy/meta.yaml
index 93c0d336f..63de8ccdd 100644
--- a/packages/astropy/meta.yaml
+++ b/packages/astropy/meta.yaml
@@ -1,12 +1,9 @@
 package:
   name: astropy
-  version: 5.0.1
+  version: 5.0.2
 source:
-  url: https://files.pythonhosted.org/packages/91/a8/619de6e60fe461e3c7e908ec6fa04333b91249e7877a42485b2df981fdcb/astropy-5.0.1.tar.gz
-  sha256: 6382cde6a205aa0b16a0d5e61c0c0131ebd4f0174d6c73e2964f4bee132a9027
-  patches:
-    - patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch
-    - patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch
+  url: https://files.pythonhosted.org/packages/10/3d/87d1dc421e369540184de23c31f2c2e60e18750322919552aba09f05f7be/astropy-5.0.2.tar.gz
+  sha256: 449f0ba5e7292457eed37550b047444751a606e7b8a34f93b1c28d0bb63e7f40
 build:
   script: |
     pip install extension-helpers
diff --git a/packages/astropy/patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch b/packages/astropy/patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch
deleted file mode 100644
index 4335cfce3..000000000
--- a/packages/astropy/patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4e4f12d0052cb9c9fc8ac550266889a0c39af8ec Mon Sep 17 00:00:00 2001
-From: Jo Bovy <bovy@astro.utoronto.ca>
-Date: Mon, 28 Feb 2022 20:43:45 -0500
-Subject: [PATCH] Move ssl import into functions to avoid import error
-
----
- astropy/utils/data.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/astropy/utils/data.py b/astropy/utils/data.py
-index 0dde5b293..25c758be2 100644
---- a/astropy/utils/data.py
-+++ b/astropy/utils/data.py
-@@ -13,7 +13,6 @@ import io
- import re
- import shutil
- import socket
--import ssl
- import sys
- import urllib.request
- import urllib.error
-@@ -1048,6 +1047,7 @@ def _build_urlopener(ftp_tls=False, ssl_context=None, allow_insecure=False):
-     """
-     Helper for building a `urllib.request.build_opener` which handles TLS/SSL.
-     """
-+    import ssl
- 
-     ssl_context = dict(it for it in ssl_context) if ssl_context else {}
-     cert_chain = {}
-@@ -1087,6 +1087,7 @@ def _build_urlopener(ftp_tls=False, ssl_context=None, allow_insecure=False):
- def _try_url_open(source_url, timeout=None, http_headers=None, ftp_tls=False,
-                   ssl_context=None, allow_insecure=False):
-     """Helper for opening a URL while handling TLS/SSL verification issues."""
-+    import ssl
- 
-     # Always try first with a secure connection
-     # _build_urlopener uses lru_cache, so the ssl_context argument must be
--- 
-2.32.0 (Apple Git-132)
-
diff --git a/packages/astropy/patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch b/packages/astropy/patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch
deleted file mode 100644
index 346156f5a..000000000
--- a/packages/astropy/patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 77517841878c92eb29ea2e29cb4c37f2ff7d0f43 Mon Sep 17 00:00:00 2001
-From: Jo Bovy <bovy@astro.utoronto.ca>
-Date: Tue, 1 Mar 2022 21:19:17 -0500
-Subject: [PATCH] Move concurrent.futures import into function to avoid import
- error
-
----
- astropy/utils/console.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/astropy/utils/console.py b/astropy/utils/console.py
-index f2bd22a24..5db50e0f9 100644
---- a/astropy/utils/console.py
-+++ b/astropy/utils/console.py
-@@ -14,7 +14,6 @@ import struct
- import sys
- import threading
- import time
--from concurrent.futures import ProcessPoolExecutor, as_completed
- 
- try:
-     import fcntl
-@@ -805,7 +804,8 @@ class ProgressBar:
-             else:
-                 ctx = multiprocessing.get_context(multiprocessing_start_method)
-                 kwargs = dict(mp_context=ctx)
--
-+                
-+                from concurrent.futures import ProcessPoolExecutor, as_completed
-                 with ProcessPoolExecutor(
-                         max_workers=(int(multiprocess)
-                                      if multiprocess is not True
--- 
-2.32.0 (Apple Git-132)
-