Update astropy to 5.0.2 (#2268)

This commit is contained in:
Jo Bovy 2022-03-11 00:14:49 -05:00 committed by GitHub
parent 74e6809da1
commit 3002751887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 82 deletions

View File

@ -19,7 +19,7 @@ substitutions:
- New packages: sqlalchemy {pr}`2112`, pydantic {pr}`2117`, wrapt {pr}`2165`, - New packages: sqlalchemy {pr}`2112`, pydantic {pr}`2117`, wrapt {pr}`2165`,
boost-histogram {pr}`2174` 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 ### Uncategorized

View File

@ -1,12 +1,9 @@
package: package:
name: astropy name: astropy
version: 5.0.1 version: 5.0.2
source: source:
url: https://files.pythonhosted.org/packages/91/a8/619de6e60fe461e3c7e908ec6fa04333b91249e7877a42485b2df981fdcb/astropy-5.0.1.tar.gz url: https://files.pythonhosted.org/packages/10/3d/87d1dc421e369540184de23c31f2c2e60e18750322919552aba09f05f7be/astropy-5.0.2.tar.gz
sha256: 6382cde6a205aa0b16a0d5e61c0c0131ebd4f0174d6c73e2964f4bee132a9027 sha256: 449f0ba5e7292457eed37550b047444751a606e7b8a34f93b1c28d0bb63e7f40
patches:
- patches/0001-Move-ssl-import-into-functions-to-avoid-import-error.patch
- patches/0002-Move-concurrent.futures-import-into-function-to-avoi.patch
build: build:
script: | script: |
pip install extension-helpers pip install extension-helpers

View File

@ -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)

View File

@ -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)