Dev/better tmux running

.gitlab-ci.yml

@@ -94,30 +94,36 @@ stages:
   - 'echo "Installing helpers: setuptools"'
   - python -m uv pip install setuptools>=0.8 setuptools_scm wheel build -U
   - 'echo "Installing helpers: tomli and pkginfo"'
-  - python -m uv pip install tomli pkginfo
+  - python -m uv pip install tomli pkginfo packaging
   - |-
     export WHEEL_FPATH=$(python -c "if 1:
         import pathlib
+        from packaging import tags
+        from packaging.utils import parse_wheel_filename
         dist_dpath = pathlib.Path('dist')
-        candidates = list(dist_dpath.glob('cmd_queue*.whl'))
-        candidates += list(dist_dpath.glob('cmd_queue*.tar.gz'))
-        fpath = sorted(candidates)[-1]
+        wheels = sorted(dist_dpath.glob('cmd_queue*.whl'))
+        if wheels:
+            sys_tags = set(tags.sys_tags())
+            matching = []
+            for w in wheels:
+                try:
+                    _, _, _, wheel_tags = parse_wheel_filename(w.name)
+                except Exception:
+                    continue
+                if any(t in sys_tags for t in wheel_tags):
+                    matching.append(w)
+            fpath = sorted(matching or wheels)[-1]
+        else:
+            sdists = sorted(dist_dpath.glob('cmd_queue*.tar.gz'))
+            if not sdists:
+                raise SystemExit('No wheel artifacts found in wheelhouse')
+            fpath = sdists[-1]
         print(str(fpath).replace(chr(92), chr(47)))
     ")
-  - |-
-    export MOD_VERSION=$(python -c "if 1:
-        from pkginfo import Wheel, SDist
-        import pathlib
-        fpath = '$WHEEL_FPATH'
-        cls = Wheel if fpath.endswith('.whl') else SDist
-        item = cls(fpath)
-        print(item.version)
-    ")
   - echo "WHEEL_FPATH=$WHEEL_FPATH"
   - echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
   - echo "UV_RESOLUTION=$UV_RESOLUTION"
-  - echo "MOD_VERSION=$MOD_VERSION"
-  - python -m pip install --prefer-binary "cmd_queue[$INSTALL_EXTRAS]==$MOD_VERSION" -f dist
+  - python -m pip install --prefer-binary "${WHEEL_FPATH}[${INSTALL_EXTRAS}]"
   - echo "Install finished."
   - echo "Creating test sandbox directory"
   - export WORKSPACE_DNAME="sandbox"
@@ -164,30 +170,36 @@ stages:
   - 'echo "Installing helpers: setuptools"'
   - python -m uv pip install setuptools>=0.8 setuptools_scm wheel build -U
   - 'echo "Installing helpers: tomli and pkginfo"'
-  - python -m uv pip install tomli pkginfo
+  - python -m uv pip install tomli pkginfo packaging
   - |-
     export WHEEL_FPATH=$(python -c "if 1:
         import pathlib
+        from packaging import tags
+        from packaging.utils import parse_wheel_filename
         dist_dpath = pathlib.Path('dist')
-        candidates = list(dist_dpath.glob('cmd_queue*.whl'))
-        candidates += list(dist_dpath.glob('cmd_queue*.tar.gz'))
-        fpath = sorted(candidates)[-1]
+        wheels = sorted(dist_dpath.glob('cmd_queue*.whl'))
+        if wheels:
+            sys_tags = set(tags.sys_tags())
+            matching = []
+            for w in wheels:
+                try:
+                    _, _, _, wheel_tags = parse_wheel_filename(w.name)
+                except Exception:
+                    continue
+                if any(t in sys_tags for t in wheel_tags):
+                    matching.append(w)
+            fpath = sorted(matching or wheels)[-1]
+        else:
+            sdists = sorted(dist_dpath.glob('cmd_queue*.tar.gz'))
+            if not sdists:
+                raise SystemExit('No wheel artifacts found in wheelhouse')
+            fpath = sdists[-1]
         print(str(fpath).replace(chr(92), chr(47)))
     ")
-  - |-
-    export MOD_VERSION=$(python -c "if 1:
-        from pkginfo import Wheel, SDist
-        import pathlib
-        fpath = '$WHEEL_FPATH'
-        cls = Wheel if fpath.endswith('.whl') else SDist
-        item = cls(fpath)
-        print(item.version)
-    ")
   - echo "WHEEL_FPATH=$WHEEL_FPATH"
   - echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
   - echo "UV_RESOLUTION=$UV_RESOLUTION"
-  - echo "MOD_VERSION=$MOD_VERSION"
-  - python -m pip install --prefer-binary "cmd_queue[$INSTALL_EXTRAS]==$MOD_VERSION" -f dist
+  - python -m pip install --prefer-binary "${WHEEL_FPATH}[${INSTALL_EXTRAS}]"
   - echo "Install finished."
   - echo "Creating test sandbox directory"
   - export WORKSPACE_DNAME="sandbox"
@@ -234,30 +246,36 @@ stages:
   - 'echo "Installing helpers: setuptools"'
   - python -m uv pip install setuptools>=0.8 setuptools_scm wheel build -U
   - 'echo "Installing helpers: tomli and pkginfo"'
-  - python -m uv pip install tomli pkginfo
+  - python -m uv pip install tomli pkginfo packaging
   - |-
     export WHEEL_FPATH=$(python -c "if 1:
         import pathlib
+        from packaging import tags
+        from packaging.utils import parse_wheel_filename
         dist_dpath = pathlib.Path('dist')
-        candidates = list(dist_dpath.glob('cmd_queue*.whl'))
-        candidates += list(dist_dpath.glob('cmd_queue*.tar.gz'))
-        fpath = sorted(candidates)[-1]
+        wheels = sorted(dist_dpath.glob('cmd_queue*.whl'))
+        if wheels:
+            sys_tags = set(tags.sys_tags())
+            matching = []
+            for w in wheels:
+                try:
+                    _, _, _, wheel_tags = parse_wheel_filename(w.name)
+                except Exception:
+                    continue
+                if any(t in sys_tags for t in wheel_tags):
+                    matching.append(w)
+            fpath = sorted(matching or wheels)[-1]
+        else:
+            sdists = sorted(dist_dpath.glob('cmd_queue*.tar.gz'))
+            if not sdists:
+                raise SystemExit('No wheel artifacts found in wheelhouse')
+            fpath = sdists[-1]
         print(str(fpath).replace(chr(92), chr(47)))
     ")
-  - |-
-    export MOD_VERSION=$(python -c "if 1:
-        from pkginfo import Wheel, SDist
-        import pathlib
-        fpath = '$WHEEL_FPATH'
-        cls = Wheel if fpath.endswith('.whl') else SDist
-        item = cls(fpath)
-        print(item.version)
-    ")
   - echo "WHEEL_FPATH=$WHEEL_FPATH"
   - echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
   - echo "UV_RESOLUTION=$UV_RESOLUTION"
-  - echo "MOD_VERSION=$MOD_VERSION"
-  - python -m pip install --prefer-binary "cmd_queue[$INSTALL_EXTRAS]==$MOD_VERSION" -f dist
+  - python -m pip install --prefer-binary "${WHEEL_FPATH}[${INSTALL_EXTRAS}]"
   - echo "Install finished."
   - echo "Creating test sandbox directory"
   - export WORKSPACE_DNAME="sandbox"
@@ -304,30 +322,36 @@ stages:
   - 'echo "Installing helpers: setuptools"'
   - python -m uv pip install setuptools>=0.8 setuptools_scm wheel build -U
   - 'echo "Installing helpers: tomli and pkginfo"'
-  - python -m uv pip install tomli pkginfo
+  - python -m uv pip install tomli pkginfo packaging
   - |-
     export WHEEL_FPATH=$(python -c "if 1:
         import pathlib
+        from packaging import tags
+        from packaging.utils import parse_wheel_filename
         dist_dpath = pathlib.Path('dist')
-        candidates = list(dist_dpath.glob('cmd_queue*.whl'))
-        candidates += list(dist_dpath.glob('cmd_queue*.tar.gz'))
-        fpath = sorted(candidates)[-1]
+        wheels = sorted(dist_dpath.glob('cmd_queue*.whl'))
+        if wheels:
+            sys_tags = set(tags.sys_tags())
+            matching = []
+            for w in wheels:
+                try:
+                    _, _, _, wheel_tags = parse_wheel_filename(w.name)
+                except Exception:
+                    continue
+                if any(t in sys_tags for t in wheel_tags):
+                    matching.append(w)
+            fpath = sorted(matching or wheels)[-1]
+        else:
+            sdists = sorted(dist_dpath.glob('cmd_queue*.tar.gz'))
+            if not sdists:
+                raise SystemExit('No wheel artifacts found in wheelhouse')
+            fpath = sdists[-1]
         print(str(fpath).replace(chr(92), chr(47)))
     ")
-  - |-
-    export MOD_VERSION=$(python -c "if 1:
-        from pkginfo import Wheel, SDist
-        import pathlib
-        fpath = '$WHEEL_FPATH'
-        cls = Wheel if fpath.endswith('.whl') else SDist
-        item = cls(fpath)
-        print(item.version)
-    ")
   - echo "WHEEL_FPATH=$WHEEL_FPATH"
   - echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
   - echo "UV_RESOLUTION=$UV_RESOLUTION"
-  - echo "MOD_VERSION=$MOD_VERSION"
-  - python -m pip install --prefer-binary "cmd_queue[$INSTALL_EXTRAS]==$MOD_VERSION" -f dist
+  - python -m pip install --prefer-binary "${WHEEL_FPATH}[${INSTALL_EXTRAS}]"
   - echo "Install finished."
   - echo "Creating test sandbox directory"
   - export WORKSPACE_DNAME="sandbox"
@@ -359,29 +383,6 @@ test/sdist/minimal-loose/cp314-linux-x86_64:
   image: python:3.14
   needs:
   - build/sdist
-build/cp39-linux-x86_64:
-  <<: *build_wheel_template
-  image: python:3.9
-test/minimal-loose/cp39-linux-x86_64:
-  <<: *test_minimal-loose_template
-  image: python:3.9
-  needs:
-  - build/cp39-linux-x86_64
-test/full-loose/cp39-linux-x86_64:
-  <<: *test_full-loose_template
-  image: python:3.9
-  needs:
-  - build/cp39-linux-x86_64
-test/minimal-strict/cp39-linux-x86_64:
-  <<: *test_minimal-strict_template
-  image: python:3.9
-  needs:
-  - build/cp39-linux-x86_64
-test/full-strict/cp39-linux-x86_64:
-  <<: *test_full-strict_template
-  image: python:3.9
-  needs:
-  - build/cp39-linux-x86_64
 build/cp310-linux-x86_64:
   <<: *build_wheel_template
   image: python:3.10
@@ -507,6 +508,9 @@ lint:
   - python -m pip install pip uv -U
   - python -m uv pip install -r requirements/linting.txt
   - ./run_linter.sh
+  - python -m pip install ty
+  - pip install -r requirements/runtime.txt
+  - ty check ./cmd_queue
   allow_failure: true
 gpgsign/wheels:
   <<: *common_template
@@ -531,17 +535,16 @@ gpgsign/wheels:
   - export GPG_EXECUTABLE=gpg
   - export GPG_KEYID=$(cat dev/public_gpg_key)
   - echo "GPG_KEYID = $GPG_KEYID"
-    # Decrypt and import GPG Keys / trust
-    # note the variable pointed to by VARNAME_CI_SECRET is a protected variables only available on main and release branch
-  - source dev/secrets_configuration.sh
-  - CI_SECRET=${!VARNAME_CI_SECRET}
   - $GPG_EXECUTABLE --version
   - openssl version
   - $GPG_EXECUTABLE --list-keys
-    # note CI_KITWARE_SECRET is a protected variables only available on main and release branch
-  - CIS=$CI_SECRET openssl enc -aes-256-cbc -pbkdf2 -md SHA512 -pass env:CIS -d -a -in dev/ci_public_gpg_key.pgp.enc | $GPG_EXECUTABLE --import
-  - CIS=$CI_SECRET openssl enc -aes-256-cbc -pbkdf2 -md SHA512 -pass env:CIS -d -a -in dev/gpg_owner_trust.enc | $GPG_EXECUTABLE --import-ownertrust
-  - CIS=$CI_SECRET openssl enc -aes-256-cbc -pbkdf2 -md SHA512 -pass env:CIS -d -a -in dev/ci_secret_gpg_subkeys.pgp.enc | $GPG_EXECUTABLE --import
+  - echo "Importing GPG keys from CI secrets"
+  - printf '%s' "$GPG_PUBLIC_KEY_B64" | base64 -d | $GPG_EXECUTABLE --import
+  - printf '%s' "$GPG_OWNER_TRUST_B64" | base64 -d | $GPG_EXECUTABLE --import-ownertrust
+  - printf '%s' "$GPG_SECRET_SIGNING_SUBKEY_B64" | base64 -d | $GPG_EXECUTABLE --import
+  - "IMPORTED_FPR=$($GPG_EXECUTABLE --list-keys --with-colons \"$GPG_KEYID\" | awk -F: '/^fpr/ { print $10; exit }')"
+  - '[[ "$IMPORTED_FPR" == "$GPG_KEYID" ]] || { echo "ERROR: fingerprint mismatch: $IMPORTED_FPR != $GPG_KEYID"; exit 1; }'
+  - 'echo "GPG fingerprint verified: $IMPORTED_FPR"'
   - GPG_SIGN_CMD="$GPG_EXECUTABLE --batch --yes --detach-sign --armor --local-user $GPG_KEYID"
   - |-
     WHEEL_PATHS=(dist/*.whl dist/*.tar.gz)
@@ -562,8 +565,6 @@ gpgsign/wheels:
   needs:
   - job: build/sdist
     artifacts: true
-  - job: build/cp39-linux-x86_64
-    artifacts: true
   - job: build/cp310-linux-x86_64
     artifacts: true
   - job: build/cp311-linux-x86_64
@@ -605,7 +606,6 @@ deploy/wheels:
     # do sed twice to handle the case of https clone with and without a read token
     URL_HOST=$(git remote get-url origin | sed -e 's|https\?://.*@||g' | sed -e 's|https\?://||g' | sed -e 's|git@||g' | sed -e 's|:|/|g')
     source dev/secrets_configuration.sh
-    CI_SECRET=${!VARNAME_CI_SECRET}
     PUSH_TOKEN=${!VARNAME_PUSH_TOKEN}
     echo "URL_HOST = $URL_HOST"
     # A git config user name and email is required. Set if needed.

CHANGELOG.md

@@ -7,14 +7,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Version 0.3.0 - Unreleased
 
+### Added:
+* generalized the monitor so it can be launched in an independent process and reports errors better.
+* New `monitor='hybrid'` mode (now the default for tmux and slurm `run()`): renders the live status table inline in the current shell and *also* spawns a detached `cmd_queue monitor` tmux session. Press `[a]` from the inline UI to attach (or `switch-client` when already inside tmux), `[q]` to stop watching while the queue keeps running. The side session is killed when the inline monitor exits.
+
+### Changed
+* `monitor` kwarg accepted values are now `'hybrid' | 'inline' | 'tmux' | 'none'`. `'inline'` reverts to its original pure-current-shell meaning; the `'hybrid'` mode covers the inline+tmux combination. The default is `'hybrid'`, so a no-arg `run()` now spawns an attachable tmux side session whenever tmux is available.
+
 ### Fixed:
 * cwd will now handle failures if the directory doesnt exist in the bash queue
 * general improvements to bash script construction with per-job preamble commands
 * slurm now correctly respects header/preamble commands
 
 ### Changed
 * deprecate `header_commands` for `preamble`
-* Dropped support for 3.8
+* Dropped support for 3.8 and 3.9
 * Transition from stubs to type annotations.
 
 

cmd_queue/__init__.py

@@ -313,7 +313,8 @@
     'base_queue': ['Queue'],
 }
 from cmd_queue import base_queue
-
-from cmd_queue.base_queue import (Queue,)
+from cmd_queue.base_queue import (
+    Queue,
+)
 
 __all__ = ['Queue', 'base_queue']