dcicutils 8.13.1__tar.gz → 8.13.2__tar.gz

{dcicutils-8.13.1 → dcicutils-8.13.2}/PKG-INFO

@@ -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 → dcicutils-8.13.2}/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.1 → dcicutils-8.13.2}/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.2/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.1 → dcicutils-8.13.2}/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 → dcicutils-8.13.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.1"  # TODO: To become 8.13.1
+version = "8.13.2" # accidentally pushed 8.13.1 before ready - pushing this corrected 8.13.2 one before ready too but better than 8.13.1 # "8.13.0.1b3"  # TODO: To become 8.13.2
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"
@@ -29,6 +29,7 @@ classifiers = [
 
     # Specify the Python versions you support here.
     'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
@@ -37,7 +38,7 @@ classifiers = [
 
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
+python = ">=3.8.1,<3.13"
 boto3 = "^1.34.136"
 botocore = "^1.34.136"
 # The DCIC portals (cgap-portal and fourfront) are very particular about which ElasticSearch version.
@@ -50,7 +51,6 @@ docker = "^4.4.4"
 gitpython = "^3.1.2"
 jsonc-parser = "^1.1.5"
 jsonschema = "^4.22.0"
-numpy = "^1.26.4"
 openpyxl = "^3.1.2"
 opensearch-py = "^2.0.1"
 pyOpenSSL = "^23.1.1"