dcicutils 8.13.0__tar.gz → 8.13.0.1b1__tar.gz

{dcicutils-8.13.0 → dcicutils-8.13.0.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.0
+Version: 8.13.0.1b1
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.13.0 → dcicutils-8.13.0.1b1}/dcicutils/es_utils.py

@@ -1,6 +1,7 @@
 import logging
 import boto3
 from .misc_utils import PRINT
+import dcicutils.hack_for_elasticsearch_numpy_usage  # noqa
 from elasticsearch import Elasticsearch, RequestsHttpConnection
 from aws_requests_auth.boto_utils import BotoAWSRequestsAuth
 

{dcicutils-8.13.0 → dcicutils-8.13.0.1b1}/dcicutils/ff_utils.py

@@ -7,6 +7,7 @@ import requests
 import time
 
 from collections import namedtuple
+import dcicutils.hack_for_elasticsearch_numpy_usage  # noqa
 from elasticsearch.exceptions import AuthorizationException
 from typing import Dict, List, Optional
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse

dcicutils-8.13.0.1b1/dcicutils/hack_for_elasticsearch_numpy_usage.py

@@ -0,0 +1,10 @@
+# Though dcicutils is not dependent on numpy, elasticsearch pulls it in iff it is installed,
+# and if it is numpy 2.x the numpy.float_ constant has been retired and any reference to it
+# yields an error from numpy (AttributeError: np.float_ was removed in the NumPy 2.0 release.
+# Use np.float64 instead); this reference to numpy.float_ occurs in elasticsearch/serializer.py.
+# and we short-circuit it here by explicitly setting numpy.float_ to numpyh.float64.
+try:
+    import numpy
+    numpy.float_ = numpy.float64
+except Exception:
+    pass

{dcicutils-8.13.0 → dcicutils-8.13.0.1b1}/dcicutils/snapshot_utils.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
 
+import dcicutils.hack_for_elasticsearch_numpy_usage  # noqa
 from elasticsearch.exceptions import NotFoundError
 from .misc_utils import (
     environ_bool, PRINT, camel_case_to_snake_case, full_object_name,

{dcicutils-8.13.0 → dcicutils-8.13.0.1b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.0"
+version = "8.13.0.1b1"  # TODO: To become 8.13.1
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"