dcicutils 8.13.3.1b1__tar.gz → 8.13.3.1b4__tar.gz

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b1
+Version: 8.13.3.1b4
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT
@@ -26,8 +26,8 @@ Requires-Dist: PyJWT (>=2.6.0,<3.0.0)
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: aws-requests-auth (>=0.4.2,<1)
-Requires-Dist: boto3 (>=1.34.144,<2.0.0)
-Requires-Dist: botocore (>=1.34.144,<2.0.0)
+Requires-Dist: boto3 (>=1.34.147,<2.0.0)
+Requires-Dist: botocore (>=1.34.147,<2.0.0)
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: docker (>=4.4.4,<5.0.0)
 Requires-Dist: elasticsearch (==7.13.4)
@@ -41,11 +41,12 @@ Requires-Dist: pyperclip (>=1.8.2,<2.0.0)
 Requires-Dist: pyramid (==1.10.8)
 Requires-Dist: pytz (>=2020.4)
 Requires-Dist: redis (>=4.5.1,<5.0.0)
-Requires-Dist: requests (>=2.21.0,<3.0.0)
+Requires-Dist: requests (==2.31.0)
 Requires-Dist: rfc3986 (>=1.4.0,<2.0.0)
 Requires-Dist: shortuuid (>=1.0.13,<2.0.0)
 Requires-Dist: structlog (>=19.2.0,<20.0.0)
 Requires-Dist: toml (>=0.10.1,<1)
+Requires-Dist: tomli (>=2.0.1,<3.0.0)
 Requires-Dist: tqdm (>=4.66.2,<5.0.0)
 Requires-Dist: typing-extensions (>=3.8)
 Requires-Dist: urllib3 (>=1.26.19,<2.0.0)

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/dcicutils/common.py

@@ -3,8 +3,7 @@ import os
 import re
 
 from tempfile import TemporaryFile
-from typing import Dict, Union, Tuple, List, Any
-from typing_extensions import Literal
+from typing import Dict, Union, Tuple, List, Any, Literal
 
 
 # ===== Useful constants =====

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/dcicutils/license_utils.py

@@ -7,17 +7,19 @@ import json
 import os
 import re
 import subprocess
+import sys
 import warnings
 
 try:
     import piplicenses
 except ImportError:  # pragma: no cover - not worth unit testing this case
-    raise Exception("The dcicutils.license_utils module is intended for use at development time, not runtime."
-                    " It does not export a requirement for the pip-licenses library,"
-                    " but to use this in your unit tests, you are expected to assure a dev dependency on that library"
-                    " as part of the [tool.poetry.dependencies] section of your pyproject.toml file."
-                    " If you are trying to manually evaluate the utility of this library, you can"
-                    " do 'pip install pip-licenses' and then retry importing this library.")
+    if not ((sys.version_info[0] == 3) and (sys.version_info[1] >= 12)):
+        raise Exception("The dcicutils.license_utils module is intended for use at development time, not runtime."
+                        " It does not export a requirement for the pip-licenses library,"
+                        " but to use this in your unit tests, you are expected to assure a dev dependency on that library"
+                        " as part of the [tool.poetry.dependencies] section of your pyproject.toml file."
+                        " If you are trying to manually evaluate the utility of this library, you can"
+                        " do 'pip install pip-licenses' and then retry importing this library.")
 # or you can comment out the above raise of Exception and instead execute:
 #
 #    subprocess.check_output('pip install pip-licenses'.split(' '))

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/dcicutils/qa_checkers.py

@@ -6,8 +6,7 @@ import toml
 import warnings
 
 from collections import defaultdict
-from typing import Optional, List, Dict, Type
-from typing_extensions import Literal
+from typing import Optional, List, Dict, Type, Literal
 from .contribution_utils import Contributions
 from .lang_utils import conjoined_list, n_of, there_are
 from .misc_utils import PRINT, remove_prefix, remove_suffix, getattr_customized, CustomizableProperty

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/dcicutils/qa_utils.py

@@ -25,8 +25,7 @@ from botocore.credentials import Credentials as Boto3Credentials
 from botocore.exceptions import ClientError
 from collections import defaultdict
 from json import dumps as json_dumps, loads as json_loads
-from typing import Any, Optional, List, DefaultDict, Union, Type, Dict
-from typing_extensions import Literal
+from typing import Any, Optional, List, DefaultDict, Union, Type, Dict, Literal
 from unittest import mock
 from . import misc_utils as misc_utils_module, command_utils as command_utils_module
 from .common import S3StorageClass

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/dcicutils/s3_utils.py

@@ -5,8 +5,7 @@ import mimetypes
 import os
 
 from io import BytesIO
-from typing import Optional, Any, Union
-from typing_extensions import Literal
+from typing import Optional, Any, Union, Literal
 from zipfile import ZipFile
 from .base import get_beanstalk_real_url
 from .common import (

{dcicutils-8.13.3.1b1 → dcicutils-8.13.3.1b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.3.1b1"  # TODO: To become 8.13.4
+version = "8.13.3.1b4"  # TODO: To become 8.13.4
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"
@@ -39,8 +39,8 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<3.13"
-boto3 = "^1.34.144"
-botocore = "^1.34.144"
+boto3 = "^1.34.147"
+botocore = "^1.34.147"
 # The DCIC portals (cgap-portal and fourfront) are very particular about which ElasticSearch version.
 # This value is intentionally pinned and must not be changed casually.
 elasticsearch = "7.13.4"
@@ -63,20 +63,21 @@ pyperclip = "^1.8.2"
 PyYAML = "^6.0.1"
 # N.B. 2024-06-30: Updating (via poetry update) from requests 2.31.0 (2023-05-22)
 # to 2.32.3 (2024-05-29) causes utils GA/CI to fail (on test_ecr_utils_workflow) for some reason.
-requests = "^2.21.0"
+requests = "2.31.0"
 rfc3986 = "^1.4.0"
 shortuuid = "^1.0.13"
 structlog = "^19.2.0"
 toml = ">=0.10.1,<1"
 tqdm = "^4.66.2"
 typing-extensions = ">=3.8"  # Fourfront uses 3.8
+tomli = "^2.0.1"  # Came up submitr for Python 3.12
 urllib3 = "^1.26.19"
 webtest = "^2.0.34"
 
 
 [tool.poetry.dev-dependencies]
-boto3-stubs = "^1.34.144"
-botocore-stubs = "^1.34.144"
+boto3-stubs = "^1.34.147"
+botocore-stubs = "^1.34.147"
 coverage = "^7.5.4"
 # Loaded manually in GA workflow for coverage because a dependency on 2to3
 # in its docopts dependency makes a problem for laoding it here in poetry. -kmp 7-Apr-2023