Update Python support

.github/workflows/build_workflow.yml

@@ -19,21 +19,24 @@ jobs:
       - name: Checkout Code Repository
         uses: actions/checkout@v3
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       # 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
+    strategy:
+      matrix:
+        python-version: [3.11, 3.12]
     defaults:
       run:
         shell: bash -l {0}
@@ -48,7 +51,7 @@ jobs:
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
-            hashFiles('conda/dev.yml') }}
+            hashFiles('conda/dev.yml') }}-python${{ matrix.python-version }}
 
       - name: Build Conda Environment
         uses: conda-incubator/setup-miniconda@v3
@@ -59,11 +62,18 @@ jobs:
           environment-file: conda/dev.yml
           channel-priority: strict
           auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+          channels: conda-forge
+          use-only-tar-bz2: true
+
+      - name: Fix pip and setuptools for Python 3.12+
+        run: |
+          python -m ensurepip --upgrade
+          python -m pip install --upgrade --force-reinstall pip setuptools wheel
 
       - name: Install `zstash` Package
         run: |
-          python -m pip install --upgrade pip
-          pip install .
+          python -m pip install .
 
       - name: Run Tests
         run: |

conda/dev.yml

@@ -1,12 +1,13 @@
 name: zstash_dev
 channels:
   - conda-forge
-  - defaults
+  - nodefaults  # This replaces 'defaults' to avoid Anaconda commercial repos
 dependencies:
   # Base
   # =================
   - pip=22.2.2
-  - python=3.9.13
+  - python >=3.11,<3.14
+  - sqlite
   - six=1.16.0
   - globus-sdk=3.15.0
   # Developer Tools

conda/meta.yaml

@@ -16,14 +16,15 @@ build:
 
 requirements:
   host:
-    - python >=3.9
+    - python >=3.11,<3.14
     - pip
 
   run:
-    - python >=3.9
+    - python >=3.11,<3.14
     - fair-research-login >=0.2.6,<0.3.0
     - globus-sdk >=3.0.0,<4.0.0
     - six
+    - sqlite
 
 test:
   imports:

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

@@ -211,7 +211,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