From e3a97a4aa63ae89fca547b968778bb84d41c4cf5 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Fri, 27 Dec 2024 10:27:59 -0500 Subject: [PATCH] update utz --- .github/workflows/ci.yml | 4 +++- qmdx/comm_x/__init__.py | 2 +- qmdx/diff_x/__init__.py | 2 +- qmdx/git_diff_x/__init__.py | 2 +- qmdx/utils.py | 2 +- requirements-ci.txt | 1 + requirements.txt | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 requirements-ci.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5b992a..c04626a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - run: pip install -e . bmdf + cache: pip + cache-dependency-path: 'requirements*.txt' + - run: pip install -e . -r requirements-ci.txt - name: Set up README example tests run: | seq 10 > 1.txt diff --git a/qmdx/comm_x/__init__.py b/qmdx/comm_x/__init__.py index 15561f6..5805ac8 100644 --- a/qmdx/comm_x/__init__.py +++ b/qmdx/comm_x/__init__.py @@ -50,7 +50,7 @@ def main( cmds2=[ f'{first} {path2}', *rest ], verbose=verbose, shell=not no_shell, - shell_executable=shell_executable, + executable=shell_executable, ) else: process.run(['comm', path1, path2]) diff --git a/qmdx/diff_x/__init__.py b/qmdx/diff_x/__init__.py index 5f9a8a3..113fda1 100644 --- a/qmdx/diff_x/__init__.py +++ b/qmdx/diff_x/__init__.py @@ -51,7 +51,7 @@ def main( cmds2=[ f'{first} {path2}', *rest ], verbose=verbose, shell=not no_shell, - shell_executable=shell_executable, + executable=shell_executable, ) else: subprocess.run(['diff', *diff_args, path1, path2]) diff --git a/qmdx/git_diff_x/__init__.py b/qmdx/git_diff_x/__init__.py index c8d9b2c..36d569b 100644 --- a/qmdx/git_diff_x/__init__.py +++ b/qmdx/git_diff_x/__init__.py @@ -104,7 +104,7 @@ def main( cmds2=cmds2, verbose=verbose, shell=not no_shell, - shell_executable=shell_executable, + executable=shell_executable, ) else: process.run(['git', 'diff', *diff_args, refspec, '--', path]) diff --git a/qmdx/utils.py b/qmdx/utils.py index 8bde734..5bbb9a0 100644 --- a/qmdx/utils.py +++ b/qmdx/utils.py @@ -63,7 +63,7 @@ def join_pipelines( cmds, pipe, wait=False, - shell_executable=shell_executable, + executable=shell_executable, **kwargs, ) diff --git a/requirements-ci.txt b/requirements-ci.txt new file mode 100644 index 0000000..d64aa34 --- /dev/null +++ b/requirements-ci.txt @@ -0,0 +1 @@ +bmdf>=0.3.6 diff --git a/requirements.txt b/requirements.txt index d33838c..cff6469 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ click -utz +utz>=0.12.2