From 00b51b13362f5779b9a5eaf656e09e85720ff731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 01:55:10 +0000 Subject: [PATCH 1/3] ci(dependabot): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/deploy.yaml | 2 +- .github/workflows/publish-docs.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 072fd42..7fdeeef 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run pre-commit linting run: pipx run pre-commit run --all-files @@ -33,7 +33,7 @@ jobs: python-version: "3.10" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b1da70c..ada751c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -10,7 +10,7 @@ jobs: name: Build and publish Python 🐍 distributions 📦 to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index c41c99c..e18f3b7 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -21,7 +21,7 @@ jobs: shell: bash -l {0} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: From deecdcafb3fb584047d449e128fccf1608a6fdc3 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 2 Nov 2023 11:52:56 -0400 Subject: [PATCH 2/3] Update conda setup in CI and publish-docs workflows --- .github/workflows/ci.yaml | 3 ++- .github/workflows/publish-docs.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7fdeeef..a7736b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,8 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.python-version }} - mamba-version: "*" + miniforge-version: latest + use-mamba: true channels: conda-forge channel-priority: true diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index e18f3b7..62e17ee 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -26,7 +26,8 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: python-version: "3.11" - mamba-version: "*" + miniforge-version: latest + use-mamba: true channels: conda-forge channel-priority: true From b328d9c5acbf729cdbc85b552074f6197fa01ef4 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 2 Nov 2023 11:59:47 -0400 Subject: [PATCH 3/3] add ipykernel to docs deps --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1793742..84c47ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,12 +23,13 @@ dependencies = ['networkx', 'ilpy>=0.3.1', 'numpy', 'structsvm'] dev = ["pre-commit", "pytest", "pytest-cov", "ruff", "twine", "build"] test = ["pytest", "pytest-cov", "plotly"] docs = [ - "sphinx", + "ipykernel", + "jupyter_sphinx", + "plotly", "sphinx_rtd_theme", "sphinx_togglebutton", + "sphinx", "tomli", - "jupyter_sphinx", - "plotly", ] [project.urls]