Address comments

Author: forsyth2

.github/workflows/build_workflow.yml

@@ -19,18 +19,18 @@ jobs:
       - name: Checkout Code Repository
         uses: actions/checkout@v3
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.13
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.13
 
       # Run all pre-commit hooks on all the files.
       # Getting only staged files can be tricky in case a new PR is opened
       # since the action is run on a branch in detached head state.
       # This is the equivalent of running "pre-commit run --all-files" locally.
       # If you commit with the `--no-verify` flag, this check may fail.
       - name: Install and Run Pre-commit
-        uses: pre-commit/[email protected].0
+        uses: pre-commit/[email protected].1
 
   build:
     runs-on: ubuntu-latest

conda/dev.yml

@@ -6,7 +6,7 @@ dependencies:
   # Base
   # =================
   - pip=22.2.2
-  - python=3.11
+  - python >=3.11,<3.14
   - sqlite
   - six=1.16.0
   - globus-sdk=3.2.1

conda/meta.yaml

@@ -16,11 +16,11 @@ build:
 
 requirements:
   host:
-    - python >=3.11
+    - python >=3.11,<3.14
     - pip
 
   run:
-    - python >=3.11
+    - python >=3.11,<3.14
     - fair-research-login >=0.2.6,<0.3.0
     - globus-sdk >=3.0.0,<4.0.0
     - six

setup.cfg

@@ -46,7 +46,7 @@ exclude =
     venv
 
 [mypy]
-python_version = 3.9
+python_version = 3.13
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

setup.py

@@ -7,6 +7,6 @@
     author_email="[email protected], [email protected], [email protected]",
     description="Long term HPSS archiving software for E3SM",
     packages=find_packages(include=["zstash", "zstash.*"]),
-    python_requires=">=3.9",
+    python_requires=">=3.11,<3.14",
     entry_points={"console_scripts": ["zstash=zstash.main:main"]},
 )

zstash/globus.py

@@ -321,7 +321,7 @@ def globus_block_wait(
         try:
             # Wait for the task to complete
             logger.info(
-                f"{ts_utc()}: on task_wait try {retry_count+1} out of {max_retries}"
+                f"{ts_utc()}: on task_wait try {retry_count + 1} out of {max_retries}"
             )
             transfer_client.task_wait(
                 task_id, timeout=wait_timeout, polling_interval=10