dcicutils 8.13.1__py3-none-any.whl → 8.13.2__py3-none-any.whl

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/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/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/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.1.dist-info → dcicutils-8.13.2.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.1
+Version: 8.13.2
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT
 Author: 4DN-DCIC Team
 Author-email: support@4dnucleome.org
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.8.1,<3.13
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Database :: Database Engines/Servers
 Requires-Dist: PyJWT (>=2.6.0,<3.0.0)
@@ -33,7 +34,6 @@ Requires-Dist: elasticsearch (==7.13.4)
 Requires-Dist: gitpython (>=3.1.2,<4.0.0)
 Requires-Dist: jsonc-parser (>=1.1.5,<2.0.0)
 Requires-Dist: jsonschema (>=4.22.0,<5.0.0)
-Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
 Requires-Dist: opensearch-py (>=2.0.1,<3.0.0)
 Requires-Dist: pyOpenSSL (>=23.1.1,<24.0.0)

{dcicutils-8.13.1.dist-info → dcicutils-8.13.2.dist-info}/RECORD

@@ -24,13 +24,14 @@ dcicutils/env_manager.py,sha256=Nte1oiW_AQ-isatzsf-fiNpPWInLdfRxzPrATdNoKkI,9444
 dcicutils/env_scripts.py,sha256=gAoXOemg-zA4I_IPeRuymIfhNOYCw_WmPUa6kcSiWkg,3936
 dcicutils/env_utils.py,sha256=hJTXsn6GC55-55ja1ERBmUbeh-DjJABm74eYRGRaiSc,46970
 dcicutils/env_utils_legacy.py,sha256=J81OAtJHN69o1beHO6q1j7_J6TeblSjnAHlS8VA5KSM,29032
-dcicutils/es_utils.py,sha256=ZksLh5ei7kRUfiFltk8sd2ZSfh15twbstrMzBr8HNw4,7541
+dcicutils/es_utils.py,sha256=bzhGkg0UqlYtGbpsiSo6RIyzgCnAKg0NosIX8y6iooI,7601
 dcicutils/exceptions.py,sha256=4giQGtpak-omQv7BP6Ckeu91XK5fnDosC8gfdmN_ccA,9931
 dcicutils/ff_mocks.py,sha256=6RKS4eUiu_Wl8yP_8V0CaV75w4ZdWxdCuL1CVlnMrek,36918
-dcicutils/ff_utils.py,sha256=oIhuZPnGtfwj6bWyCc1u23JbMB_6InPp01ZqUOljd8M,73123
+dcicutils/ff_utils.py,sha256=UkX8Fd8EyyzTvJzqf5nTRwFEG08oc95NC-g8gYTv_XE,73183
 dcicutils/file_utils.py,sha256=zyNdRl1Fu3SrQwjJWaIMvQpi4DRaodNZCX7oTkiPJ-A,10916
 dcicutils/function_cache_decorator.py,sha256=XMyiEGODVr2WoAQ68vcoX_9_Xb9p8pZXdXl7keU8i2g,10026
 dcicutils/glacier_utils.py,sha256=Q4CVXsZCbP-SoZIsZ5NMcawDfelOLzbQnIlQn-GdlTo,34149
+dcicutils/hack_for_elasticsearch_numpy_usage.py,sha256=c4pqGSUOzNzwCvYU39wWIdQB4ysctXefKiTgL4-iFU8,543
 dcicutils/http_utils.py,sha256=tNfH5JA-OwbQKEvD5HPJ3lcp2TSIZ4rnl__4d4JO8Gw,1583
 dcicutils/jh_utils.py,sha256=Gpsxb9XEzggF_-Eq3ukjKvTnuyb9V1SCSUXkXsES4Kg,11502
 dcicutils/kibana/dashboards.json,sha256=wHMB_mpJ8OaYhRRgvpZuihaB2lmSF64ADt_8hkBWgQg,16225
@@ -62,7 +63,7 @@ dcicutils/scripts/run_license_checker.py,sha256=z2keYnRDZsHQbTeo1XORAXSXNJK5axVz
 dcicutils/scripts/view_portal_object.py,sha256=rnlIoblDpoLPJ-Bor7OHxLgrVZyvqoxA0jmHW8ogg3s,29805
 dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19745
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
-dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
+dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
 dcicutils/structured_data.py,sha256=TA7kJ-utVj_xa5XnVs7VaG_XQicl5MUWmrVkDm0N8qE,64471
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
@@ -73,8 +74,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.13.1.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.13.1.dist-info/METADATA,sha256=VYfKtec75WXPqzT59jhWtyNpyLp_vhQjlRATY27EhAA,3429
-dcicutils-8.13.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.13.1.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.13.1.dist-info/RECORD,,
+dcicutils-8.13.2.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.13.2.dist-info/METADATA,sha256=eg6mLuD6nLgu-UeTL97H4ONCf9Y3VRrHYakT7UR1wDk,3442
+dcicutils-8.13.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.13.2.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.13.2.dist-info/RECORD,,