From 2b56cc70a00a86b16b46330c1c671100527a7fbf Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 12 Feb 2024 10:18:46 -0700 Subject: [PATCH 1/6] chore: Updated github actions to use checkout@v4 --- .github/workflows/changelog.yaml | 2 +- .github/workflows/citation.yaml | 2 +- .github/workflows/cli-build-test.yaml | 12 ++++++------ .github/workflows/deploy-gh-pages.yaml | 4 ++-- .github/workflows/python-build-test.yaml | 16 ++++++++-------- .github/workflows/rust-build-test.yaml | 16 ++++++++-------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index ecfeda05..e4ad53b7 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: | eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" diff --git a/.github/workflows/citation.yaml b/.github/workflows/citation.yaml index deb0112e..a4f47b49 100644 --- a/.github/workflows/citation.yaml +++ b/.github/workflows/citation.yaml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/cli-build-test.yaml b/.github/workflows/cli-build-test.yaml index f6c83a79..4f1eeb49 100644 --- a/.github/workflows/cli-build-test.yaml +++ b/.github/workflows/cli-build-test.yaml @@ -19,7 +19,7 @@ jobs: features: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -43,7 +43,7 @@ jobs: working-directory: cli steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -89,7 +89,7 @@ jobs: working-directory: cli steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -114,12 +114,12 @@ jobs: # needs: ["features", "lint", "test"] # steps: # - name: Checkout branch - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # with: # path: branch # - name: Checkout master - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # with: # ref: master # path: master @@ -136,4 +136,4 @@ jobs: # run: cargo install cargo-semver-checks --locked # - name: Check for semver-incompatibilities - # run: cargo semver-checks check-release --manifest-path branch/lace/Cargo.toml --baseline-root master/lace --verbose \ No newline at end of file + # run: cargo semver-checks check-release --manifest-path branch/lace/Cargo.toml --baseline-root master/lace --verbose diff --git a/.github/workflows/deploy-gh-pages.yaml b/.github/workflows/deploy-gh-pages.yaml index 29822830..642b0002 100644 --- a/.github/workflows/deploy-gh-pages.yaml +++ b/.github/workflows/deploy-gh-pages.yaml @@ -30,7 +30,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -63,4 +63,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v1 diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index f007a6ad..1c75819b 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -22,7 +22,7 @@ jobs: working-directory: pylace steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 @@ -52,7 +52,7 @@ jobs: working-directory: pylace steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -89,7 +89,7 @@ jobs: matrix: target: [x86_64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: | @@ -134,7 +134,7 @@ jobs: matrix: target: [x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: | @@ -178,7 +178,7 @@ jobs: matrix: target: [x86_64, aarch64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: | @@ -221,7 +221,7 @@ jobs: runs-on: ubuntu-latest needs: [linux] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: @@ -255,7 +255,7 @@ jobs: runs-on: ubuntu-latest needs: [linux] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -289,7 +289,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/python-') needs: [linux, windows, macos, test-mdbook-python, test-mdbook-build] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Check Branch diff --git a/.github/workflows/rust-build-test.yaml b/.github/workflows/rust-build-test.yaml index 9ef0993c..9564509c 100644 --- a/.github/workflows/rust-build-test.yaml +++ b/.github/workflows/rust-build-test.yaml @@ -23,7 +23,7 @@ jobs: features: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -47,7 +47,7 @@ jobs: working-directory: lace steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -93,7 +93,7 @@ jobs: working-directory: lace steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -119,12 +119,12 @@ jobs: # needs: ["features", "lint", "test"] # steps: # - name: Checkout branch - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # with: # path: branch # - name: Checkout master - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # with: # ref: master # path: master @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-latest needs: ["features", "lint", "test"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Rust uses: dtolnay/rust-toolchain@stable @@ -163,7 +163,7 @@ jobs: runs-on: ubuntu-latest needs: ["features", "lint", "test"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install codedown run: npm install -g codedown @@ -194,7 +194,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/rust-') needs: ["compile-benchmarks", "features", "lint", "test", "test-mdbook-rust"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Check Branch From 310b1d03304494c2d419fdff987b6b7ef165d536 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 12 Feb 2024 10:20:57 -0700 Subject: [PATCH 2/6] chore: Updated github actions to setup-python@5 --- .github/workflows/python-build-test.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index 1c75819b..543d0b9a 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.12' cache: 'pip' @@ -90,7 +90,7 @@ jobs: target: [x86_64] steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: | 3.8 @@ -135,7 +135,7 @@ jobs: target: [x64] steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: | 3.8 @@ -179,7 +179,7 @@ jobs: target: [x86_64, aarch64] steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: | 3.8 @@ -228,7 +228,7 @@ jobs: name: wheels path: dist - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.12' From 835f6a73a7156292fff62fe4c5962b971cd9f3b0 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 12 Feb 2024 10:35:56 -0700 Subject: [PATCH 3/6] chore: Updated github actions to configure-pages@4 --- .github/workflows/deploy-gh-pages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gh-pages.yaml b/.github/workflows/deploy-gh-pages.yaml index 642b0002..08d533e3 100644 --- a/.github/workflows/deploy-gh-pages.yaml +++ b/.github/workflows/deploy-gh-pages.yaml @@ -41,7 +41,7 @@ jobs: - name: Setup Pages id: pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v4 - name: Build with mdBook run: mdbook build book -d ../html # Note that the destination path is relative to the book source, .i.e. `./book/../html` From 016d3491508fe7fe02304ee803e58a5302650a32 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 12 Feb 2024 10:39:45 -0700 Subject: [PATCH 4/6] chore: Updated github actions to upload-artifact@4 --- .github/workflows/python-build-test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index 543d0b9a..78bafe1e 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -122,7 +122,7 @@ jobs: run: pytest pylace/tests - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -166,7 +166,7 @@ jobs: run: pytest pylace/tests - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -211,7 +211,7 @@ jobs: run: pytest pylace/tests - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist From e1435486492982dd9424e2e531a4eb1cc53a3720 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Tue, 13 Feb 2024 07:22:39 -0700 Subject: [PATCH 5/6] chore: Updated github actions to download-artifact@4 --- .github/workflows/python-build-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index 78bafe1e..bfea5539 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -223,7 +223,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: wheels path: dist @@ -307,7 +307,7 @@ jobs: DEPLOYING_VERSION=$(echo "$NEW_VERSION" | perl -lpe 's/^python-//') find . -name Cargo.toml -exec tomlq -r .package.version {} \; | xargs -n 1 test "$DEPLOYING_VERSION" = find . -name pyproject.toml -exec tomlq -r .project.version {} \; | xargs -n 1 test "$DEPLOYING_VERSION" = - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download-wheels with: name: wheels From 13c697b9d60510424e3ac134782278079b9d1722 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Tue, 13 Feb 2024 08:34:04 -0700 Subject: [PATCH 6/6] chore: Updated github actions to use upload-artifact/merge@4 --- .github/workflows/python-build-test.yaml | 22 ++++++++++++++++------ pylace/Cargo.lock | 18 +++++++++--------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index bfea5539..caecdb8a 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -124,7 +124,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-linux-${{ matrix.target }} path: dist windows: @@ -168,7 +168,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-windows-${{ matrix.target }} path: dist macos: @@ -213,13 +213,23 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-macos-${{ matrix.target }} path: dist + merge: + runs-on: ubuntu-latest + needs: [ macos, windows, linux ] + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: wheels + pattern: wheels-* + test-mdbook-python: name: Test MDBook Python Snippets runs-on: ubuntu-latest - needs: [linux] + needs: [merge] steps: - uses: actions/checkout@v4 @@ -253,7 +263,7 @@ jobs: test-mdbook-build: name: Test MDBook Building runs-on: ubuntu-latest - needs: [linux] + needs: [merge] steps: - uses: actions/checkout@v4 @@ -287,7 +297,7 @@ jobs: name: Release runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/python-') - needs: [linux, windows, macos, test-mdbook-python, test-mdbook-build] + needs: [merge, test-mdbook-python, test-mdbook-build] steps: - uses: actions/checkout@v4 with: diff --git a/pylace/Cargo.lock b/pylace/Cargo.lock index 98b41b7a..2f8e8ed9 100644 --- a/pylace/Cargo.lock +++ b/pylace/Cargo.lock @@ -521,7 +521,7 @@ dependencies = [ [[package]] name = "lace" -version = "0.6.0" +version = "0.7.0" dependencies = [ "dirs", "indexmap", @@ -549,7 +549,7 @@ dependencies = [ [[package]] name = "lace_cc" -version = "0.5.0" +version = "0.6.0" dependencies = [ "enum_dispatch", "itertools", @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.5.0" +version = "0.6.0" dependencies = [ "lace_consts", "lace_data", @@ -590,7 +590,7 @@ dependencies = [ [[package]] name = "lace_data" -version = "0.2.0" +version = "0.3.0" dependencies = [ "lace_utils", "serde", @@ -599,7 +599,7 @@ dependencies = [ [[package]] name = "lace_geweke" -version = "0.2.1" +version = "0.3.0" dependencies = [ "indicatif", "lace_stats", @@ -611,7 +611,7 @@ dependencies = [ [[package]] name = "lace_metadata" -version = "0.5.0" +version = "0.6.0" dependencies = [ "bincode", "hex", @@ -630,7 +630,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.2.1" +version = "0.3.0" dependencies = [ "itertools", "lace_consts", @@ -644,7 +644,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.2.0" +version = "0.3.0" dependencies = [ "rand", "rayon", @@ -1345,7 +1345,7 @@ checksum = "fe7765e19fb2ba6fd4373b8d90399f5321683ea7c11b598c6bbaa3a72e9c83b8" [[package]] name = "pylace" -version = "0.6.0" +version = "0.7.0" dependencies = [ "lace", "lace_utils",