From 652630ed4063dfc0db4747018e90482583355b72 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:43:14 -0500 Subject: [PATCH 1/8] add a workflow that test uproot@main dask tests --- .github/workflows/uproot-main.yml | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/uproot-main.yml diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml new file mode 100644 index 00000000..cd9d9ad8 --- /dev/null +++ b/.github/workflows/uproot-main.yml @@ -0,0 +1,38 @@ +name: awkward-main + +on: + push: + branches: ['main'] + paths-ignore: ['**.md', 'docs/**'] + pull_request: + paths-ignore: ['**.md', 'docs/**'] + workflow_dispatch: + +concurrency: + group: 'coverage-${{ github.head_ref || github.run_id }}' + cancel-in-progress: true + +jobs: + run: + runs-on: ubuntu-latest + env: + OS: ubuntu-latest + PYTHON: "3.10" + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: "3.10" + - name: Install + run: | + python3 -m pip install pip wheel -U + python3 -m pip install -q --no-cache-dir -e .[complete,test] + git clone https://github.com/scikit-hep/uproot + cd uproot + python3 -m pip install .[test] + - name: Run uproot dask tests + run: | + cd uproot + python3 -m pytest -k dask From adc103b3308ebf3df2e730663dc502351c4fcffb Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:44:21 -0500 Subject: [PATCH 2/8] name --- .github/workflows/uproot-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index cd9d9ad8..0c3254b4 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -1,4 +1,4 @@ -name: awkward-main +name: uproot-main on: push: From aa25ecb54262acc02f7a88aad1cd0775559b21ba Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:48:58 -0500 Subject: [PATCH 3/8] reduce conda build matrix --- .github/workflows/conda-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-tests.yml b/.github/workflows/conda-tests.yml index 4fd22332..34b846f6 100644 --- a/.github/workflows/conda-tests.yml +++ b/.github/workflows/conda-tests.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.10"] runs-on: ${{matrix.platform}} steps: - name: Checkout source From faba7b23e6722fa9cec1d98b9cb445a382bfeb77 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:50:11 -0500 Subject: [PATCH 4/8] naming --- .github/workflows/awkward-main.yml | 2 +- .github/workflows/uproot-main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/awkward-main.yml b/.github/workflows/awkward-main.yml index e3e519b2..fbf25083 100644 --- a/.github/workflows/awkward-main.yml +++ b/.github/workflows/awkward-main.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: concurrency: - group: 'coverage-${{ github.head_ref || github.run_id }}' + group: 'awkward-main-${{ github.head_ref || github.run_id }}' cancel-in-progress: true jobs: diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index 0c3254b4..00cd200c 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: concurrency: - group: 'coverage-${{ github.head_ref || github.run_id }}' + group: 'uproot-main-${{ github.head_ref || github.run_id }}' cancel-in-progress: true jobs: From 0e9d397672edf41b44c934a4c881f0f695e477ba Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:52:12 -0500 Subject: [PATCH 5/8] paths --- .github/workflows/uproot-main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index 00cd200c..91b08081 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -29,10 +29,11 @@ jobs: run: | python3 -m pip install pip wheel -U python3 -m pip install -q --no-cache-dir -e .[complete,test] + cd .. git clone https://github.com/scikit-hep/uproot cd uproot python3 -m pip install .[test] - name: Run uproot dask tests run: | - cd uproot + cd ../uproot python3 -m pytest -k dask From ce393bd4cfd4f04fccde17a818252cb2dead9148 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:54:53 -0500 Subject: [PATCH 6/8] test and dev --- .github/workflows/uproot-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index 91b08081..91770927 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -32,7 +32,7 @@ jobs: cd .. git clone https://github.com/scikit-hep/uproot cd uproot - python3 -m pip install .[test] + python3 -m pip install .[test,dev] - name: Run uproot dask tests run: | cd ../uproot From a2e4d2a27316d1fd525707dc6da8054129560d25 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 10:59:39 -0500 Subject: [PATCH 7/8] url --- .github/workflows/uproot-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index 91770927..14ba331c 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -30,7 +30,7 @@ jobs: python3 -m pip install pip wheel -U python3 -m pip install -q --no-cache-dir -e .[complete,test] cd .. - git clone https://github.com/scikit-hep/uproot + git clone https://github.com/scikit-hep/uproot5 cd uproot python3 -m pip install .[test,dev] - name: Run uproot dask tests From 4aaf33034805416fbc0426fb21321c0ed901a864 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 17 Aug 2023 11:02:46 -0500 Subject: [PATCH 8/8] ahhhh --- .github/workflows/uproot-main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/uproot-main.yml b/.github/workflows/uproot-main.yml index 14ba331c..ae395e2b 100644 --- a/.github/workflows/uproot-main.yml +++ b/.github/workflows/uproot-main.yml @@ -25,15 +25,12 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.10" - - name: Install + - name: Install and test run: | python3 -m pip install pip wheel -U python3 -m pip install -q --no-cache-dir -e .[complete,test] cd .. git clone https://github.com/scikit-hep/uproot5 - cd uproot + cd uproot5 python3 -m pip install .[test,dev] - - name: Run uproot dask tests - run: | - cd ../uproot python3 -m pytest -k dask