From 89ce21c2ba0d6aba9e228158465e652422a180c6 Mon Sep 17 00:00:00 2001 From: Ivan Ogasawara Date: Tue, 9 Apr 2024 10:30:32 -0400 Subject: [PATCH 1/3] docs: Update mkdocs-jupyter and fix the switch toggle for notebooks --- poetry.lock | 12 ++++-------- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 864fae5..54aec2c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1722,13 +1722,12 @@ mkdocs = "*" [[package]] name = "mkdocs-jupyter" -version = "0.24.3" +version = "0.24.7" description = "Use Jupyter in mkdocs websites" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "mkdocs_jupyter-0.24.3-py3-none-any.whl", hash = "sha256:904262a8678a5e5920b7c3c03b5010b36301a69d0a38f2fcbf430493adf6879e"}, - {file = "mkdocs_jupyter-0.24.3.tar.gz", hash = "sha256:3d81da9aea27480e93bab22438910c4f0b9630613e74f85b576590d78e0e8b14"}, + {file = "mkdocs_jupyter-0.24.7-py3-none-any.whl", hash = "sha256:893d04bea1e007479a46e4e72852cd4d280c4d358ce4a0445250f3f80c639723"}, ] [package.dependencies] @@ -1739,9 +1738,6 @@ mkdocs-material = ">9.0.0" nbconvert = ">=7.2.9,<8" pygments = ">2.12.0" -[package.extras] -test = ["coverage[toml]", "pymdown-extensions", "pytest", "pytest-cov"] - [[package]] name = "mkdocs-literate-nav" version = "0.6.1" @@ -3621,4 +3617,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<4" -content-hash = "0b816a4e7258c766ee939c9e91b71837ef7318fcea53752ef271ebea33287287" +content-hash = "523fa618be66964e053767499a1978d109a6d0e141b0333b59cf4d7535f307aa" diff --git a/pyproject.toml b/pyproject.toml index dc3f069..dcc043c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ mypy = ">=1" pytest-cov = ">=3.0.0" mkdocs = ">=1.3" mkdocs-exclude = ">=1.0.2" -mkdocs-jupyter = ">=0.20.0" +mkdocs-jupyter = ">=0.24.7" mkdocs-literate-nav = ">=0.4.1" mkdocs-macros-plugin = ">=0.6.3" mkdocs-material = ">=8" From 1065c17b1b63f335a67b0cc087e1e416944f0f22 Mon Sep 17 00:00:00 2001 From: Ivan Ogasawara Date: Tue, 9 Apr 2024 10:58:16 -0400 Subject: [PATCH 2/3] change the way to pin python with conda on ci --- .github/workflows/docs.yaml | 1 + .github/workflows/main.yaml | 27 +-------------------------- conda/dev.yaml | 2 +- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 710310b..12e0287 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -26,6 +26,7 @@ jobs: activate-environment: makim auto-update-conda: true conda-solver: libmamba + python-version: 3.8.1 - name: Install deps run: | diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e04f1dc..fa1b939 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -58,32 +58,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install MacOS extra tools and add extra setup - if: ${{ matrix.os == 'macos' }} - run: | - sudo mkdir -p /tmp - sudo chmod 777 /tmp - - brew install gnu-sed - echo 'export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"' >> ~/.bashrc - echo 'export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"' >> ~/.bash_profile - gsed -i s:/tmp:/private/tmp:g tests/smoke/.makim-dir-absolute-path.yaml - gsed -i s:/tmp:/private/tmp:g tests/smoke/.makim-dir-no-path.yaml - gsed -i s:/tmp:/private/tmp:g tests/smoke/.makim-dir-relative-path.yaml - - - name: Prepare conda environment (windows) - if: ${{ matrix.os == 'windows' }} - run: | - $env:Path += ";C:\Program Files\Git\usr\bin" - sed -i s/python\ 3\.8/python\ ${{ matrix.python_version }}/ conda/dev.yaml - cat conda/dev.yaml - - - name: Prepare conda environment - if: ${{ matrix.os != 'windows' }} - run: | - sed -i s/python\ 3\.8\.1/python\ ${{ matrix.python_version }}/ conda/dev.yaml - cat conda/dev.yaml - - uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest @@ -92,6 +66,7 @@ jobs: activate-environment: makim auto-update-conda: true conda-solver: libmamba + python-version: ${{ matrix.python_version }} - name: Check Poetry lock run: poetry check diff --git a/conda/dev.yaml b/conda/dev.yaml index 7b155a7..23ee80d 100644 --- a/conda/dev.yaml +++ b/conda/dev.yaml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - bash - - python 3.8.1 # min version supported + - python - poetry >=1.5 - nodejs - perl From 65d107f5c4e6b4c7d2a14122c1e21209bf78c64a Mon Sep 17 00:00:00 2001 From: Ivan Ogasawara Date: Tue, 9 Apr 2024 12:56:49 -0400 Subject: [PATCH 3/3] skip tests for macos for working directory --- .github/workflows/main.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index fa1b939..93754ef 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -102,12 +102,15 @@ jobs: run: makim smoke-tests.test-vars - name: Run smoke test for dir-absolute-path + if: ${{ matrix.os != 'macos' }} run: makim smoke-tests.dir-absolute-path - name: Run smoke test for dir-no-path + if: ${{ matrix.os != 'macos' }} run: makim smoke-tests.dir-no-path - name: Run smoke test for dir-relative-path + if: ${{ matrix.os != 'macos' }} run: makim smoke-tests.dir-relative-path - name: Run unit tests