From f105704283ce2a94217c2fe40bc01f64dfbf218e Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Thu, 28 Aug 2025 14:29:20 -0700 Subject: [PATCH 1/5] fix versions and make CI robust --- ...ti-darshan-3.4.2.yml => darshan-3.4.2.yml} | 74 ++++++------- .github/workflows/darshan-3.4.4.yml | 100 ++++++++++++++++++ .github/workflows/darshan-3.4.6.yml | 100 ++++++++++++++++++ .github/workflows/darshan-3.4.7.yml | 100 ++++++++++++++++++ .github/workflows/drishti-darshan-3.4.0.yml | 100 ------------------ .github/workflows/drishti-darshan-3.4.1.yml | 100 ------------------ .github/workflows/lint.yml | 19 ++++ requirements.txt | 5 +- setup.py | 7 +- 9 files changed, 361 insertions(+), 244 deletions(-) rename .github/workflows/{drishti-darshan-3.4.2.yml => darshan-3.4.2.yml} (51%) create mode 100644 .github/workflows/darshan-3.4.4.yml create mode 100644 .github/workflows/darshan-3.4.6.yml create mode 100644 .github/workflows/darshan-3.4.7.yml delete mode 100644 .github/workflows/drishti-darshan-3.4.0.yml delete mode 100644 .github/workflows/drishti-darshan-3.4.1.yml create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/drishti-darshan-3.4.2.yml b/.github/workflows/darshan-3.4.2.yml similarity index 51% rename from .github/workflows/drishti-darshan-3.4.2.yml rename to .github/workflows/darshan-3.4.2.yml index 686aaa2..718cc19 100644 --- a/.github/workflows/drishti-darshan-3.4.2.yml +++ b/.github/workflows/darshan-3.4.2.yml @@ -2,99 +2,99 @@ name: Drishti (Darshan 3.4.2) on: pull_request: - push: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: drishti: - runs-on: ubuntu-latest - container: jlbez/dxt-explorer-ubuntu-20.04 - timeout-minutes: 60 + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + + timeout-minutes: 20 steps: - uses: actions/checkout@v4 with: submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} - name: Dependencies run: | - sudo apt-get update - sudo apt-get install cmake gcc git libtool python3 python3-pip libcurl4-openssl-dev software-properties-common -y - - # Darshan - git clone https://github.com/darshan-hpc/darshan.git darshan-3.4.2 - cd darshan-3.4.2 - git checkout darshan-3.4.2 + git clone https://github.com/darshan-hpc/darshan.git - pip install --upgrade pip + - name: Install macOS Dependencies + if: runner.os == 'macOS' + run: | + brew install libtool autoconf automake - name: Build Darshan run: | - export DARSHAN_DIR=/opt/darshan - - mkdir $DARSHAN_DIR - cd darshan-3.4.2 + cd darshan + git checkout darshan-3.4.2 bash prepare.sh cd darshan-util - ./configure --prefix=$DARSHAN_DIR + ./configure make - make install + sudo make install - - name: Install py-darshan + - name: Configure Linux + if: runner.os == 'Linux' run: | - pip install darshan==3.4.2 + sudo ldconfig - name: Install Drishti run: | + python -m ensurepip --upgrade + pip install --upgrade setuptools + pip install darshan==3.4.2 pip install -r requirements.txt pip install . - name: Run Drishti (--help) run: | - export PATH=/opt/darshan/bin:$PATH - drishti -h - name: Run Drishti (--issues) run: | - export PATH=/opt/darshan/bin:$PATH - drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - name: Run Drishti (--code) run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - name: Run DXT Explorer (--verbose) run: | - export PATH=/opt/darshan/bin:$PATH - drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - name: Run DXT Explorer (--path) run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - name: Run DXT Explorer (--html) run: | - export PATH=/opt/darshan/bin:$PATH - drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - name: Run DXT Explorer (--svg) run: | - export PATH=/opt/darshan/bin:$PATH + drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + - name: Setup upterm session + if: ${{ failure() }} + uses: owenthereal/action-upterm@v1 - name: Upload Artifact if: always() uses: actions/upload-artifact@v4 with: - name: tests + name: tests-${{ matrix.os }}-${{ matrix.python-version }} path: sample/** retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/darshan-3.4.4.yml b/.github/workflows/darshan-3.4.4.yml new file mode 100644 index 0000000..54ea285 --- /dev/null +++ b/.github/workflows/darshan-3.4.4.yml @@ -0,0 +1,100 @@ +name: Drishti (Darshan 3.4.4) + +on: + pull_request: + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + drishti: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + + timeout-minutes: 20 + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Dependencies + run: | + git clone https://github.com/darshan-hpc/darshan.git + + - name: Install macOS Dependencies + if: runner.os == 'macOS' + run: | + brew install libtool autoconf automake + + - name: Build Darshan + run: | + cd darshan + git checkout darshan-3.4.4 + bash prepare.sh + cd darshan-util + ./configure + make + sudo make install + + - name: Configure Linux + if: runner.os == 'Linux' + run: | + sudo ldconfig + + - name: Install Drishti + run: | + python -m ensurepip --upgrade + pip install --upgrade setuptools + pip install darshan==3.4.4 + pip install -r requirements.txt + pip install . + + - name: Run Drishti (--help) + run: | + drishti -h + + - name: Run Drishti (--issues) + run: | + drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run Drishti (--code) + run: | + drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--verbose) + run: | + drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--path) + run: | + drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--html) + run: | + drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--svg) + run: | + drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Setup upterm session + if: ${{ failure() }} + uses: owenthereal/action-upterm@v1 + + - name: Upload Artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: tests-${{ matrix.os }}-${{ matrix.python-version }} + path: sample/** + retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/darshan-3.4.6.yml b/.github/workflows/darshan-3.4.6.yml new file mode 100644 index 0000000..9306af6 --- /dev/null +++ b/.github/workflows/darshan-3.4.6.yml @@ -0,0 +1,100 @@ +name: Drishti (Darshan 3.4.6) + +on: + pull_request: + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + drishti: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + + timeout-minutes: 20 + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Dependencies + run: | + git clone https://github.com/darshan-hpc/darshan.git + + - name: Install macOS Dependencies + if: runner.os == 'macOS' + run: | + brew install libtool autoconf automake + + - name: Build Darshan + run: | + cd darshan + git checkout darshan-3.4.6 + bash prepare.sh + cd darshan-util + ./configure + make + sudo make install + + - name: Configure Linux + if: runner.os == 'Linux' + run: | + sudo ldconfig + + - name: Install Drishti + run: | + python -m ensurepip --upgrade + pip install --upgrade setuptools + pip install darshan==3.4.6 + pip install -r requirements.txt + pip install . + + - name: Run Drishti (--help) + run: | + drishti -h + + - name: Run Drishti (--issues) + run: | + drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run Drishti (--code) + run: | + drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--verbose) + run: | + drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--path) + run: | + drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--html) + run: | + drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--svg) + run: | + drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Setup upterm session + if: ${{ failure() }} + uses: owenthereal/action-upterm@v1 + + - name: Upload Artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: tests-${{ matrix.os }}-${{ matrix.python-version }} + path: sample/** + retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/darshan-3.4.7.yml b/.github/workflows/darshan-3.4.7.yml new file mode 100644 index 0000000..3e730e5 --- /dev/null +++ b/.github/workflows/darshan-3.4.7.yml @@ -0,0 +1,100 @@ +name: Drishti (Darshan 3.4.7) + +on: + pull_request: + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + drishti: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + + timeout-minutes: 20 + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Dependencies + run: | + git clone https://github.com/darshan-hpc/darshan.git + + - name: Install macOS Dependencies + if: runner.os == 'macOS' + run: | + brew install libtool autoconf automake + + - name: Build Darshan + run: | + cd darshan + git checkout darshan-3.4.7 + bash prepare.sh + cd darshan-util + ./configure + make + sudo make install + + - name: Configure Linux + if: runner.os == 'Linux' + run: | + sudo ldconfig + + - name: Install Drishti + run: | + python -m ensurepip --upgrade + pip install --upgrade setuptools + pip install darshan==3.4.7 + pip install -r requirements.txt + pip install . + + - name: Run Drishti (--help) + run: | + drishti -h + + - name: Run Drishti (--issues) + run: | + drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run Drishti (--code) + run: | + drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--verbose) + run: | + drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--path) + run: | + drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--html) + run: | + drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Run DXT Explorer (--svg) + run: | + drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan + + - name: Setup upterm session + if: ${{ failure() }} + uses: owenthereal/action-upterm@v1 + + - name: Upload Artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: tests-${{ matrix.os }}-${{ matrix.python-version }} + path: sample/** + retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/drishti-darshan-3.4.0.yml b/.github/workflows/drishti-darshan-3.4.0.yml deleted file mode 100644 index 3665a98..0000000 --- a/.github/workflows/drishti-darshan-3.4.0.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: Drishti (Darshan 3.4.0) - -on: - pull_request: - push: - workflow_dispatch: - -jobs: - drishti: - runs-on: ubuntu-latest - container: jlbez/dxt-explorer-ubuntu-20.04 - timeout-minutes: 60 - - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - - name: Dependencies - run: | - sudo apt-get update - sudo apt-get install cmake gcc git libtool python3 python3-pip libcurl4-openssl-dev software-properties-common -y - - # Darshan - git clone https://github.com/darshan-hpc/darshan.git darshan-3.4.0 - cd darshan-3.4.0 - git checkout darshan-3.4.0 - - pip install --upgrade pip - - - name: Build Darshan - run: | - export DARSHAN_DIR=/opt/darshan - - mkdir $DARSHAN_DIR - cd darshan-3.4.0 - bash prepare.sh - cd darshan-util - ./configure --prefix=$DARSHAN_DIR - make - make install - - - name: Install py-darshan - run: | - pip install darshan==3.4.0.1 - - - name: Install Drishti - run: | - pip install -r requirements.txt - pip install . - - - name: Run Drishti (--help) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti -h - - - name: Run Drishti (--issues) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run Drishti (--code) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--verbose) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--path) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--html) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--svg) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Upload Artifact - if: always() - uses: actions/upload-artifact@v4 - with: - name: tests - path: sample/** - retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/drishti-darshan-3.4.1.yml b/.github/workflows/drishti-darshan-3.4.1.yml deleted file mode 100644 index 155f6e7..0000000 --- a/.github/workflows/drishti-darshan-3.4.1.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: Drishti (Darshan 3.4.1) - -on: - pull_request: - push: - workflow_dispatch: - -jobs: - drishti: - runs-on: ubuntu-latest - container: jlbez/dxt-explorer-ubuntu-20.04 - timeout-minutes: 60 - - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - - name: Dependencies - run: | - sudo apt-get update - sudo apt-get install cmake gcc git libtool python3 python3-pip libcurl4-openssl-dev software-properties-common -y - - # Darshan - git clone https://github.com/darshan-hpc/darshan.git darshan-3.4.1 - cd darshan-3.4.1 - git checkout darshan-3.4.1 - - pip install --upgrade pip - - - name: Build Darshan - run: | - export DARSHAN_DIR=/opt/darshan - - mkdir $DARSHAN_DIR - cd darshan-3.4.1 - bash prepare.sh - cd darshan-util - ./configure --prefix=$DARSHAN_DIR - make - make install - - - name: Install py-darshan - run: | - pip install darshan==3.4.1 - - - name: Install Drishti - run: | - pip install -r requirements.txt - pip install . - - - name: Run Drishti (--help) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti -h - - - name: Run Drishti (--issues) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run Drishti (--code) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--verbose) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--path) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--html) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Run DXT Explorer (--svg) - run: | - export PATH=/opt/darshan/bin:$PATH - - drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan - - - name: Upload Artifact - if: always() - uses: actions/upload-artifact@v4 - with: - name: tests - path: sample/** - retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..57d937b --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,19 @@ +name: lint + +on: + workflow_dispatch: + push: + +jobs: + lint: + name: Python Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.9" + - name: Run flake8 + uses: julianwachholz/flake8-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5020329..aff1fcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -argparse darshan>=3.4.4.0 -pandas -rich==12.5.1 +pandas>2.1 +rich>=12.5.1 recorder-utils diff --git a/setup.py b/setup.py index a93a8ce..09ec51b 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name="drishti-io", keywords="drishti", - version="0.6", + version="0.7.2", author="Jean Luca Bez, Suren Byna", author_email="jlbez@lbl.gov, sbyna@lbl.gov", description="", @@ -17,10 +17,9 @@ long_description_content_type="text/markdown", url="https://github.com/hpc-io/drishti", install_requires=[ - 'argparse', - 'pandas', + 'pandas>=2.1', 'darshan>=3.4.4.0', - 'rich==12.5.1', + 'rich>=12.5.1', 'recorder-utils', ], packages=find_packages(), From 67db11cfb00dcd2a20062d4752c41ae1eb526f66 Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Mon, 15 Sep 2025 10:54:32 -0700 Subject: [PATCH 2/5] update versions --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index aff1fcc..863cfbb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ darshan>=3.4.4.0 -pandas>2.1 +pandas>=2 rich>=12.5.1 recorder-utils diff --git a/setup.py b/setup.py index 09ec51b..06af834 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ long_description_content_type="text/markdown", url="https://github.com/hpc-io/drishti", install_requires=[ - 'pandas>=2.1', + 'pandas>=2', 'darshan>=3.4.4.0', 'rich>=12.5.1', 'recorder-utils', From 13c094acdaac462de2654710383f969d9aab8c17 Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Mon, 15 Sep 2025 11:05:43 -0700 Subject: [PATCH 3/5] relax constraints --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 863cfbb..81aaa5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -darshan>=3.4.4.0 +darshan>=3.4 pandas>=2 rich>=12.5.1 recorder-utils diff --git a/setup.py b/setup.py index 06af834..29ccdc3 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ url="https://github.com/hpc-io/drishti", install_requires=[ 'pandas>=2', - 'darshan>=3.4.4.0', + 'darshan>=3.4', 'rich>=12.5.1', 'recorder-utils', ], From c12783985c1f989cacc3bbd17bf690204f962179 Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Mon, 15 Sep 2025 11:36:41 -0700 Subject: [PATCH 4/5] fix CI --- .github/workflows/darshan-3.4.2.yml | 5 +++++ .github/workflows/darshan-3.4.4.yml | 5 +++++ .github/workflows/darshan-3.4.6.yml | 5 +++++ .github/workflows/darshan-3.4.7.yml | 5 +++++ .github/workflows/lint.yml | 5 ++++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/darshan-3.4.2.yml b/.github/workflows/darshan-3.4.2.yml index 718cc19..4b30959 100644 --- a/.github/workflows/darshan-3.4.2.yml +++ b/.github/workflows/darshan-3.4.2.yml @@ -27,6 +27,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + + - name: Upgrade pip, setuptools, and wheel + if: matrix.python-version == '3.12' + run: python -m pip install --upgrade pip setuptools wheel + - name: Dependencies run: | git clone https://github.com/darshan-hpc/darshan.git diff --git a/.github/workflows/darshan-3.4.4.yml b/.github/workflows/darshan-3.4.4.yml index 54ea285..7636e7c 100644 --- a/.github/workflows/darshan-3.4.4.yml +++ b/.github/workflows/darshan-3.4.4.yml @@ -27,6 +27,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + + - name: Upgrade pip, setuptools, and wheel + if: matrix.python-version == '3.12' + run: python -m pip install --upgrade pip setuptools wheel + - name: Dependencies run: | git clone https://github.com/darshan-hpc/darshan.git diff --git a/.github/workflows/darshan-3.4.6.yml b/.github/workflows/darshan-3.4.6.yml index 9306af6..5a75837 100644 --- a/.github/workflows/darshan-3.4.6.yml +++ b/.github/workflows/darshan-3.4.6.yml @@ -27,6 +27,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + + - name: Upgrade pip, setuptools, and wheel + if: matrix.python-version == '3.12' + run: python -m pip install --upgrade pip setuptools wheel + - name: Dependencies run: | git clone https://github.com/darshan-hpc/darshan.git diff --git a/.github/workflows/darshan-3.4.7.yml b/.github/workflows/darshan-3.4.7.yml index 3e730e5..58676fc 100644 --- a/.github/workflows/darshan-3.4.7.yml +++ b/.github/workflows/darshan-3.4.7.yml @@ -27,6 +27,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + + - name: Upgrade pip, setuptools, and wheel + if: matrix.python-version == '3.12' + run: python -m pip install --upgrade pip setuptools wheel + - name: Dependencies run: | git clone https://github.com/darshan-hpc/darshan.git diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 57d937b..6f94c1d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,10 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 with: python-version: "3.9" + - name: Run flake8 uses: julianwachholz/flake8-action@v2 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + continue-on-error: true \ No newline at end of file From cc4364c4117179f11ff564824b1f57588ceaa101 Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Mon, 15 Sep 2025 11:49:26 -0700 Subject: [PATCH 5/5] fix CI --- .github/workflows/darshan-3.4.2.yml | 4 ++-- .github/workflows/darshan-3.4.4.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/darshan-3.4.2.yml b/.github/workflows/darshan-3.4.2.yml index 4b30959..d8a10bd 100644 --- a/.github/workflows/darshan-3.4.2.yml +++ b/.github/workflows/darshan-3.4.2.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest"] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11"] timeout-minutes: 20 @@ -31,7 +31,7 @@ jobs: - name: Upgrade pip, setuptools, and wheel if: matrix.python-version == '3.12' run: python -m pip install --upgrade pip setuptools wheel - + - name: Dependencies run: | git clone https://github.com/darshan-hpc/darshan.git diff --git a/.github/workflows/darshan-3.4.4.yml b/.github/workflows/darshan-3.4.4.yml index 7636e7c..63a29f6 100644 --- a/.github/workflows/darshan-3.4.4.yml +++ b/.github/workflows/darshan-3.4.4.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest"] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11"] timeout-minutes: 20